summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-09-22 12:46:18 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-09-22 12:46:18 +0300
commit723eae718795725e4008b86008dd1f30969e7b28 (patch)
tree1207dc5fff6ff485b45b0a6ee7ffd1b2c83f8c2b /indra
parent11a48c9313dca972a490b9b530a0abe75bc83a05 (diff)
MAINT-2130 FIXED Update Tools floater after loosing selection.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llfloatertools.cpp10
-rwxr-xr-xindra/newview/llfloatertools.h1
2 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 6dbb202c9d..5ee0d82ae9 100755
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -370,6 +370,7 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
mLandImpactsObserver(NULL),
mDirty(TRUE),
+ mHasSelection(TRUE),
mNeedMediaTitle(TRUE)
{
gFloaterTools = this;
@@ -541,7 +542,14 @@ void LLFloaterTools::refresh()
void LLFloaterTools::draw()
{
- if (mDirty)
+ bool has_selection = !LLSelectMgr::getInstance()->getSelection()->isEmpty();
+ if(!has_selection && (mHasSelection != has_selection))
+ {
+ mDirty = TRUE;
+ }
+ mHasSelection = has_selection;
+
+ if (mDirty)
{
refresh();
mDirty = FALSE;
diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index df481b8d4c..8f586f7da6 100755
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -198,6 +198,7 @@ public:
private:
BOOL mDirty;
+ BOOL mHasSelection;
std::map<std::string, std::string> mStatusText;