diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-02-24 15:48:28 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-02-24 15:48:28 -0500 |
| commit | 905431cf60c5670b6b069f0881778ada6ceaa035 (patch) | |
| tree | 59cc1d383cc9025a499cae686bc5786992d7febe /indra/newview/llpanelobject.cpp | |
| parent | a91482f0afa38c39a027f5b54bca652147917f2a (diff) | |
| parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) | |
merge changes for 3.7.25-release
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) |