1 files changed, 117 insertions, 0 deletions

diff --git a/linden/indra/newview/llpanelvolume.cpp b/linden/indra/newview/llpanelvolume.cpp
index 6d014a2..4270f0b 100644
--- a/linden/indra/newview/llpanelvolume.cpp
+++ b/linden/indra/newview/llpanelvolume.cpp
@@ -53,6 +53,7 @@
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
 #include "llcolorswatch.h"
+#include "lltexturectrl.h"
 #include "llcombobox.h"
 #include "llfirstuse.h"
 #include "llfocusmgr.h"
@@ -111,12 +112,28 @@ BOOL	LLPanelVolume::postBuild()
                         LightColorSwatch->setOnSelectCallback(onLightSelectColor);
                         childSetCommitCallback("colorswatch",onCommitLight,this);
                 }
+
+                LLTextureCtrl* LightTexPicker = getChild<LLTextureCtrl>("light texture control");
+                if (LightTexPicker)
+                {
+                        LightTexPicker->setOnCancelCallback(onLightCancelTexture);
+                        LightTexPicker->setOnSelectCallback(onLightSelectTexture);
+                        childSetCommitCallback("light texture control", onCommitLight, this);
+                }
+
                 childSetCommitCallback("Light Intensity",onCommitLight,this);
                 childSetValidate("Light Intensity",precommitValidate);
                 childSetCommitCallback("Light Radius",onCommitLight,this);
                 childSetValidate("Light Radius",precommitValidate);
                 childSetCommitCallback("Light Falloff",onCommitLight,this);
                 childSetValidate("Light Falloff",precommitValidate);
+                
+                childSetCommitCallback("Light FOV", onCommitLight, this);
+                childSetValidate("Light FOV", precommitValidate);
+                childSetCommitCallback("Light Focus", onCommitLight, this);
+                childSetValidate("Light Focus", precommitValidate);
+                childSetCommitCallback("Light Ambiance", onCommitLight, this);
+                childSetValidate("Light Ambiance", precommitValidate);
         }
         
         // Start with everyone disabled
@@ -221,14 +238,32 @@ void LLPanelVolume::getState( )
                         LightColorSwatch->setValid( TRUE );
                         LightColorSwatch->set(volobjp->getLightBaseColor());
                 }
+
+                LLTextureCtrl* LightTextureCtrl = getChild<LLTextureCtrl>("light texture control");
+                if (LightTextureCtrl)
+                {
+                        LightTextureCtrl->setEnabled(TRUE);
+                        LightTextureCtrl->setValid(TRUE);
+                        LightTextureCtrl->setImageAssetID(volobjp->getLightTextureID());
+                }
+
                 childSetEnabled("Light Intensity",true);
                 childSetEnabled("Light Radius",true);
                 childSetEnabled("Light Falloff",true);
 
+                childSetEnabled("Light FOV", true);
+                childSetEnabled("Light Focus", true);
+                childSetEnabled("Light Ambiance", true);
+                
                 childSetValue("Light Intensity",volobjp->getLightIntensity());
                 childSetValue("Light Radius",volobjp->getLightRadius());
                 childSetValue("Light Falloff",volobjp->getLightFalloff());
 
+                LLVector3 params = volobjp->getSpotLightParams();
+                childSetValue("Light FOV", params.mV[0]);
+                childSetValue("Light Focus", params.mV[1]);
+                childSetValue("Light Ambiance", params.mV[2]);
+
                 mLightSavedColor = volobjp->getLightColor();
         }
         else
@@ -244,9 +279,20 @@ void LLPanelVolume::getState( )
                         LightColorSwatch->setEnabled( FALSE );
                         LightColorSwatch->setValid( FALSE );
                 }
+                LLTextureCtrl* LightTextureCtrl = getChild<LLTextureCtrl>("light texture control");
+                if (LightTextureCtrl)
+                {
+                        LightTextureCtrl->setEnabled(FALSE);
+                        LightTextureCtrl->setValid(FALSE);
+                }
+
                 childSetEnabled("Light Intensity",false);
                 childSetEnabled("Light Radius",false);
                 childSetEnabled("Light Falloff",false);
+
+                childSetEnabled("Light FOV",false);
+                childSetEnabled("Light Focus",false);
+                childSetEnabled("Light Ambiance",false);
         }
         
         // Flexible properties
@@ -362,6 +408,13 @@ void LLPanelVolume::clearCtrls()
                 LightColorSwatch->setEnabled( FALSE );
                 LightColorSwatch->setValid( FALSE );
         }
+        LLTextureCtrl* LightTextureCtrl = getChild<LLTextureCtrl>("light texture control");
+        if(LightTextureCtrl)
+        {
+                LightTextureCtrl->setEnabled( FALSE );
+                LightTextureCtrl->setValid( FALSE );
+        }
+
         childSetEnabled("Light Intensity",false);
         childSetEnabled("Light Radius",false);
         childSetEnabled("Light Falloff",false);
@@ -438,6 +491,16 @@ void LLPanelVolume::onLightCancelColor(LLUICtrl* ctrl, void* userdata)
         onLightSelectColor(NULL, userdata);
 }
 
+void LLPanelVolume::onLightCancelTexture(LLUICtrl* ctrl, void* userdata)
+{
+        LLPanelVolume* self = (LLPanelVolume*) userdata;
+        LLTextureCtrl* LightTextureCtrl = self->getChild<LLTextureCtrl>("light texture control");
+        if (LightTextureCtrl)
+        {
+                LightTextureCtrl->setImageAssetID(self->mLightSavedTexture);
+        }
+}
+
 void LLPanelVolume::onLightSelectColor(LLUICtrl* ctrl, void* userdata)
 {
         LLPanelVolume* self = (LLPanelVolume*) userdata;
@@ -459,6 +522,25 @@ void LLPanelVolume::onLightSelectColor(LLUICtrl* ctrl, void* userdata)
         }
 }
 
+void LLPanelVolume::onLightSelectTexture(LLUICtrl* ctrl, void* userdata)
+{
+        LLPanelVolume* self = (LLPanelVolume*) userdata;
+        LLViewerObject* objectp = self->mObject;
+        if (!objectp || (objectp->getPCode() != LL_PCODE_VOLUME))
+        {
+                return;
+        }       
+        LLVOVolume *volobjp = (LLVOVolume *)objectp;
+
+
+        LLTextureCtrl*  LightTextureCtrl = self->getChild<LLTextureCtrl>("light texture control");
+        if(LightTextureCtrl)
+        {
+                LLUUID id = LightTextureCtrl->getImageAssetID();
+                volobjp->setLightTextureID(id);
+                self->mLightSavedTexture = id;
+        }
+}
 // static
 void LLPanelVolume::onCommitLight( LLUICtrl* ctrl, void* userdata )
 {
@@ -474,12 +556,47 @@ void LLPanelVolume::onCommitLight( LLUICtrl* ctrl, void* userdata )
         volobjp->setLightIntensity((F32)self->childGetValue("Light Intensity").asReal());
         volobjp->setLightRadius((F32)self->childGetValue("Light Radius").asReal());
         volobjp->setLightFalloff((F32)self->childGetValue("Light Falloff").asReal());
+
         LLColorSwatchCtrl*      LightColorSwatch = self->getChild<LLColorSwatchCtrl>("colorswatch");
         if(LightColorSwatch)
         {
                 LLColor4        clr = LightColorSwatch->get();
                 volobjp->setLightColor(LLColor3(clr));
         }
+
+        LLTextureCtrl*  LightTextureCtrl = self->getChild<LLTextureCtrl>("light texture control");
+        if(LightTextureCtrl)
+        {
+                LLUUID id = LightTextureCtrl->getImageAssetID();
+                if (id.notNull())
+                {
+                        if (volobjp->getLightTextureID().isNull())
+                        { //this commit is making this a spot light, set UI to default params
+                                volobjp->setLightTextureID(id);
+                                LLVector3 spot_params = volobjp->getSpotLightParams();
+                                self->childSetValue("Light FOV", spot_params.mV[0]);
+                                self->childSetValue("Light Focus", spot_params.mV[1]);
+                                self->childSetValue("Light Ambiance", spot_params.mV[2]);
+                        }
+                        else
+                        { //modifying existing params
+                                LLVector3 spot_params;
+                                spot_params.mV[0] = (F32) self->childGetValue("Light FOV").asReal();
+                                spot_params.mV[1] = (F32) self->childGetValue("Light Focus").asReal();
+                                spot_params.mV[2] = (F32) self->childGetValue("Light Ambiance").asReal();
+                                volobjp->setSpotLightParams(spot_params);
+                        }
+                }
+                else if (volobjp->getLightTextureID().notNull())
+                { //no longer a spot light
+                        volobjp->setLightTextureID(id);
+                        //self->childDisable("Light FOV");
+                        //self->childDisable("Light Focus");
+                        //self->childDisable("Light Ambiance");
+                }
+        }
+
+        
 }
 
 // static