summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobject.cpp
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2015-02-27 14:11:53 +0200
committerandreykproductengine <akleshchev@productengine.com>2015-02-27 14:11:53 +0200
commit40dbdb9b38f9f9a1470c24ab0d98a96ad89cc686 (patch)
tree26e56a62e6347592319d3a8ea7a294e81d16c4cc /indra/newview/llpanelobject.cpp
parent6993f835e702fc41e01fe247427e795974edeb43 (diff)
parent9b45bc992edf8d049d8a1abe2e778870a493295a (diff)
Merge viewer-release and become 3.7.26
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
-rwxr-xr-xindra/newview/llpanelobject.cpp6
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)