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.h | |
parent | a91482f0afa38c39a027f5b54bca652147917f2a (diff) | |
parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) |
merge changes for 3.7.25-release
Diffstat (limited to 'indra/newview/llpanelobject.h')
-rwxr-xr-x | indra/newview/llpanelobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index c4cf27ab1a..8829f493fa 100755 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -140,6 +140,7 @@ protected: LLSpinCtrl* mCtrlScaleX; LLSpinCtrl* mCtrlScaleY; LLSpinCtrl* mCtrlScaleZ; + BOOL mSizeChanged; LLTextBox* mLabelRotation; LLSpinCtrl* mCtrlRotX; |