Second Life viewer sources 1.17.1.0

1 files changed, 11 insertions, 11 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 5086432..e2be9fd 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -395,9 +395,9 @@ LLObjectSelectionHandle LLSelectMgr::selectObjectAndFamily(LLViewerObject* obj,
         root->resetRot();
 
         // leave component mode
-        if (!gSavedSettings.getBOOL("SelectLinkedSet"))
+        if (gSavedSettings.getBOOL("EditLinkedParts"))
         {
-                gSavedSettings.setBOOL("SelectLinkedSet", TRUE);
+                gSavedSettings.setBOOL("EditLinkedParts", FALSE);
                 promoteSelectionToRoot();
         }
 
@@ -463,9 +463,9 @@ LLObjectSelectionHandle LLSelectMgr::selectObjectAndFamily(const LLDynamicArray<
         }
 
         // leave component mode
-        if (!gSavedSettings.getBOOL("SelectLinkedSet"))
+        if (gSavedSettings.getBOOL("EditLinkedParts"))
         {               
-                gSavedSettings.setBOOL("SelectLinkedSet", TRUE);
+                gSavedSettings.setBOOL("EditLinkedParts", FALSE);
                 promoteSelectionToRoot();
         }
 
@@ -948,7 +948,7 @@ LLObjectSelectionHandle LLSelectMgr::selectHighlightedObjects()
 
 void LLSelectMgr::deselectHighlightedObjects()
 {
-        BOOL select_linked_set = gSavedSettings.getBOOL("SelectLinkedSet");
+        BOOL select_linked_set = !gSavedSettings.getBOOL("EditLinkedParts");
         for (std::set<LLPointer<LLViewerObject> >::iterator iter = mRectSelectedObjects.begin();
                  iter != mRectSelectedObjects.end(); iter++)
         {
@@ -3249,7 +3249,7 @@ void LLSelectMgr::sendMultipleUpdate(U32 type)
 {
         if (type == UPD_NONE) return;
         // send individual updates when selecting textures or individual objects
-        ESendType send_type = (gSavedSettings.getBOOL("SelectLinkedSet") && !getTEMode()) ? SEND_ONLY_ROOTS : SEND_ROOTS_FIRST;
+        ESendType send_type = (!gSavedSettings.getBOOL("EditLinkedParts") && !getTEMode()) ? SEND_ONLY_ROOTS : SEND_ROOTS_FIRST;
         if (send_type == SEND_ONLY_ROOTS)
         {
                 // tell simulator to apply to whole linked sets
@@ -4506,7 +4506,7 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
                         LLString fullname(first_name);
                         fullname.append(" ");
                         fullname.append(last_name);
-                        reporterp->setPickedObjectProperties(name, fullname.c_str());
+                        reporterp->setPickedObjectProperties(name, fullname.c_str(), owner_id);
                 }
         }
 
@@ -4669,7 +4669,7 @@ void LLSelectMgr::updateSilhouettes()
                 // persists from frame to frame to avoid regenerating object silhouettes
                 // mHighlightedObjects includes all siblings of rect selected objects
 
-                BOOL select_linked_set = gSavedSettings.getBOOL("SelectLinkedSet");
+                BOOL select_linked_set = !gSavedSettings.getBOOL("EditLinkedParts");
 
                 // generate list of roots from current object selection
                 for (std::set<LLPointer<LLViewerObject> >::iterator iter = mRectSelectedObjects.begin();
@@ -5619,7 +5619,7 @@ BOOL LLSelectMgr::canUndo()
 //-----------------------------------------------------------------------------
 void LLSelectMgr::undo()
 {
-        BOOL select_linked_set = gSavedSettings.getBOOL("SelectLinkedSet");
+        BOOL select_linked_set = !gSavedSettings.getBOOL("EditLinkedParts");
         LLUUID group_id(gAgent.getGroupID());
         sendListToRegions("Undo", packAgentAndSessionAndGroupID, packObjectID, &group_id, select_linked_set ? SEND_ONLY_ROOTS : SEND_CHILDREN_FIRST);
 }
@@ -5637,7 +5637,7 @@ BOOL LLSelectMgr::canRedo()
 //-----------------------------------------------------------------------------
 void LLSelectMgr::redo()
 {
-        BOOL select_linked_set = gSavedSettings.getBOOL("SelectLinkedSet");
+        BOOL select_linked_set = !gSavedSettings.getBOOL("EditLinkedParts");
         LLUUID group_id(gAgent.getGroupID());
         sendListToRegions("Redo", packAgentAndSessionAndGroupID, packObjectID, &group_id, select_linked_set ? SEND_ONLY_ROOTS : SEND_CHILDREN_FIRST);
 }
@@ -5814,7 +5814,7 @@ void LLObjectSelection::deleteAllNodes()
 
 LLSelectNode* LLObjectSelection::findNode(LLViewerObject* objectp)
 {
-        std::map<LLViewerObject*, LLSelectNode*>::iterator found_it = mSelectNodeMap.find(objectp);
+        std::map<LLPointer<LLViewerObject>, LLSelectNode*>::iterator found_it = mSelectNodeMap.find(objectp);
         if (found_it != mSelectNodeMap.end())
         {
                 return found_it->second;