Merge branch 'merge-1.21.6' into rebranding

Conflicts:
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/llappviewer.cpp

1 files changed, 38 insertions, 31 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 8165e55..5e67712 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1517,7 +1517,7 @@ class LLObjectReportAbuse : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                 if (objectp)
                 {
                         LLFloaterReporter::showFromObject(objectp->getID());
@@ -1541,7 +1541,7 @@ class LLObjectTouch : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                 if (!object) return true;
 
                 LLPickInfo pick = LLToolPie::getInstance()->getPick();
@@ -1592,7 +1592,7 @@ class LLObjectEnableTouch : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                 bool new_value = obj && obj->flagHandleTouch();
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 
@@ -1626,7 +1626,7 @@ void label_touch(std::string& label, void*)
 
 bool handle_object_open()
 {
-        LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+        LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
         if(!obj) return true;
 
         LLFloaterOpenObject::show();
@@ -1647,7 +1647,7 @@ class LLObjectEnableOpen : public view_listener_t
         {
                 // Look for contents in root object, which is all the LLFloaterOpenObject
                 // understands.
-                LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                 bool new_value = (obj != NULL);
                 if (new_value)
                 {
@@ -1688,7 +1688,7 @@ bool toggle_build_mode()
                         gViewerWindow->showCursor();                    
                 }
                 // avoid spurious avatar movements pulling out of edit mode
-                LLViewerJoystick::getInstance()->moveAvatar(true);
+                LLViewerJoystick::getInstance()->setNeedsReset();
         }
         else
         {
@@ -1727,7 +1727,7 @@ bool toggle_build_mode()
                 gAgent.resetView(false);
 
                 // avoid spurious avatar movements
-                LLViewerJoystick::getInstance()->moveAvatar(true);
+                LLViewerJoystick::getInstance()->setNeedsReset();
 
         }
         return true;
@@ -2000,7 +2000,7 @@ BOOL enable_has_attachments(void*)
 void handle_follow(void *userdata)
 {
         // follow a given avatar by ID
-        LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+        LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
         if (objectp)
         {
                 gAgent.startFollowPilot(objectp->getID());
@@ -2011,7 +2011,7 @@ class LLObjectEnableMute : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                 bool new_value = (object != NULL);
                 if (new_value)
                 {
@@ -2034,7 +2034,7 @@ class LLObjectMute : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                 if (!object) return true;
                 
                 LLUUID id;
@@ -2164,7 +2164,7 @@ class LLAvatarFreeze : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
+                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                 if( avatar )
                 {
                         LLUUID* avatar_id = new LLUUID( avatar->getID() );
@@ -2214,7 +2214,7 @@ class LLAvatarDebug : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
+                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                 if( avatar )
                 {
                         avatar->dumpLocalTextures();
@@ -2266,7 +2266,7 @@ class LLAvatarEject : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
+                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                 if( avatar )
                 {
                         LLUUID* avatar_id = new LLUUID( avatar->getID() );
@@ -2296,7 +2296,7 @@ class LLAvatarEnableFreezeEject : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
+                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                 bool new_value = (avatar != NULL);
 
                 if (new_value)
@@ -2321,7 +2321,7 @@ class LLAvatarGiveCard : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 llinfos << "handle_give_card()" << llendl;
-                LLViewerObject* dest = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                LLViewerObject* dest = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                 if(dest && dest->isAvatar())
                 {
                         bool found_name = false;
@@ -2778,7 +2778,7 @@ class LLAvatarEnableAddFriend : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getFirstObject());
+                LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
                 bool new_value = avatar && !is_agent_friend(avatar->getID());
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
@@ -3293,7 +3293,7 @@ class LLEditEnableDuplicate : public view_listener_t
 
 void disabled_duplicate(void*)
 {
-        if (LLSelectMgr::getInstance()->getSelection()->getFirstObject())
+        if (LLSelectMgr::getInstance()->getSelection()->getPrimaryObject())
         {
                 LLNotifyBox::showXml("CopyFailed");
         }
@@ -4907,13 +4907,20 @@ class LLToolsLookAtSelection : public view_listener_t
                         LLVector3 obj_to_cam = LLViewerCamera::getInstance()->getOrigin() - selection_bbox.getCenterAgent();
                         obj_to_cam.normVec();
 
+                        LLUUID object_id;
+                        if (LLSelectMgr::getInstance()->getSelection()->getPrimaryObject())
+                        {
+                                object_id = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()->mID;
+                        }
                         if (zoom)
                         {
-                                gAgent.setCameraPosAndFocusGlobal(LLSelectMgr::getInstance()->getSelectionCenterGlobal() + LLVector3d(obj_to_cam * distance), LLSelectMgr::getInstance()->getSelectionCenterGlobal(), LLSelectMgr::getInstance()->getSelection()->getFirstObject()->mID );
+                                gAgent.setCameraPosAndFocusGlobal(LLSelectMgr::getInstance()->getSelectionCenterGlobal() + LLVector3d(obj_to_cam * distance), 
+                                                                                                LLSelectMgr::getInstance()->getSelectionCenterGlobal(), 
+                                                                                                object_id );
                         }
                         else
                         {
-                                gAgent.setFocusGlobal( LLSelectMgr::getInstance()->getSelectionCenterGlobal(), LLSelectMgr::getInstance()->getSelection()->getFirstObject()->mID );
+                                gAgent.setFocusGlobal( LLSelectMgr::getInstance()->getSelectionCenterGlobal(), object_id );
                         }
                 }
                 return true;
@@ -4948,7 +4955,7 @@ class LLAvatarInviteToGroup : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
+                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                 if(avatar)
                 {
                         invite_to_group(avatar->getID());
@@ -4961,7 +4968,7 @@ class LLAvatarAddFriend : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
+                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                 if(avatar && !is_agent_friend(avatar->getID()))
                 {
                         request_friendship(avatar->getID());
@@ -5034,11 +5041,11 @@ class LLEnablePayObject : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getFirstObject());
+                LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
                 bool new_value = (avatar != NULL);
                 if (!new_value)
                 {
-                        LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                        LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                         if( object )
                         {
                                 LLViewerObject *parent = (LLViewerObject *)object->getParent();
@@ -5058,7 +5065,7 @@ class LLObjectEnableSitOrStand : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 bool new_value = false;
-                LLViewerObject* dest_object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                LLViewerObject* dest_object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
 
                 if(dest_object)
                 {
@@ -5423,7 +5430,7 @@ class LLShowAgentProfile : public view_listener_t
                 }
                 else if (userdata.asString() == "hit object")
                 {
-                        LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                        LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                         if (objectp)
                         {
                                 agent_id = objectp->getID();
@@ -5644,7 +5651,7 @@ class LLAttachmentDrop : public view_listener_t
         {
                 // Called when the user clicked on an object attached to them
                 // and selected "Drop".
-                LLViewerObject *object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                LLViewerObject *object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                 if (!object)
                 {
                         llwarns << "handle_drop_attachment() - no object to drop" << llendl;
@@ -5744,7 +5751,7 @@ class LLAttachmentDetach : public view_listener_t
         {
                 // Called when the user clicked on an object attached to them
                 // and selected "Detach".
-                LLViewerObject *object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                LLViewerObject *object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                 if (!object)
                 {
                         llwarns << "handle_detach() - no object to detach" << llendl;
@@ -5824,7 +5831,7 @@ class LLAttachmentEnableDrop : public view_listener_t
                 // in your inventory.  Therefore, we disable the drop option until the
                 // item is in your inventory
 
-                LLViewerObject*              object         = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                LLViewerObject*              object         = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                 LLViewerJointAttachment*     attachment_pt  = NULL;
                 LLInventoryItem*             item           = NULL;
 
@@ -5866,7 +5873,7 @@ class LLAttachmentEnableDrop : public view_listener_t
 
 BOOL enable_detach(void*)
 {
-        LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+        LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
         if (!object) return FALSE;
         if (!object->isAttachment()) return FALSE;
 
@@ -5973,7 +5980,7 @@ class LLAvatarSendIM : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
+                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                 if(avatar)
                 {
                         std::string name("IM");
@@ -6797,7 +6804,7 @@ void handle_dump_avatar_local_textures(void*)
 
 void handle_debug_avatar_textures(void*)
 {
-        LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+        LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
         if (objectp)
         {
                 LLFloaterAvatarTextures::show(objectp->getID());