diff options
| author | Howard Stearns <howard.stearns@gmail.com> | 2022-02-28 15:54:23 -0800 |
|---|---|---|
| committer | Howard Stearns <howard.stearns@gmail.com> | 2022-02-28 15:54:23 -0800 |
| commit | 130d0c0704c97a427bc28f9164f71ce67535e894 (patch) | |
| tree | b27e61d8c2e3aeb91ecd1b0b8177ff2a7bdb665e /indra/newview/llselectmgr.cpp | |
| parent | 932b7de5309bc8599655ebb77666c41f5a81cfa9 (diff) | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
Merge branch 'master' of bitbucket.org:lindenlab/viewer into SL-9749
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index b0a566755f..7ed2d7ef62 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -1368,9 +1368,11 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 & } break; case SELECT_TYPE_HUD: - case SELECT_TYPE_WORLD: mGridScale = LLVector3(1.f, 1.f, 1.f) * llmin(gSavedSettings.getF32("GridResolution"), 0.5f); break; + case SELECT_TYPE_WORLD: + mGridScale = LLVector3(1.f, 1.f, 1.f) * gSavedSettings.getF32("GridResolution"); + break; } } llassert(mGridOrigin.isFinite()); |