diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-17 23:02:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-17 23:02:00 +0000 |
| commit | 71d28bdbf0baab9302c8f458e3bdbcfc60d656d4 (patch) | |
| tree | 19f051897838d5a75e5ce1e776bb52a330173171 /indra/newview/lltoolmgr.cpp | |
| parent | fc664e93e62645fc6e9659664351e77f3c4b374f (diff) | |
merge release@56803 release-candidate@56833
Diffstat (limited to 'indra/newview/lltoolmgr.cpp')
| -rw-r--r-- | indra/newview/lltoolmgr.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp index 99271e18c5..2c69db10c5 100644 --- a/indra/newview/lltoolmgr.cpp +++ b/indra/newview/lltoolmgr.cpp @@ -160,6 +160,12 @@ void LLToolMgr::initTools() gMouselookToolset->addTool( gToolGun ); // + // Inspect tool + // + gToolInspect = new LLToolCompInspect(); + gBasicToolset->addTool( gToolInspect ); + + // // Face edit tool // // gToolMorph = new LLToolMorph(); @@ -328,6 +334,12 @@ LLTool* LLToolMgr::getCurrentTool(MASK override_mask) mOverrideTool = NULL; return mCurrentTool; } + else if (mCurrentTool == gToolInspect) + { + // ...can't switch out of grab + mOverrideTool = NULL; + return mCurrentTool; + } else { // ...can switch between editing tools |