SL-13867 Developer ability to select and reposition multiple avatars

1 files changed, 24 insertions, 0 deletions

diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 57fdfce152..9d6cdbc8b4 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -467,6 +467,30 @@ public:
 	void resetObjectOverrides(LLObjectSelectionHandle selected_handle);
 	void overrideObjectUpdates();
 
+    void resetAvatarOverrides();
+    void overrideAvatarUpdates();
+
+    struct AvatarPositionOverride
+    {
+        AvatarPositionOverride();
+        AvatarPositionOverride(LLVector3 &vec, LLQuaternion &quat, LLViewerObject *obj) :
+            mLastPositionLocal(vec),
+            mLastRotation(quat),
+            mObject(obj)
+        {
+        }
+        LLVector3 mLastPositionLocal;
+        LLQuaternion mLastRotation;
+        LLPointer<LLViewerObject> mObject;
+    };
+
+    // Avatar overrides should persist even after selection
+    // was removed as long as edit floater is up
+    typedef std::map<LLUUID, AvatarPositionOverride> uuid_av_override_map_t;
+    uuid_av_override_map_t mAvatarOverridesMap;
+public:
+
+
 	// Returns the previous value of mForceSelection
 	BOOL setForceSelection(BOOL force);