diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 23:10:05 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 23:10:05 +0000 |
| commit | 0f00eef21798520bcfe27ae03b3f1b2ae938ff13 (patch) | |
| tree | 81c5b33e296d316a10a76c5a9e4cd09790aaa029 /indra/newview/llmaniptranslate.cpp | |
| parent | ef0eb8dbcf3980a057ad0864efa1c8e1575a8428 (diff) | |
svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
Backport patches and translations from RC branch
Diffstat (limited to 'indra/newview/llmaniptranslate.cpp')
| -rw-r--r-- | indra/newview/llmaniptranslate.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index 1f52f30c88..1963b1a8f5 100644 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -1037,16 +1037,19 @@ BOOL LLManipTranslate::handleMouseUp(S32 x, S32 y, MASK mask) // first, perform normal processing in case this was a quick-click handleHover(x, y, mask); - // make sure arrow colors go back to normal - mManipPart = LL_NO_PART; - gSelectMgr->enableSilhouette(TRUE); + if(hasMouseCapture()) + { + // make sure arrow colors go back to normal + mManipPart = LL_NO_PART; + gSelectMgr->enableSilhouette(TRUE); - // Might have missed last update due to UPDATE_DELAY timing. - gSelectMgr->sendMultipleUpdate( UPD_POSITION ); - - mInSnapRegime = FALSE; - gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK); - //gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject")); + // Might have missed last update due to UPDATE_DELAY timing. + gSelectMgr->sendMultipleUpdate( UPD_POSITION ); + + mInSnapRegime = FALSE; + gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK); + //gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject")); + } return LLManip::handleMouseUp(x, y, mask); } |