diff options
author | Aura Linden <aura@lindenlab.com> | 2014-09-19 10:54:55 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2014-09-19 10:54:55 -0700 |
commit | c25a7866408d8590b7e9672d019089cb1358dbce (patch) | |
tree | 22c361d0b9647c74813fda9cffd75617036cef17 /indra/newview/lltoolmgr.cpp | |
parent | 9ae872da5996d6c7d1f35fbf5f5c6edc75fae3c5 (diff) | |
parent | 951c83724d7e364ac52cbee2d657711fda7d2c26 (diff) |
Pulled merge from viewer-tiger
Diffstat (limited to 'indra/newview/lltoolmgr.cpp')
-rwxr-xr-x | indra/newview/lltoolmgr.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp index aa55caf7ec..175227173f 100755 --- a/indra/newview/lltoolmgr.cpp +++ b/indra/newview/lltoolmgr.cpp @@ -34,6 +34,7 @@ //#include "llfirstuse.h" // tools and manipulators +#include "llfloaterinspect.h" #include "lltool.h" #include "llmanipscale.h" #include "llselectmgr.h" @@ -218,7 +219,20 @@ LLTool* LLToolMgr::getCurrentTool() } if (cur_tool) { - cur_tool->handleSelect(); + if ( LLToolCompInspect::getInstance()->isToolCameraActive() + && prev_tool == LLToolCamera::getInstance() + && cur_tool == LLToolPie::getInstance() ) + { + LLFloaterInspect * inspect_instance = LLFloaterReg::getTypedInstance<LLFloaterInspect>("inspect"); + if(inspect_instance && inspect_instance->getVisible()) + { + setTransientTool(LLToolCompInspect::getInstance()); + } + } + else + { + cur_tool->handleSelect(); + } } } |