Merged 'mccabe/selectcopyable' into next

4 files changed, 32 insertions, 1 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 209de41..ca3dd81 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -6687,6 +6687,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SelectCopyableOnly</key>
+    <map>
+      <key>Comment</key>
+      <string>Select only objects you can copy</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>SelectOwnedOnly</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 2e4983c..90b1bd3 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -5745,7 +5745,8 @@ BOOL LLSelectMgr::canSelectObject(LLViewerObject* object)
         }
 
         if ((gSavedSettings.getBOOL("SelectOwnedOnly") && !object->permYouOwner()) ||
-                (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()))
+                (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()) ||
+                (gSavedSettings.getBOOL("SelectCopyableOnly") && !object->permCopy()))
         {
                 // only select my own objects
                 return FALSE;
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 9859710..3bf390e 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -6718,6 +6718,18 @@ class LLToolsSelectOnlyMovableObjects : public view_listener_t
         }
 };
 
+class LLToolsSelectOnlyCopyableObjects : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                BOOL cur_val = gSavedSettings.getBOOL("SelectCopyableOnly");
+
+                gSavedSettings.setBOOL("SelectCopyableOnly", ! cur_val );
+
+                return true;
+        }
+};
+
 class LLToolsSelectBySurrounding : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9833,6 +9845,7 @@ void initialize_menus()
         addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
         addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects");
         addMenu(new LLToolsSelectOnlyMovableObjects(), "Tools.SelectOnlyMovableObjects");
+        addMenu(new LLToolsSelectOnlyCopyableObjects(), "Tools.SelectOnlyCopyableObjects");
         addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding");
         addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection");
         addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius");
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 67be436..682acb9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -613,6 +613,12 @@
                 userdata="movable" />
       <on_check control="SelectMovableOnly" />
     </menu_item_check>
+    <menu_item_check name="Select Only Copyable Objects"
+                     label="Select Only Copyable Objects">
+      <on_click function="Tools.SelectOnlyCopyableObjects"
+                userdata="copyable" />
+      <on_check control="SelectCopyableOnly" />
+    </menu_item_check>
     <menu_item_check name="Select By Surrounding"
                      label="Select By Surrounding">
       <on_click function="Tools.SelectBySurrounding"