Add option to disable selection hints
parent
792a38b68c
commit
87fa994ad0
|
|
@ -16245,5 +16245,16 @@
|
|||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>EnableSelectionHints</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether or not to send editing hints to animate the arm when editing an object.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
</map>
|
||||
</llsd>
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
#include "llagent.h"
|
||||
#include "llagentcamera.h"
|
||||
#include "lldrawable.h"
|
||||
#include "llviewercontrol.h"
|
||||
#include "llviewerobjectlist.h"
|
||||
#include "llvoavatar.h"
|
||||
#include "message.h"
|
||||
|
|
@ -221,6 +222,12 @@ void LLHUDEffectPointAt::setTargetPosGlobal(const LLVector3d &target_pos_global)
|
|||
//-----------------------------------------------------------------------------
|
||||
bool LLHUDEffectPointAt::setPointAt(EPointAtType target_type, LLViewerObject *object, LLVector3 position)
|
||||
{
|
||||
static LLCachedControl<bool> enable_selection_hints(gSavedSettings, "EnableSelectionHints", true);
|
||||
if (!enable_selection_hints)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!mSourceObject)
|
||||
{
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -2830,6 +2830,12 @@ void LLVOAvatarSelf::setHoverOffset(const LLVector3& hover_offset, bool send_upd
|
|||
//------------------------------------------------------------------------
|
||||
bool LLVOAvatarSelf::needsRenderBeam()
|
||||
{
|
||||
static LLCachedControl<bool> enable_selection_hints(gSavedSettings, "EnableSelectionHints", true);
|
||||
if (!enable_selection_hints)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
|
||||
|
||||
bool is_touching_or_grabbing = (tool == LLToolGrab::getInstance() && LLToolGrab::getInstance()->isEditing());
|
||||
|
|
|
|||
Loading…
Reference in New Issue