diff options
author | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
commit | 4c8e526b99cb717e9086dec87a94b56fecad8984 (patch) | |
tree | 45294c593721be9bc8def1563b07438554dfa08b /indra/newview/llmanipscale.cpp | |
parent | d3387faca57c560279a6b8b83711a789b84f0ecd (diff) | |
parent | a0a61ff61e6cf38ccbd0d0a9eecb10d532feaf55 (diff) |
merge changes for callum fixes and workarounds
Diffstat (limited to 'indra/newview/llmanipscale.cpp')
-rwxr-xr-x | indra/newview/llmanipscale.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp index 2810941d83..84bec74a16 100755 --- a/indra/newview/llmanipscale.cpp +++ b/indra/newview/llmanipscale.cpp @@ -229,8 +229,6 @@ void LLManipScale::render() const F32 BOX_HANDLE_BASE_SIZE = 50.0f; // box size in pixels = BOX_HANDLE_BASE_SIZE * BOX_HANDLE_BASE_FACTOR const F32 BOX_HANDLE_BASE_FACTOR = 0.2f; - LLVector3 center_agent = gAgent.getPosAgentFromGlobal(LLSelectMgr::getInstance()->getSelectionCenterGlobal()); - if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD) { for (S32 i = 0; i < NUM_MANIPULATORS; i++) |