Freeze also synchronized avatars when editing an attachment.

On the removal of permYouOwner():

Calling permYouOwner() to determine if an attachment is yours is
not correct: grid gods (and that includes BEFORE requesting admin
status) are marked as owner of everything in their sim.

The reason for that is that otherwise,
  <Melanie_T> if they only had it when actually godding u, the viewer
  would have to have an option to either show the proper menus (it
  doesn't) or allow the sim to refresh the object flags without full
  object updates (it hasn't).
  <Melanie_T> gods often have to act fast, for instance with griefers.
  Having transition to god mode take as long as a full rez just isn't an
  option, apart from the sim load caused by resending all objects.
  <Melanie_T> Then i tried resending only the object that was selected
  but there the arriving object update would close the pie menu.
  So you right-click a prim and the pie menu would close again.

The result has always been that if you are on your own sim, in opensim,
and select an attachment on another avatar, then YOU would freeze, not
the selected avatar. This patch fixes that "opensim related" bug as
well.

indra/llcharacter/llcharacter.cpp

@@ -543,3 +543,17 @@ LLAnimPauseRequest LLCharacter::requestPause()
 	return mPauseRequest;
 }
 
+void LLCharacter::requestPause(std::vector<LLAnimPauseRequest>& avatar_pause_handles)
+{
+	mMotionController.pauseAllMotions();
+	avatar_pause_handles.push_back(mPauseRequest);
+}
+
+void LLCharacter::pauseAllSyncedCharacters(std::vector<LLAnimPauseRequest>& avatar_pause_handles)
+{
+	// Pause this avatar.
+	requestPause(avatar_pause_handles);
+	// Also pause all avatars with synchronized motions.
+	mMotionController.pauseAllSyncedCharacters(avatar_pause_handles);
+}
+

indra/llcharacter/llcharacter.h

@@ -159,6 +159,8 @@ public:
 	void updateMotions(e_update_t update_type);
 
 	LLAnimPauseRequest requestPause();
+	void requestPause(std::vector<LLAnimPauseRequest>& avatar_pause_handles);
+	void pauseAllSyncedCharacters(std::vector<LLAnimPauseRequest>& avatar_pause_handles);
 	BOOL areAnimationsPaused() const { return mMotionController.isPaused(); }
 	void setAnimTimeFactor(F32 factor) { mMotionController.setTimeFactor(factor); }
 	void setTimeStep(F32 time_step) { mMotionController.setTimeStep(time_step); }

indra/llcharacter/llmotioncontroller.cpp

@@ -1257,6 +1257,44 @@ void LLMotionController::refresh_hidden(void)
 		}
 	}
 }
+
+void LLMotionController::pauseAllSyncedCharacters(std::vector<LLAnimPauseRequest>& avatar_pause_handles)
+{
+	// Run over all motions.
+	for (motion_list_t::iterator iter = mActiveMotions.begin(); iter != mActiveMotions.end(); ++iter)
+	{
+		LLMotion* motionp = *iter;
+		AISyncServer* server = motionp->server();
+		if (server && !server->never_synced() && motionp->isActive())			// Skip motions that aren't synchronized at all or that are not active.
+		{
+			// Run over all clients of the found servers.
+			AISyncServer::client_list_t const& clients = server->getClients();
+			for (AISyncServer::client_list_t::const_iterator client = clients.begin(); client != clients.end(); ++client)
+			{
+				LLMotion* motion = dynamic_cast<LLMotion*>(client->mClientPtr);
+				if (!motion)
+				{
+					continue;
+				}
+				LLMotionController* controller = motion->getController();
+				if (controller == this)
+				{
+					continue;
+				}
+				controller->requestPause(avatar_pause_handles);
+			}
+		}
+	}
+}
+
+void LLMotionController::requestPause(std::vector<LLAnimPauseRequest>& avatar_pause_handles)
+{
+	if (mCharacter)
+	{
+		mCharacter->requestPause(avatar_pause_handles);
+	}
+}
+
 //</singu>
 
 //-----------------------------------------------------------------------------

indra/llcharacter/llmotioncontroller.h

@@ -52,6 +52,8 @@
 //-----------------------------------------------------------------------------
 class LLCharacter;
 class LLMotionController;
+class LLPauseRequestHandle;
+typedef LLPointer<LLPauseRequestHandle> LLAnimPauseRequest;
 
 //-----------------------------------------------------------------------------
 // LLMotionRegistry
@@ -160,6 +162,10 @@ public:
 	void pauseAllMotions();
 	void unpauseAllMotions();
 	BOOL isPaused() const { return mPaused; }
+	//<singu>
+	void requestPause(std::vector<LLAnimPauseRequest>& avatar_pause_handles);
+	void pauseAllSyncedCharacters(std::vector<LLAnimPauseRequest>& avatar_pause_handles);
+	//</singu>
 
 	void setTimeStep(F32 step);
 

indra/newview/llselectmgr.cpp

@@ -6506,7 +6506,7 @@ void LLSelectMgr::updateSelectionCenter()
 		mSelectionCenterGlobal.clearVec();
 		mShowSelection = FALSE;
 		mSelectionBBox = LLBBox(); 
-		mPauseRequest = NULL;
+		mPauseRequests.clear();
 		resetAgentHUDZoom();
 
 	}
@@ -6516,27 +6516,18 @@ void LLSelectMgr::updateSelectionCenter()
 
 		if (mSelectedObjects->mSelectType == SELECT_TYPE_ATTACHMENT && isAgentAvatarValid())
 		{
-			// Singu Note: Chalice Yao's pause agent on attachment selection
-			if (object->permYouOwner())
+			// Freeze avatars with a selected attachment, and all avatars with synchronized motions, if any.
+			LLVOAvatar* avatar = object->getAvatar();
+			// It is possible that 'avatar' is NULL despite this being an attachment because of some race condition.
+			// In that case just don't freeze the avatar.
+			if (avatar)
 			{
-				mPauseRequest = gAgentAvatarp->requestPause();
-			}
-			else if (LLViewerObject* objectp = mSelectedObjects->getPrimaryObject())
-			{
-				while (objectp && !objectp->isAvatar())
-				{
-					objectp = (LLViewerObject*)objectp->getParent();
-				}
-
-				if (objectp)
-				{
-					mPauseRequest = objectp->asAvatar()->requestPause();
-				}
+				avatar->pauseAllSyncedCharacters(mPauseRequests);
 			}
 		}
 		else
 		{
-			mPauseRequest = NULL;
+			mPauseRequests.clear();
 		}
 
 		if (mSelectedObjects->mSelectType != SELECT_TYPE_HUD && isAgentAvatarValid())

indra/newview/llselectmgr.h

@@ -793,7 +793,7 @@ private:
 	LLFrameTimer			mEffectsTimer;
 	BOOL					mForceSelection;
 
-	LLAnimPauseRequest		mPauseRequest;
+	std::vector<LLAnimPauseRequest> mPauseRequests;	// Selected avatar and all synchronized avatars.
 
 	friend class LLObjectBackup;
 };