diff options
| author | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2015-09-03 19:21:49 +0300 |
|---|---|---|
| committer | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2015-09-03 19:21:49 +0300 |
| commit | bc8fe00b991522ea310efd2eac3af24a11a05964 (patch) | |
| tree | 6861a93c78937b5328a2845028a180accf39393e /indra/newview/llselectmgr.cpp | |
| parent | 9cddfc5a0e89f94e56eed8cf49501f1d0cb35138 (diff) | |
MAINT-5268 (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 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 55bcb3dc65..49a7ab3280 100755 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -1235,7 +1235,13 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 & } else if (mGridMode == GRID_MODE_REF_OBJECT && first_grid_object && first_grid_object->mDrawable.notNull()) { - mGridRotation = first_grid_object->getRenderRotation(); + LLSelectNode *node = mSelectedObjects->findNode(first_grid_object); + if (node) { + mGridRotation = node->mSavedRotation; + } + else { + mGridRotation = first_grid_object->getRenderRotation(); + } LLVector4a min_extents(F32_MAX); LLVector4a max_extents(-F32_MAX); |