summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmgr.cpp
diff options
context:
space:
mode:
authorRuslan Teliuk <ruslantproductengine@lindenlab.com>2016-09-27 15:43:53 +0300
committerRuslan Teliuk <ruslantproductengine@lindenlab.com>2016-09-27 15:43:53 +0300
commit999dc6c61ba48c5bd930e63bfc6dc7d1e494b43c (patch)
tree5c0f00f9521aa0298ff2813d5116cf4b12a04597 /indra/newview/lltoolmgr.cpp
parent25c20f98a88a457b5fa865e8dc302b24378bc842 (diff)
parentfa4376b457b887130e98bd96e6bccb231e8947d2 (diff)
Merged lindenlab/viewer-neko into default
Diffstat (limited to 'indra/newview/lltoolmgr.cpp')
-rw-r--r--indra/newview/lltoolmgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp
index b0e3b5bf89..f6eb290bc3 100644
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -267,7 +267,7 @@ bool LLToolMgr::canEdit()
bool LLToolMgr::buildEnabledOrActive()
{
- return inEdit() || canEdit();
+ return LLFloaterReg::instanceVisible("build") || canEdit();
}
void LLToolMgr::toggleBuildMode(const LLSD& sdname)