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, 4 insertions, 4 deletions

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 52113ce..2754e2c 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -37,7 +37,7 @@
 
 #include <deque>
 
-#include "audioengine.h" 
+#include "llaudioengine.h" 
 #include "indra_constants.h"
 #include "lscript_byteformat.h"
 #include "mean_collision_data.h"
@@ -973,7 +973,7 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
                 LL_DEBUGS("Messaging") << "Highlighting" << item->getUUID()  << LL_ENDL;
                 //highlight item
 
-                LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
+                LLFocusableElement* focus_ctrl = gFocusMgr.getKeyboardFocus();
                 view->getPanel()->setSelection(item->getUUID(), TAKE_FOCUS_NO);
                 gFocusMgr.setKeyboardFocus(focus_ctrl);
         }
@@ -5208,11 +5208,11 @@ void mean_name_callback(const LLUUID &id, const std::string& first, const std::s
                 return;
         }
 
-        static const int max_collision_list_size = 20;
+        static const U32 max_collision_list_size = 20;
         if (gMeanCollisionList.size() > max_collision_list_size)
         {
                 mean_collision_list_t::iterator iter = gMeanCollisionList.begin();
-                for (S32 i=0; i<max_collision_list_size; i++) iter++;
+                for (U32 i=0; i<max_collision_list_size; i++) iter++;
                 for_each(iter, gMeanCollisionList.end(), DeletePointer());
                 gMeanCollisionList.erase(iter, gMeanCollisionList.end());
         }