diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-12-03 21:58:42 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-12-03 21:58:42 +0200 |
| commit | 91b4e9b24bd69ba1fe51dffc8c5148d5451ded6d (patch) | |
| tree | 6adeec81155373f1dd9629f14a4e9572ca8503de /indra | |
| parent | 384ce96d60912b707d475a534c10096043d0308b (diff) | |
MAINT-1274 FIXED Cancel in Light Texture Picker does not reverts texture.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llpanelvolume.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index 7405f88fe7..c9f8683e0e 100755 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -713,7 +713,7 @@ void LLPanelVolume::onLightCancelTexture(const LLSD& data) if (LightTextureCtrl) { - LightTextureCtrl->setImageAssetID(LLUUID::null); + LightTextureCtrl->setImageAssetID(mLightSavedTexture); } LLVOVolume *volobjp = (LLVOVolume *) mObject.get(); @@ -722,7 +722,16 @@ void LLPanelVolume::onLightCancelTexture(const LLSD& data) // Cancel the light texture as requested // NORSPEC-292 // - volobjp->setLightTextureID(LLUUID::null); + bool is_spotlight = volobjp->isLightSpotlight(); + volobjp->setLightTextureID(mLightSavedTexture); //updates spotlight + + if (!is_spotlight && mLightSavedTexture.notNull()) + { + LLVector3 spot_params = volobjp->getSpotLightParams(); + getChild<LLUICtrl>("Light FOV")->setValue(spot_params.mV[0]); + getChild<LLUICtrl>("Light Focus")->setValue(spot_params.mV[1]); + getChild<LLUICtrl>("Light Ambiance")->setValue(spot_params.mV[2]); + } } } |