diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-02-25 17:02:06 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-02-25 17:02:06 -0500 |
| commit | 2ab9678455ce2e894273cae1efd2e10f4aaee42b (patch) | |
| tree | ce679a7b789d75a3d36816438c5a2fd5a5edfd1a /indra/newview/llpanelobject.cpp | |
| parent | d2de97ad8e84eedd42f4a0fe5b258617a96f154b (diff) | |
| parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rwxr-xr-x | indra/newview/llpanelobject.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 9123252f4c..2fece32449 100755 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -285,7 +285,8 @@ LLPanelObject::LLPanelObject() mIsPhantom(FALSE), mSelectedType(MI_BOX), mSculptTextureRevert(LLUUID::null), - mSculptTypeRevert(0) + mSculptTypeRevert(0), + mSizeChanged(FALSE) { } @@ -1620,9 +1621,10 @@ void LLPanelObject::sendScale(BOOL btn_down) LLVector3 newscale(mCtrlScaleX->get(), mCtrlScaleY->get(), mCtrlScaleZ->get()); LLVector3 delta = newscale - mObject->getScale(); - if (delta.magVec() >= 0.0005f) + if (delta.magVec() >= 0.0005f || (mSizeChanged && !btn_down)) { // scale changed by more than 1/2 millimeter + mSizeChanged = btn_down; // check to see if we aren't scaling the textures // (in which case the tex coord's need to be recomputed) |