aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelvolume.h
diff options
context:
space:
mode:
authorArmin Weatherwax2010-09-07 13:41:02 +0200
committerArmin Weatherwax2010-09-23 15:42:40 +0200
commit087e15e89930d51c3964329befb273ae3b2d330d (patch)
tree684c49a772b0097ed88a25660e1fd3dd10b264cc /linden/indra/newview/llpanelvolume.h
parentRobin Cornelius: fixes for building plugins on Linux 64bit (diff)
downloadmeta-impy-087e15e89930d51c3964329befb273ae3b2d330d.zip
meta-impy-087e15e89930d51c3964329befb273ae3b2d330d.tar.gz
meta-impy-087e15e89930d51c3964329befb273ae3b2d330d.tar.bz2
meta-impy-087e15e89930d51c3964329befb273ae3b2d330d.tar.xz
port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 texture system
Diffstat (limited to 'linden/indra/newview/llpanelvolume.h')
-rw-r--r--linden/indra/newview/llpanelvolume.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/linden/indra/newview/llpanelvolume.h b/linden/indra/newview/llpanelvolume.h
index 841880b..5d206fc 100644
--- a/linden/indra/newview/llpanelvolume.h
+++ b/linden/indra/newview/llpanelvolume.h
@@ -74,6 +74,10 @@ public:
74 static void onLightCancelColor(LLUICtrl* ctrl, void* userdata); 74 static void onLightCancelColor(LLUICtrl* ctrl, void* userdata);
75 static void onLightSelectColor(LLUICtrl* ctrl, void* userdata); 75 static void onLightSelectColor(LLUICtrl* ctrl, void* userdata);
76 76
77 static void onLightCancelTexture(LLUICtrl* ctrl, void* userdata);
78 static void onLightSelectTexture(LLUICtrl* ctrl, void* userdata);
79
80
77protected: 81protected:
78 void getState(); 82 void getState();
79 83
@@ -99,6 +103,7 @@ protected:
99*/ 103*/
100 104
101 LLColor4 mLightSavedColor; 105 LLColor4 mLightSavedColor;
106 LLUUID mLightSavedTexture;
102 LLPointer<LLViewerObject> mObject; 107 LLPointer<LLViewerObject> mObject;
103 LLPointer<LLViewerObject> mRootObject; 108 LLPointer<LLViewerObject> mRootObject;
104}; 109};