20 files changed, 186 insertions, 172 deletions

diff --git a/linden/indra/llui/CMakeLists.txt b/linden/indra/llui/CMakeLists.txt
index a0f80b4..e6b3b63 100644
--- a/linden/indra/llui/CMakeLists.txt
+++ b/linden/indra/llui/CMakeLists.txt
@@ -3,11 +3,9 @@
 project(llui)
 
 include(00-Common)
-include(LLAudio)
 include(LLCommon)
 include(LLImage)
 include(LLMath)
-include(LLMedia)
 include(LLMessage)
 include(LLRender)
 include(LLWindow)
@@ -15,11 +13,9 @@ include(LLVFS)
 include(LLXML)
 
 include_directories(
-    ${LLAUDIO_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLIMAGE_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
-    ${LLMEDIA_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
     ${LLRENDER_INCLUDE_DIRS}
     ${LLWINDOW_INCLUDE_DIRS}
@@ -141,3 +137,14 @@ set_source_files_properties(${llui_HEADER_FILES}
 list(APPEND llui_SOURCE_FILES ${llui_HEADER_FILES})
 
 add_library (llui ${llui_SOURCE_FILES})
+# Libraries on which this library depends, needed for Linux builds
+# Sort by high-level to low-level
+target_link_libraries(llui
+    llrender
+    llwindow
+    llimage
+    llvfs       # ugh, just for LLDir
+    llxml
+    llcommon    # must be after llimage, llwindow, llrender
+    llmath
+    )
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 1a6c705..702e34e 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -840,6 +840,11 @@ void LLButton::setColor(const LLColor4& color)
         setImageColor(color);
 }
 
+void LLButton::setAlpha(F32 alpha)
+{
+        mImageColor.setAlpha(alpha);
+        mDisabledImageColor.setAlpha(alpha * 0.5f);
+}
 
 void LLButton::setImageDisabled(LLPointer<LLUIImage> image)
 {
diff --git a/linden/indra/llui/llbutton.h b/linden/indra/llui/llbutton.h
index 724b775..2174d95 100644
--- a/linden/indra/llui/llbutton.h
+++ b/linden/indra/llui/llbutton.h
@@ -136,7 +136,8 @@ public:
 
         void                    setImageColor(const std::string& color_control);
         void                    setImageColor(const LLColor4& c);
-        virtual void    setColor(const LLColor4& c);
+        /*virtual*/ void        setColor(const LLColor4& c);
+        /*virtual*/ void        setAlpha(F32 alpha);
 
         void                    setImages(const std::string &image_name, const std::string &selected_name);
         void                    setDisabledImages(const std::string &image_name, const std::string &selected_name);
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index f6451a1..bb42ca3 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -1459,9 +1459,9 @@ void LLFloater::draw()
         {
                 if (hasFocus() && getDefaultButton()->getEnabled())
                 {
-                        LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
+                        LLFocusableElement* focus_ctrl = gFocusMgr.getKeyboardFocus();
                         // is this button a direct descendent and not a nested widget (e.g. checkbox)?
-                        BOOL focus_is_child_button = dynamic_cast<LLButton*>(focus_ctrl) != NULL && focus_ctrl->getParent() == this;
+                        BOOL focus_is_child_button = dynamic_cast<LLButton*>(focus_ctrl) != NULL && dynamic_cast<LLButton*>(focus_ctrl)->getParent() == this;
                         // only enable default button when current focus is not a button
                         getDefaultButton()->setBorderEnabled(!focus_is_child_button);
                 }
@@ -1481,7 +1481,7 @@ void LLFloater::draw()
         else
         {
                 // draw children
-                LLView* focused_child = gFocusMgr.getKeyboardFocus();
+                LLView* focused_child = dynamic_cast<LLView*>(gFocusMgr.getKeyboardFocus());
                 BOOL focused_child_visible = FALSE;
                 if (focused_child && focused_child->getParent() == this)
                 {
@@ -2239,7 +2239,7 @@ BOOL LLFloaterView::allChildrenClosed()
                 LLView* viewp = *it;
                 LLFloater* floaterp = (LLFloater*)viewp;
 
-                if (floaterp->getVisible() && !floaterp->isDead() && floaterp->canClose())
+                if (floaterp->getVisible() && !floaterp->isDead() && floaterp->isCloseable())
                 {
                         return false;
                 }
diff --git a/linden/indra/llui/llfocusmgr.cpp b/linden/indra/llui/llfocusmgr.cpp
index 661ffdd..96b01b9 100644
--- a/linden/indra/llui/llfocusmgr.cpp
+++ b/linden/indra/llui/llfocusmgr.cpp
@@ -38,6 +38,68 @@
 
 const F32 FOCUS_FADE_TIME = 0.3f;
 
+// NOTE: the LLFocusableElement implementation has been here from lluictrl.cpp.
+
+LLFocusableElement::LLFocusableElement()
+:       mFocusLostCallback(NULL),
+        mFocusReceivedCallback(NULL),
+        mFocusChangedCallback(NULL),
+        mFocusCallbackUserData(NULL)
+{
+}
+
+// virtual
+BOOL LLFocusableElement::handleKey(KEY key, MASK mask, BOOL called_from_parent)
+{
+        return FALSE;
+}
+
+// virtual
+BOOL LLFocusableElement::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
+{
+        return FALSE;
+}
+
+// virtual
+LLFocusableElement::~LLFocusableElement()
+{
+}
+
+void LLFocusableElement::onFocusReceived()
+{
+        if( mFocusReceivedCallback )
+        {
+                mFocusReceivedCallback( this, mFocusCallbackUserData );
+        }
+        if( mFocusChangedCallback )
+        {
+                mFocusChangedCallback( this, mFocusCallbackUserData );
+        }
+}
+
+void LLFocusableElement::onFocusLost()
+{
+        if( mFocusLostCallback )
+        {
+                mFocusLostCallback( this, mFocusCallbackUserData );
+        }
+
+        if( mFocusChangedCallback )
+        {
+                mFocusChangedCallback( this, mFocusCallbackUserData );
+        }
+}
+
+BOOL LLFocusableElement::hasFocus() const
+{
+        return gFocusMgr.getKeyboardFocus() == this;
+}
+
+void LLFocusableElement::setFocus(BOOL b)
+{
+}
+
+
 LLFocusMgr gFocusMgr;
 
 LLFocusMgr::LLFocusMgr()
@@ -87,11 +149,13 @@ void LLFocusMgr::releaseFocusIfNeeded( const LLView* view )
 }
 
 
-void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock, BOOL keystrokes_only)
+void LLFocusMgr::setKeyboardFocus(LLFocusableElement* new_focus, BOOL lock, BOOL keystrokes_only)
 {
         if (mLockedView && 
                 (new_focus == NULL || 
-                        (new_focus != mLockedView && !new_focus->hasAncestor(mLockedView))))
+                        (new_focus != mLockedView 
+                        && dynamic_cast<LLView*>(new_focus)
+                        && !dynamic_cast<LLView*>(new_focus)->hasAncestor(mLockedView))))
         {
                 // don't allow focus to go to anything that is not the locked focus
                 // or one of its descendants
@@ -121,7 +185,8 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock, BOOL keystroke
                 mFocusTimer.reset();
 
                 #ifdef _DEBUG
-                        mKeyboardFocusName = new_focus ? new_focus->getName() : std::string("none");
+                        LLUICtrl* focus_ctrl = dynamic_cast<LLUICtrl*>(new_focus);
+                        mKeyboardFocusName = focus_ctrl ? focus_ctrl->getName() : std::string("none");
                 #endif
 
                 // If we've got a default keyboard focus, and the caller is
@@ -131,8 +196,8 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock, BOOL keystroke
                         mDefaultKeyboardFocus->setFocus(TRUE);
                 }
 
-                LLView* focus_subtree = mKeyboardFocus;
-                LLView* viewp = mKeyboardFocus;
+                LLView* focus_subtree = dynamic_cast<LLView*>(mKeyboardFocus);
+                LLView* viewp = dynamic_cast<LLView*>(mKeyboardFocus);
                 // find root-most focus root
                 while(viewp)
                 {
@@ -146,7 +211,8 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock, BOOL keystroke
                 
                 if (focus_subtree)
                 {
-                        mFocusHistory[focus_subtree->getHandle()] = mKeyboardFocus ? mKeyboardFocus->getHandle() : LLHandle<LLView>(); 
+                        LLView* focused_view = dynamic_cast<LLView*>(mKeyboardFocus);
+                        mFocusHistory[focus_subtree->getHandle()] = focused_view ? focused_view->getHandle() : LLHandle<LLView>(); 
                 }
         }
         
@@ -160,7 +226,7 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock, BOOL keystroke
 // Returns TRUE is parent or any descedent of parent has keyboard focus.
 BOOL LLFocusMgr::childHasKeyboardFocus(const LLView* parent ) const
 {
-        LLView* focus_view = mKeyboardFocus;
+        LLView* focus_view = dynamic_cast<LLView*>(mKeyboardFocus);
         while( focus_view )
         {
                 if( focus_view == parent )
@@ -190,7 +256,7 @@ BOOL LLFocusMgr::childHasMouseCapture( const LLView* parent ) const
         return FALSE;
 }
 
-void LLFocusMgr::removeKeyboardFocusWithoutCallback( const LLView* focus )
+void LLFocusMgr::removeKeyboardFocusWithoutCallback( const LLFocusableElement* focus )
 {
         // should be ok to unlock here, as you have to know the locked view
         // in order to unlock it
@@ -313,7 +379,7 @@ void LLFocusMgr::removeTopCtrlWithoutCallback( const LLUICtrl* top_view )
 
 void LLFocusMgr::lockFocus()
 {
-        mLockedView = mKeyboardFocus; 
+        mLockedView = dynamic_cast<LLUICtrl*>(mKeyboardFocus); 
 }
 
 void LLFocusMgr::unlockFocus()
diff --git a/linden/indra/llui/llfocusmgr.h b/linden/indra/llui/llfocusmgr.h
index aaeb25a..88ede1a 100644
--- a/linden/indra/llui/llfocusmgr.h
+++ b/linden/indra/llui/llfocusmgr.h
@@ -37,10 +37,39 @@
 
 #include "llstring.h"
 #include "llframetimer.h"
-#include "llview.h"
+#include "llui.h"
 
 class LLUICtrl;
 class LLMouseHandler;
+class LLView;
+
+class LLFocusableElement
+{
+        friend class LLFocusMgr; // allow access to focus change handlers
+public:
+        LLFocusableElement();
+        virtual ~LLFocusableElement();
+
+        virtual void    setFocus( BOOL b );
+        virtual BOOL    hasFocus() const;
+
+        void                    setFocusLostCallback(void (*cb)(LLFocusableElement* caller, void*), void* user_data = NULL) { mFocusLostCallback = cb; mFocusCallbackUserData = user_data; }
+        void                    setFocusReceivedCallback( void (*cb)(LLFocusableElement*, void*), void* user_data = NULL)       { mFocusReceivedCallback = cb; mFocusCallbackUserData = user_data; }
+        void                    setFocusChangedCallback( void (*cb)(LLFocusableElement*, void*), void* user_data = NULL )               { mFocusChangedCallback = cb; mFocusCallbackUserData = user_data; }
+
+        // These were brought up the hierarchy from LLView so that we don't have to use dynamic_cast when dealing with keyboard focus.
+        virtual BOOL    handleKey(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL    handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
+
+protected:      
+        virtual void    onFocusReceived();
+        virtual void    onFocusLost();
+        void                    (*mFocusLostCallback)( LLFocusableElement* caller, void* userdata );
+        void                    (*mFocusReceivedCallback)( LLFocusableElement* ctrl, void* userdata );
+        void                    (*mFocusChangedCallback)( LLFocusableElement* ctrl, void* userdata );
+        void*                   mFocusCallbackUserData;
+};
+
 
 class LLFocusMgr
 {
@@ -55,11 +84,11 @@ public:
         BOOL                    childHasMouseCapture( const LLView* parent ) const;
 
         // Keyboard Focus
-        void                    setKeyboardFocus(LLUICtrl* new_focus, BOOL lock = FALSE, BOOL keystrokes_only = FALSE);         // new_focus = NULL to release the focus.
-        LLUICtrl*               getKeyboardFocus() const { return mKeyboardFocus; }  
-        LLUICtrl*               getLastKeyboardFocus() const { return mLastKeyboardFocus; }  
+        void                    setKeyboardFocus(LLFocusableElement* new_focus, BOOL lock = FALSE, BOOL keystrokes_only = FALSE);               // new_focus = NULL to release the focus.
+        LLFocusableElement*             getKeyboardFocus() const { return mKeyboardFocus; }  
+        LLFocusableElement*             getLastKeyboardFocus() const { return mLastKeyboardFocus; }  
         BOOL                    childHasKeyboardFocus( const LLView* parent ) const;
-        void                    removeKeyboardFocusWithoutCallback( const LLView* focus );
+        void                    removeKeyboardFocusWithoutCallback( const LLFocusableElement* focus );
         BOOL                    getKeystrokesOnly() { return mKeystrokesOnly; }
         void                    setKeystrokesOnly(BOOL keystrokes_only) { mKeystrokesOnly = keystrokes_only; }
 
@@ -75,8 +104,8 @@ public:
 
         // If setKeyboardFocus(NULL) is called, and there is a non-NULL default
         // keyboard focus view, focus goes there. JC
-        void                    setDefaultKeyboardFocus(LLUICtrl* default_focus) { mDefaultKeyboardFocus = default_focus; }
-        LLUICtrl*               getDefaultKeyboardFocus() const { return mDefaultKeyboardFocus; }
+        void                    setDefaultKeyboardFocus(LLFocusableElement* default_focus) { mDefaultKeyboardFocus = default_focus; }
+        LLFocusableElement*             getDefaultKeyboardFocus() const { return mDefaultKeyboardFocus; }
 
         
         // Top View
@@ -98,9 +127,9 @@ private:
         LLMouseHandler*         mMouseCaptor;                           // Mouse events are premptively routed to this object
 
         // Keyboard Focus
-        LLUICtrl*                       mKeyboardFocus;                         // Keyboard events are preemptively routed to this object
-        LLUICtrl*                       mLastKeyboardFocus;                     // who last had focus
-        LLUICtrl*                       mDefaultKeyboardFocus;
+        LLFocusableElement*     mKeyboardFocus;                         // Keyboard events are preemptively routed to this object
+        LLFocusableElement*     mLastKeyboardFocus;                     // who last had focus
+        LLFocusableElement*     mDefaultKeyboardFocus;
         BOOL                            mKeystrokesOnly;
 
         // Top View
diff --git a/linden/indra/llui/lliconctrl.cpp b/linden/indra/llui/lliconctrl.cpp
index e73c8fe..0df960e 100644
--- a/linden/indra/llui/lliconctrl.cpp
+++ b/linden/indra/llui/lliconctrl.cpp
@@ -112,6 +112,12 @@ void LLIconCtrl::draw()
         LLUICtrl::draw();
 }
 
+// virtual 
+void LLIconCtrl::setAlpha(F32 alpha)
+{
+        mColor.setAlpha(alpha);
+}
+
 // virtual
 void LLIconCtrl::setValue(const LLSD& value )
 {
diff --git a/linden/indra/llui/lliconctrl.h b/linden/indra/llui/lliconctrl.h
index 50778cf..2506fb2 100644
--- a/linden/indra/llui/lliconctrl.h
+++ b/linden/indra/llui/lliconctrl.h
@@ -65,6 +65,8 @@ public:
         virtual void    setValue(const LLSD& value );
         virtual LLSD    getValue() const;
 
+        /*virtual*/ void        setAlpha(F32 alpha);
+
         void                    setColor(const LLColor4& color) { mColor = color; }
 
         virtual LLXMLNodePtr getXML(bool save_children = true) const;
diff --git a/linden/indra/llui/llmultisliderctrl.cpp b/linden/indra/llui/llmultisliderctrl.cpp
index b76c2f6..f9ec6d5 100644
--- a/linden/indra/llui/llmultisliderctrl.cpp
+++ b/linden/indra/llui/llmultisliderctrl.cpp
@@ -34,9 +34,6 @@
 
 #include "llmultisliderctrl.h"
 
-#include "audioengine.h"
-#include "sound_ids.h"
-
 #include "llmath.h"
 #include "llfontgl.h"
 #include "llgl.h"
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index 709342b..26137d7 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -203,6 +203,12 @@ void LLPanel::draw()
         LLView::draw();
 }
 
+/*virtual*/
+void LLPanel::setAlpha(F32 alpha)
+{
+        mBgColorOpaque.setAlpha(alpha);
+}
+
 void LLPanel::updateDefaultBtn()
 {
         // This method does not call LLView::draw() so callers will need
@@ -213,8 +219,7 @@ void LLPanel::updateDefaultBtn()
         {
                 if (gFocusMgr.childHasKeyboardFocus( this ) && mDefaultBtn->getEnabled())
                 {
-                        LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
-                        LLButton* buttonp = dynamic_cast<LLButton*>(focus_ctrl);
+                        LLButton* buttonp = dynamic_cast<LLButton*>(gFocusMgr.getKeyboardFocus());
                         BOOL focus_is_child_button = buttonp && buttonp->getCommitOnReturn();
                         // only enable default button when current focus is not a return-capturing button
                         mDefaultBtn->setBorderEnabled(!focus_is_child_button);
@@ -276,7 +281,7 @@ BOOL LLPanel::handleKeyHere( KEY key, MASK mask )
 {
         BOOL handled = FALSE;
 
-        LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
+        LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
 
         // handle user hitting ESC to defocus
         if (key == KEY_ESCAPE)
@@ -800,6 +805,14 @@ void LLPanel::childSetColor(const std::string& id, const LLColor4& color)
                 child->setColor(color);
         }
 }
+void LLPanel::childSetAlpha(const std::string& id, F32 alpha)
+{
+        LLUICtrl* child = getChild<LLUICtrl>(id, true);
+        if (child)
+        {
+                child->setAlpha(alpha);
+        }
+}
 
 LLCtrlSelectionInterface* LLPanel::childGetSelectionInterface(const std::string& id) const
 {
diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h
index 756d02e..378b357 100644
--- a/linden/indra/llui/llpanel.h
+++ b/linden/indra/llui/llpanel.h
@@ -82,6 +82,8 @@ public:
 
         // From LLFocusableElement
         /*virtual*/ void        setFocus( BOOL b );
+        virtual void setAlpha(F32 alpha);
+
         
         // New virtuals
         virtual         void    refresh();      // called in setFocus()
@@ -174,6 +176,7 @@ public:
         void childSetUserData(const std::string& id, void* userdata);
 
         void childSetColor(const std::string& id, const LLColor4& color);
+        void childSetAlpha(const std::string& id, F32 alpha);
 
         LLCtrlSelectionInterface* childGetSelectionInterface(const std::string& id) const;
         LLCtrlListInterface* childGetListInterface(const std::string& id) const;
diff --git a/linden/indra/llui/llsliderctrl.cpp b/linden/indra/llui/llsliderctrl.cpp
index 8a13ed4..51d43fb 100644
--- a/linden/indra/llui/llsliderctrl.cpp
+++ b/linden/indra/llui/llsliderctrl.cpp
@@ -34,8 +34,6 @@
 
 #include "llsliderctrl.h"
 
-#include "audioengine.h"
-
 #include "llmath.h"
 #include "llfontgl.h"
 #include "llgl.h"
diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index 7eccaca..e66b20e 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -45,7 +45,6 @@
 #include "lltextbox.h"
 #include "llkeyboard.h"
 #include "llmath.h"
-#include "audioengine.h"
 #include "llcontrol.h"
 #include "llfocusmgr.h"
 #include "llresmgr.h"
diff --git a/linden/indra/llui/lltextparser.cpp b/linden/indra/llui/lltextparser.cpp
index 925b118..707dd0a 100644
--- a/linden/indra/llui/lltextparser.cpp
+++ b/linden/indra/llui/lltextparser.cpp
@@ -1,6 +1,5 @@
 /** 
- * @file lltexteditor.cpp
- * @brief LLTextEditor base class
+ * @file lltextparser.cpp
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
@@ -32,6 +31,8 @@
 
 #include "linden_common.h"
 
+#include "lltextparser.h"
+
 #include "llsd.h"
 #include "llsdserialize.h"
 #include "llerror.h"
@@ -40,23 +41,13 @@
 #include "message.h"
 #include "llmath.h"
 #include "v4color.h"
-#include "audioengine.h"
-#include "llwindow.h"
 #include "lldir.h"
 
-#include "lltextparser.h"
-//#include "lltexttospeech.h"
-
 // Routines used for parsing text for TextParsers and html
 
 LLTextParser* LLTextParser::sInstance = NULL;
 
 //
-// Constants
-//
-const F32 SOUND_GAIN = 1.0f;
-
-//
 // Member Functions
 //
 
@@ -76,38 +67,7 @@ LLTextParser* LLTextParser::getInstance()
         return sInstance;
 }
 
-void LLTextParser::triggerAlerts(LLUUID agent_id, LLVector3d position, std::string text, LLWindow* viewer_window)
-{
-//    bool spoken=FALSE;
-        for (S32 i=0;i<mHighlights.size();i++)
-        {
-                if (findPattern(text,mHighlights[i]) >= 0 )
-                {
-                        if(gAudiop)
-                        {
-                                if ((std::string)mHighlights[i]["sound_lluuid"] != LLUUID::null.asString())
-                                {
-                                        gAudiop->triggerSound(mHighlights[i]["sound_lluuid"].asUUID(), agent_id, SOUND_GAIN, LLAudioEngine::AUDIO_TYPE_UI, position);
-                                }
-/*                              
-                                if (!spoken) 
-                                {
-                                        LLTextToSpeech* text_to_speech = NULL;
-                                        text_to_speech = LLTextToSpeech::getInstance();
-                                        spoken = text_to_speech->speak((LLString)mHighlights[i]["voice"],text); 
-                                }
- */
-                        }
-                        if (mHighlights[i]["flash"])
-                        {
-                                if (viewer_window && viewer_window->getMinimized())
-                                {
-                                        viewer_window->flashIcon(5.f);
-                                }
-                        }
-                }
-        }
-}
+// Moved triggerAlerts() to llfloaterchat.cpp to break llui/llaudio library dependency.
 
 S32 LLTextParser::findPattern(const std::string &text, LLSD highlight)
 {
diff --git a/linden/indra/llui/lltextparser.h b/linden/indra/llui/lltextparser.h
index d69e3a2..32343a2 100644
--- a/linden/indra/llui/lltextparser.h
+++ b/linden/indra/llui/lltextparser.h
@@ -34,12 +34,8 @@
 #ifndef LL_LLTEXTPARSER_H
 #define LL_LLTEXTPARSER_H
 
-#include <vector>
-#include "linden_common.h"
+#include "llsd.h"
 
-#include "lltextparser.h"
-
-class LLSD;
 class LLUUID;
 class LLVector3d;
 class LLColor4;
@@ -59,7 +55,6 @@ public:
         S32  findPattern(const std::string &text, LLSD highlight);
         LLSD parsePartialLineHighlights(const std::string &text,const LLColor4 &color,S32 part=WHOLE, S32 index=0);
         bool parseFullLineHighlights(const std::string &text, LLColor4 *color);
-        void triggerAlerts(LLUUID agent_id, LLVector3d position, std::string text, LLWindow* viewer_window);
 
         std::string getFileName();
         LLSD loadFromDisk();
diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index 57ce13c..75a4467 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -38,7 +38,6 @@
 #include <map>
 
 // Linden library includes
-#include "audioengine.h"
 #include "v2math.h"
 #include "v4color.h"
 #include "llrender.h"
diff --git a/linden/indra/llui/lluictrl.cpp b/linden/indra/llui/lluictrl.cpp
index 9d97312..3f4ab5e 100644
--- a/linden/indra/llui/lluictrl.cpp
+++ b/linden/indra/llui/lluictrl.cpp
@@ -39,54 +39,7 @@
 
 static LLRegisterWidget<LLUICtrl> r("ui_ctrl");
 
-LLFocusableElement::LLFocusableElement()
-:       mFocusLostCallback(NULL),
-        mFocusReceivedCallback(NULL),
-        mFocusChangedCallback(NULL),
-        mFocusCallbackUserData(NULL)
-{
-}
-
-//virtual
-LLFocusableElement::~LLFocusableElement()
-{
-}
-
-void LLFocusableElement::onFocusReceived()
-{
-        if( mFocusReceivedCallback )
-        {
-                mFocusReceivedCallback( this, mFocusCallbackUserData );
-        }
-        if( mFocusChangedCallback )
-        {
-                mFocusChangedCallback( this, mFocusCallbackUserData );
-        }
-}
-
-void LLFocusableElement::onFocusLost()
-{
-        if( mFocusLostCallback )
-        {
-                mFocusLostCallback( this, mFocusCallbackUserData );
-        }
-
-        if( mFocusChangedCallback )
-        {
-                mFocusChangedCallback( this, mFocusCallbackUserData );
-        }
-}
-
-BOOL LLFocusableElement::hasFocus() const
-{
-        return FALSE;
-}
-
-void LLFocusableElement::setFocus(BOOL b)
-{
-}
-
-
+// NOTE: the LLFocusableElement implementation has been moved to llfocusmgr.cpp, to mirror the header where the class is defined.
 
 LLUICtrl::LLUICtrl() :
         mCommitCallback(NULL),
@@ -212,7 +165,7 @@ void LLUICtrl::onFocusReceived()
 
         // find first view in hierarchy above new focus that is a LLUICtrl
         LLView* viewp = getParent();
-        LLUICtrl* last_focus = gFocusMgr.getLastKeyboardFocus();
+        LLUICtrl* last_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getLastKeyboardFocus());
 
         while (viewp && !viewp->isCtrl()) 
         {
@@ -590,6 +543,10 @@ void LLUICtrl::setDoubleClickCallback( void (*cb)(void*) )
 // virtual
 void LLUICtrl::setColor(const LLColor4& color)                                                  
 { }
+// virtual
+
+void LLUICtrl::setAlpha(F32 alpha)                                                      
+{ }
 
 // virtual
 void LLUICtrl::setMinValue(LLSD min_value)                                                              
diff --git a/linden/indra/llui/lluictrl.h b/linden/indra/llui/lluictrl.h
index db41af8..be8e863 100644
--- a/linden/indra/llui/lluictrl.h
+++ b/linden/indra/llui/lluictrl.h
@@ -39,31 +39,8 @@
 #include "llsd.h"
 
 
-class LLFocusableElement
-{
-        friend class LLFocusMgr; // allow access to focus change handlers
-public:
-        LLFocusableElement();
-        virtual ~LLFocusableElement();
-
-        virtual void    setFocus( BOOL b );
-        virtual BOOL    hasFocus() const;
-
-        void                    setFocusLostCallback(void (*cb)(LLFocusableElement* caller, void*), void* user_data = NULL) { mFocusLostCallback = cb; mFocusCallbackUserData = user_data; }
-        void                    setFocusReceivedCallback( void (*cb)(LLFocusableElement*, void*), void* user_data = NULL)       { mFocusReceivedCallback = cb; mFocusCallbackUserData = user_data; }
-        void                    setFocusChangedCallback( void (*cb)(LLFocusableElement*, void*), void* user_data = NULL )               { mFocusChangedCallback = cb; mFocusCallbackUserData = user_data; }
-
-protected:
-        virtual void    onFocusReceived();
-        virtual void    onFocusLost();
-        void                    (*mFocusLostCallback)( LLFocusableElement* caller, void* userdata );
-        void                    (*mFocusReceivedCallback)( LLFocusableElement* ctrl, void* userdata );
-        void                    (*mFocusChangedCallback)( LLFocusableElement* ctrl, void* userdata );
-        void*                   mFocusCallbackUserData;
-};
-
 class LLUICtrl
-: public LLView, public LLFocusableElement
+: public LLView
 {
 public:
         typedef void (*LLUICtrlCallback)(LLUICtrl* ctrl, void* userdata);
@@ -117,6 +94,7 @@ public:
         virtual void    clear();
         virtual void    setDoubleClickCallback( void (*cb)(void*) );
         virtual void    setColor(const LLColor4& color);
+        virtual void    setAlpha(F32 alpha);
         virtual void    setMinValue(LLSD min_value);
         virtual void    setMaxValue(LLSD max_value);
 
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 8de376f..1f76696 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -136,11 +136,6 @@ LLView::~LLView()
 {
         //llinfos << "Deleting view " << mName << ":" << (void*) this << llendl;
 //      llassert(LLView::sIsDrawing == FALSE);
-        if( gFocusMgr.getKeyboardFocus() == this )
-        {
-                llwarns << "View holding keyboard focus deleted: " << getName() << ".  Keyboard focus removed." << llendl;
-                gFocusMgr.removeKeyboardFocusWithoutCallback( this );
-        }
 
         if( hasMouseCapture() )
         {
@@ -1327,7 +1322,7 @@ void LLView::draw()
         LLRect screenRect;
 
         // draw focused control on top of everything else
-        LLView* focus_view = gFocusMgr.getKeyboardFocus();
+        LLUICtrl* focus_view = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
         if (focus_view && focus_view->getParent() != this)
         {
                 focus_view = NULL;
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index 7e09dfa..1c8ab31 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -53,6 +53,7 @@
 #include "stdenums.h"
 #include "lluistring.h"
 #include "llcursortypes.h"
+#include "llfocusmgr.h"
 
 const U32       FOLLOWS_NONE    = 0x00;
 const U32       FOLLOWS_LEFT    = 0x01;
@@ -207,7 +208,7 @@ public:
         }
 };
 
-class LLView : public LLMouseHandler, public LLMortician
+class LLView : public LLMouseHandler, public LLMortician, public LLFocusableElement
 {
 
 public:
@@ -398,9 +399,11 @@ public:
         virtual BOOL    canSnapTo(const LLView* other_view);
 
         virtual void    snappedTo(const LLView* snap_view);
+        
+        // inherited from LLFocusableElement
+        /* virtual */ BOOL      handleKey(KEY key, MASK mask, BOOL called_from_parent);
+        /* virtual */ BOOL      handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
 
-        virtual BOOL    handleKey(KEY key, MASK mask, BOOL called_from_parent);
-        virtual BOOL    handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
         virtual BOOL    handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
                                                                           EDragAndDropType cargo_type,
                                                                           void* cargo_data,
@@ -421,8 +424,9 @@ public:
         BOOL getSaveToXML() const { return mSaveToXML; }
         void setSaveToXML(BOOL b) { mSaveToXML = b; }
 
-        virtual void onFocusLost();
-        virtual void onFocusReceived();
+        // inherited from LLFocusableElement
+        /* virtual */ void onFocusLost();
+        /* virtual */ void onFocusReceived();
 
         typedef enum e_hit_test_type
         {