Merge branch 'mccabe-plugins' into plugins_merge

Conflicts:
	linden/doc/contributions.txt
	linden/indra/cmake/GStreamer.cmake
	linden/indra/cmake/LLMedia.cmake
	linden/indra/cmake/OPENAL.cmake
	linden/indra/llmedia/CMakeLists.txt
	linden/indra/llprimitive/material_codes.h
	linden/indra/newview/chatbar_as_cmdline.cpp
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/pipeline.cpp
	linden/indra/newview/pipeline.h
	linden/indra/newview/viewer_manifest.py
	linden/install.xml

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:
         static void             onLightCancelColor(LLUICtrl* ctrl, void* userdata);
         static void             onLightSelectColor(LLUICtrl* ctrl, void* userdata);
 
+        static void             onLightCancelTexture(LLUICtrl* ctrl, void* userdata);
+        static void             onLightSelectTexture(LLUICtrl* ctrl, void* userdata);
+
+
 protected:
         void                    getState();
 
@@ -99,6 +103,7 @@ protected:
 */
 
         LLColor4                mLightSavedColor;
+        LLUUID                  mLightSavedTexture;
         LLPointer<LLViewerObject> mObject;
         LLPointer<LLViewerObject> mRootObject;
 };