Skip to content

Commit 87fa994

Browse files
FelixWolfakleshchev
authored andcommitted
Add option to disable selection hints
1 parent 792a38b commit 87fa994

File tree

3 files changed

+24
-0
lines changed

3 files changed

+24
-0
lines changed

indra/newview/app_settings/settings.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16245,5 +16245,16 @@
1624516245
<key>Value</key>
1624616246
<integer>1</integer>
1624716247
</map>
16248+
<key>EnableSelectionHints</key>
16249+
<map>
16250+
<key>Comment</key>
16251+
<string>Whether or not to send editing hints to animate the arm when editing an object.</string>
16252+
<key>Persist</key>
16253+
<integer>1</integer>
16254+
<key>Type</key>
16255+
<string>Boolean</string>
16256+
<key>Value</key>
16257+
<integer>1</integer>
16258+
</map>
1624816259
</map>
1624916260
</llsd>

indra/newview/llhudeffectpointat.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "llagent.h"
3535
#include "llagentcamera.h"
3636
#include "lldrawable.h"
37+
#include "llviewercontrol.h"
3738
#include "llviewerobjectlist.h"
3839
#include "llvoavatar.h"
3940
#include "message.h"
@@ -221,6 +222,12 @@ void LLHUDEffectPointAt::setTargetPosGlobal(const LLVector3d &target_pos_global)
221222
//-----------------------------------------------------------------------------
222223
bool LLHUDEffectPointAt::setPointAt(EPointAtType target_type, LLViewerObject *object, LLVector3 position)
223224
{
225+
static LLCachedControl<bool> enable_selection_hints(gSavedSettings, "EnableSelectionHints", true);
226+
if (!enable_selection_hints)
227+
{
228+
return false;
229+
}
230+
224231
if (!mSourceObject)
225232
{
226233
return false;

indra/newview/llvoavatarself.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2830,6 +2830,12 @@ void LLVOAvatarSelf::setHoverOffset(const LLVector3& hover_offset, bool send_upd
28302830
//------------------------------------------------------------------------
28312831
bool LLVOAvatarSelf::needsRenderBeam()
28322832
{
2833+
static LLCachedControl<bool> enable_selection_hints(gSavedSettings, "EnableSelectionHints", true);
2834+
if (!enable_selection_hints)
2835+
{
2836+
return false;
2837+
}
2838+
28332839
LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
28342840

28352841
bool is_touching_or_grabbing = (tool == LLToolGrab::getInstance() && LLToolGrab::getInstance()->isEditing());

0 commit comments

Comments
 (0)