FIRE-14593: Option to select only copyable objects

Mon, 15 Dec 2014 10:44:06 +0100

author
Ansariel
date
Mon, 15 Dec 2014 10:44:06 +0100
changeset 43075
748d75af17b6
parent 43074
6133b9abaeec
child 43076
b0e9a2650c5b

FIRE-14593: Option to select only copyable objects

indra/newview/app_settings/settings.xml file | annotate | diff | revisions
indra/newview/llselectmgr.cpp file | annotate | diff | revisions
indra/newview/lltoolselect.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/de/menu_viewer.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/menu_viewer.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/app_settings/settings.xml	Mon Dec 15 09:21:19 2014 +0100
     1.2 +++ b/indra/newview/app_settings/settings.xml	Mon Dec 15 10:44:06 2014 +0100
     1.3 @@ -20817,6 +20817,17 @@
     1.4        <key>Value</key>
     1.5        <integer>1</integer>
     1.6      </map>
     1.7 +    <key>FSSelectCopyableOnly</key>
     1.8 +    <map>
     1.9 +      <key>Comment</key>
    1.10 +      <string>Only include copyable objects during selection</string>
    1.11 +      <key>Persist</key>
    1.12 +      <integer>1</integer>
    1.13 +      <key>Type</key>
    1.14 +      <string>Boolean</string>
    1.15 +      <key>Value</key>
    1.16 +      <integer>0</integer>
    1.17 +    </map>
    1.18      <key>FSShowMutedChatHistory</key>
    1.19      <map>
    1.20        <key>Comment</key>
     2.1 --- a/indra/newview/llselectmgr.cpp	Mon Dec 15 09:21:19 2014 +0100
     2.2 +++ b/indra/newview/llselectmgr.cpp	Mon Dec 15 10:44:06 2014 +0100
     2.3 @@ -1031,6 +1031,13 @@
     2.4  		return;
     2.5  	}
     2.6  
     2.7 +	// <FS:Ansariel> FIRE-14593: Option to select only copyable objects
     2.8 +	if (!objectp->permCopy() && gSavedSettings.getBOOL("FSSelectCopyableOnly"))
     2.9 +	{
    2.10 +		return;
    2.11 +	}
    2.12 +	// </FS:Ansariel>
    2.13 +
    2.14  	// <FS:Ansariel> FIRE-304: Option to exclude group owned objects
    2.15  	if (objectp->permGroupOwner() && !gSavedSettings.getBOOL("FSSelectIncludeGroupOwned"))
    2.16  	{
    2.17 @@ -6920,6 +6927,12 @@
    2.18  		// only select my own objects
    2.19  		return FALSE;
    2.20  	}
    2.21 +	// <FS:Ansariel> FIRE-14593: Option to select only copyable objects
    2.22 +	if (!object->permCopy() && gSavedSettings.getBOOL("FSSelectCopyableOnly"))
    2.23 +	{
    2.24 +		return FALSE;
    2.25 +	}
    2.26 +	// </FS:Ansariel>
    2.27  
    2.28  	// Can't select orphans
    2.29  	if (object->isOrphaned()) return FALSE;
     3.1 --- a/indra/newview/lltoolselect.cpp	Mon Dec 15 09:21:19 2014 +0100
     3.2 +++ b/indra/newview/lltoolselect.cpp	Mon Dec 15 10:44:06 2014 +0100
     3.3 @@ -117,12 +117,16 @@
     3.4  
     3.5  	BOOL select_owned = gSavedSettings.getBOOL("SelectOwnedOnly");
     3.6  	BOOL select_movable = gSavedSettings.getBOOL("SelectMovableOnly");
     3.7 +	// <FS:Ansariel> FIRE-14593: Option to select only copyable objects
     3.8 +	BOOL select_copyable = gSavedSettings.getBOOL("FSSelectCopyableOnly");
     3.9  	
    3.10  	// *NOTE: These settings must be cleaned up at bottom of function.
    3.11  	if (temp_select || LLSelectMgr::getInstance()->mAllowSelectAvatar)
    3.12  	{
    3.13  		gSavedSettings.setBOOL("SelectOwnedOnly", FALSE);
    3.14  		gSavedSettings.setBOOL("SelectMovableOnly", FALSE);
    3.15 +		// <FS:Ansariel> FIRE-14593: Option to select only copyable objects
    3.16 +		gSavedSettings.setBOOL("FSSelectCopyableOnly", FALSE);
    3.17  		LLSelectMgr::getInstance()->setForceSelection(TRUE);
    3.18  	}
    3.19  
    3.20 @@ -257,6 +261,8 @@
    3.21  	{
    3.22  		gSavedSettings.setBOOL("SelectOwnedOnly", select_owned);
    3.23  		gSavedSettings.setBOOL("SelectMovableOnly", select_movable);
    3.24 +		// <FS:Ansariel> FIRE-14593: Option to select only copyable objects
    3.25 +		gSavedSettings.setBOOL("FSSelectCopyableOnly", select_copyable);
    3.26  		LLSelectMgr::getInstance()->setForceSelection(FALSE);
    3.27  	}
    3.28  
     4.1 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml	Mon Dec 15 09:21:19 2014 +0100
     4.2 +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml	Mon Dec 15 10:44:06 2014 +0100
     4.3 @@ -191,6 +191,7 @@
     4.4  			<menu_item_check label="Erweiterte Berechtigungen anzeigen" name="DebugPermissions"/>
     4.5  			<menu_item_check label="Nur meine Objekte auswählen" name="Select Only My Objects"/>
     4.6  			<menu_item_check label="Nur bewegliche Objekte auswählen" name="Select Only Movable Objects"/>
     4.7 +			<menu_item_check label="Nur kopierbare Objekte auswählen" name="Select Only Copyable Objects"/>
     4.8  			<menu_item_check label="Gruppen-Objekte einschließen" name="Include Group-Owned Objects"/>
     4.9  			<menu_item_check label="Nach Umgebung auswählen" name="Select By Surrounding"/>
    4.10  			<menu_item_check label="Auswahlumrandung anzeigen" name="Show Selection Outlines"/>
     5.1 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml	Mon Dec 15 09:21:19 2014 +0100
     5.2 +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml	Mon Dec 15 10:44:06 2014 +0100
     5.3 @@ -1612,6 +1612,15 @@
     5.4                       parameter="movable" />
     5.5                  </menu_item_check>
     5.6                  <menu_item_check
     5.7 +                 label="Select Only Copyable Objects"
     5.8 +                 name="Select Only Copyable Objects">
     5.9 +                    <menu_item_check.on_check
    5.10 +                     control="FSSelectCopyableOnly" />
    5.11 +                    <menu_item_check.on_click
    5.12 +                     function="ToggleControl"
    5.13 +                     parameter="FSSelectCopyableOnly" />
    5.14 +                </menu_item_check>
    5.15 +                <menu_item_check
    5.16                   label="Select By Surrounding"
    5.17                   name="Select By Surrounding">
    5.18                      <menu_item_check.on_check

mercurial