diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-12-03 17:59:23 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-12-03 17:59:23 +0200 |
| commit | 384ce96d60912b707d475a534c10096043d0308b (patch) | |
| tree | 0d812ae43f62cd4398c26043f269457203b78d11 /indra/newview/llpanelvolume.cpp | |
| parent | b8a764f5b0bdb9e051448fb2bb7d2c1b711c55a4 (diff) | |
MAINT-1274 FIXED Light texture picker snaps back to initial choice
Diffstat (limited to 'indra/newview/llpanelvolume.cpp')
| -rwxr-xr-x | indra/newview/llpanelvolume.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index f1f87e212d..7405f88fe7 100755 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -821,7 +821,12 @@ void LLPanelVolume::onCommitLight( LLUICtrl* ctrl, void* userdata ) self->getChild<LLUICtrl>("Light Ambiance")->setValue(spot_params.mV[2]); } else - { //modifying existing params + { //modifying existing params, this time volobjp won't change params on its own. + if (volobjp->getLightTextureID() != id) + { + volobjp->setLightTextureID(id); + } + LLVector3 spot_params; spot_params.mV[0] = (F32) self->getChild<LLUICtrl>("Light FOV")->getValue().asReal(); spot_params.mV[1] = (F32) self->getChild<LLUICtrl>("Light Focus")->getValue().asReal(); |