diff options
| author | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2015-10-19 15:26:58 +0300 |
|---|---|---|
| committer | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2015-10-19 15:26:58 +0300 |
| commit | 3c26c54e2d467df917e34f21da81c019e9a6190f (patch) | |
| tree | 4c4b69fb6f47f6f0a3688cce7a37a6d539fbd5f6 /indra/newview/llselectmgr.cpp | |
| parent | 8b5c8c7f5b3140a6e1bb132cfe3f387ea44b9c05 (diff) | |
MAINT-5268 FIXED Rotating an object that's used as grid reference goes crazy
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rwxr-xr-x | indra/newview/llselectmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 577c336ac7..1a09b99e73 100755 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -1210,7 +1210,7 @@ void LLSelectMgr::setGridMode(EGridMode mode) updateSelectionCenter(); } -void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &scale) +void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &scale, bool for_snap_guides) { mGridObjects.cleanupNodes(); @@ -1236,7 +1236,7 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 & else if (mGridMode == GRID_MODE_REF_OBJECT && first_grid_object && first_grid_object->mDrawable.notNull()) { LLSelectNode *node = mSelectedObjects->findNode(first_grid_object); - if (node) + if (!for_snap_guides && node) { mGridRotation = node->mSavedRotation; } |