diff options
author | Josh Bell <josh@lindenlab.com> | 2008-01-18 19:55:25 +0000 |
---|---|---|
committer | Josh Bell <josh@lindenlab.com> | 2008-01-18 19:55:25 +0000 |
commit | 8787690ccc7edf88033c923d6b36f2142ea35ada (patch) | |
tree | 6c8a3cad8eb0691bceb6d4f5d058cb21b0e14434 /indra | |
parent | 980d8c4599a7ebb62696126f3d5c5709a62f6a9f (diff) |
svn merge -r77476:77484 svn+ssh://svn.lindenlab.com/svn/linden/branches/sculptcopy
Shortcut for QAR-223 into release. Fix for DEV-8761/SEC-17 Ability to Access Sculpted Prim Textures from Database without owning actual sculpt texture, allowing for people to "steal" sculpts.
Diffstat (limited to 'indra')
-rw-r--r-- | 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 2463e62d7f..a57993820f 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1095,10 +1095,12 @@ void LLPanelObject::getState( ) { mLabelSculptType->setEnabled(TRUE); } - - } } + else + { + mSculptTextureRevert = LLUUID::null; + } //---------------------------------------------------------------------------- |