diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-04-07 12:39:45 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-04-07 12:39:45 -0500 |
| commit | b6d3d2281b855448bbeec33b2d229222d75cd6b1 (patch) | |
| tree | 99b5c533bcf19a4b02247e601939346b6f2151df /indra/newview/llpanelvolume.cpp | |
| parent | 87cce27de3dd23a40d812a7c9000b1972cb4bca3 (diff) | |
| parent | 3b7b578733867efaeb9359df69df1fe400de0f10 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelvolume.cpp')
| -rw-r--r-- | indra/newview/llpanelvolume.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index fbe68b4d92..8b01637239 100644 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -574,7 +574,7 @@ void LLPanelVolume::onCommitLight( LLUICtrl* ctrl, void* userdata ) LLUUID id = LightTextureCtrl->getImageAssetID(); if (id.notNull()) { - if (volobjp->getLightTextureID().isNull()) + if (!volobjp->isLightSpotlight()) { //this commit is making this a spot light, set UI to default params volobjp->setLightTextureID(id); LLVector3 spot_params = volobjp->getSpotLightParams(); @@ -591,7 +591,7 @@ void LLPanelVolume::onCommitLight( LLUICtrl* ctrl, void* userdata ) volobjp->setSpotLightParams(spot_params); } } - else if (volobjp->getLightTextureID().notNull()) + else if (volobjp->isLightSpotlight()) { //no longer a spot light volobjp->setLightTextureID(id); //self->childDisable("Light FOV"); |