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/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 09336cb..a94f7cf 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -94,7 +94,7 @@ public:
         // requires trusted browser
         LLPreferencesHandler() : LLCommandHandler("preferences", true) { }
         bool handle(const LLSD& tokens, const LLSD& query_map,
-                                LLWebBrowserCtrl* web)
+                                LLMediaCtrl* web)
         {
                 LLFloaterPreference::show(NULL);
                 return true;
@@ -445,7 +445,7 @@ void LLFloaterPreference::onBtnOK( void* userdata )
         // commit any outstanding text entry
         if (fp->hasFocus())
         {
-                LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
+                LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
                 if (cur_focus->acceptsTextInput())
                 {
                         cur_focus->onCommit();
@@ -479,7 +479,7 @@ void LLFloaterPreference::onBtnApply( void* userdata )
         LLFloaterPreference *fp =(LLFloaterPreference *)userdata;
         if (fp->hasFocus())
         {
-                LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
+                LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
                 if (cur_focus->acceptsTextInput())
                 {
                         cur_focus->onCommit();
@@ -505,7 +505,7 @@ void LLFloaterPreference::onBtnCancel( void* userdata )
         LLFloaterPreference *fp =(LLFloaterPreference *)userdata;
         if (fp->hasFocus())
         {
-                LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
+                LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
                 if (cur_focus->acceptsTextInput())
                 {
                         cur_focus->onCommit();