diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/llselectmgr.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/llselectmgr.cpp')
| -rw-r--r-- | linden/indra/newview/llselectmgr.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp index 4a6c8ed..bfe0e9c 100644 --- a/linden/indra/newview/llselectmgr.cpp +++ b/linden/indra/newview/llselectmgr.cpp | |||
| @@ -1072,7 +1072,6 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 & | |||
| 1072 | if (mGridMode == GRID_MODE_LOCAL && mSelectedObjects->getObjectCount()) | 1072 | if (mGridMode == GRID_MODE_LOCAL && mSelectedObjects->getObjectCount()) |
| 1073 | { | 1073 | { |
| 1074 | //LLViewerObject* root = getSelectedParentObject(mSelectedObjects->getFirstObject()); | 1074 | //LLViewerObject* root = getSelectedParentObject(mSelectedObjects->getFirstObject()); |
| 1075 | LLBBox bbox = mSavedSelectionBBox; | ||
| 1076 | mGridOrigin = mSavedSelectionBBox.getCenterAgent(); | 1075 | mGridOrigin = mSavedSelectionBBox.getCenterAgent(); |
| 1077 | mGridScale = mSavedSelectionBBox.getExtentLocal() * 0.5f; | 1076 | mGridScale = mSavedSelectionBBox.getExtentLocal() * 0.5f; |
| 1078 | 1077 | ||
| @@ -1090,7 +1089,6 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 & | |||
| 1090 | else if (mGridMode == GRID_MODE_REF_OBJECT && first_grid_object && first_grid_object->mDrawable.notNull()) | 1089 | else if (mGridMode == GRID_MODE_REF_OBJECT && first_grid_object && first_grid_object->mDrawable.notNull()) |
| 1091 | { | 1090 | { |
| 1092 | mGridRotation = first_grid_object->getRenderRotation(); | 1091 | mGridRotation = first_grid_object->getRenderRotation(); |
| 1093 | LLVector3 first_grid_obj_pos = first_grid_object->getRenderPosition(); | ||
| 1094 | 1092 | ||
| 1095 | LLVector3 min_extents(F32_MAX, F32_MAX, F32_MAX); | 1093 | LLVector3 min_extents(F32_MAX, F32_MAX, F32_MAX); |
| 1096 | LLVector3 max_extents(-F32_MAX, -F32_MAX, -F32_MAX); | 1094 | LLVector3 max_extents(-F32_MAX, -F32_MAX, -F32_MAX); |