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, 3 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h
index 113b679..4105f44 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -64,6 +64,7 @@ class LLParcelSelection;
 class LLPanelLandGeneral;
 class LLPanelLandObjects;
 class LLPanelLandOptions;
+class LLPanelLandAudio;
 class LLPanelLandMedia;
 class LLPanelLandAccess;
 class LLPanelLandBan;
@@ -102,6 +103,7 @@ protected:
         static void* createPanelLandCovenant(void* data);
         static void* createPanelLandObjects(void* data);
         static void* createPanelLandOptions(void* data);
+        static void* createPanelLandAudio(void* data);
         static void* createPanelLandMedia(void* data);
         static void* createPanelLandAccess(void* data);
         static void* createPanelLandBan(void* data);
@@ -115,6 +117,7 @@ protected:
         LLPanelLandGeneral*             mPanelGeneral;
         LLPanelLandObjects*             mPanelObjects;
         LLPanelLandOptions*             mPanelOptions;
+//      LLPanelLandAudio*               mPanelAudio;
         LLPanelLandMedia*               mPanelMedia;
         LLPanelLandAccess*              mPanelAccess;
         LLPanelLandCovenant*    mPanelCovenant;