From cd9dcc418f7325aa23b0ad97b5b5627fb5fd0f89 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 27 Jul 2013 12:50:48 +0200 Subject: [PATCH] FIRE-11024: Clicking Mesh Fail Triangles Opens Script Error Window --- indra/newview/llhudicon.h | 1 + indra/newview/lltoolpie.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/llhudicon.h b/indra/newview/llhudicon.h index 144ecea66b..c03ea3da53 100755 --- a/indra/newview/llhudicon.h +++ b/indra/newview/llhudicon.h @@ -77,6 +77,7 @@ public: // Mark script error icons void setScriptError(); + bool getScriptError() const { return mScriptError; } static BOOL scriptIconsNearby(); // Mark script error icons diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index c629fbd557..9f28c41579 100755 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -355,7 +355,9 @@ BOOL LLToolPie::handleLeftClickPick() } LLHUDIcon* last_hit_hud_icon = mPick.mHUDIcon; - if (!object && last_hit_hud_icon && last_hit_hud_icon->getSourceObject()) + // FIRE-11024: Only open script debug floater if it's a script error + //if (!object && last_hit_hud_icon && last_hit_hud_icon->getSourceObject()) + if (!object && last_hit_hud_icon && last_hit_hud_icon->getScriptError() && last_hit_hud_icon->getSourceObject()) { LLFloaterScriptDebug::show(last_hit_hud_icon->getSourceObject()->getID()); }