From 02dba611b21f1a1e72083ab36475b627489779e7 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 21 Feb 2020 16:57:37 +0200 Subject: SL-10326 Develop submenu option Allow Select Avatar was defective Viewer should now filter out position changes from server when avatar is being edited. --- indra/newview/llselectmgr.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/llselectmgr.h') diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index 3bed484b58..75d11dd06b 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -458,6 +458,13 @@ public: void clearSelections(); void update(); void updateEffects(); // Update HUD effects + + // When we edit object's position/rotation/scale we set local + // overrides and ignore any updates (override received valeus). + // When we send data to server, we send local values and reset + // overrides + void resetObjectOverrides(); + void resetObjectOverrides(LLObjectSelectionHandle selected_handle); void overrideObjectUpdates(); // Returns the previous value of mForceSelection -- cgit v1.2.3 From f554fe2ca74ddf275e47cdce8537e04ab40f9f95 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 10 Jul 2020 23:44:55 +0300 Subject: SL-10326 Allow selecting any movable avatars with 'Allow Select Avatar' option --- indra/newview/llselectmgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llselectmgr.h') diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index 75d11dd06b..57fdfce152 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -732,7 +732,7 @@ public: LLPermissions* findObjectPermissions(const LLViewerObject* object); - BOOL isSelfAvatarSelected(); + BOOL isMovableAvatarSelected(); void selectDelete(); // Delete on simulator void selectForceDelete(); // just delete, no into trash -- cgit v1.2.3