diff options
| author | Cinder Biscuits <cinder@alchemyviewer.org> | 2015-02-26 14:55:50 -0700 |
|---|---|---|
| committer | Cinder Biscuits <cinder@alchemyviewer.org> | 2015-02-26 14:55:50 -0700 |
| commit | d9673d6c1d67ac104fc7872ea2da88560832dd28 (patch) | |
| tree | b2ab207152ee7b025eab69eed03733819bdf3d05 /indra/newview/llpanelobject.cpp | |
| parent | 4665d35453f00fcccd6e17ea84d0549f62b07c5f (diff) | |
| parent | d4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff) | |
Merged lindenlab/viewer-tools-update into default
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 ba23e7013d..dcd0aab3ab 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) |