Second Life viewer sources 1.23.0-RC

103 files changed, 4873 insertions, 1287 deletions

diff --git a/linden/indra/llui/CMakeLists.txt b/linden/indra/llui/CMakeLists.txt
index 77efec5..32118e8 100644
--- a/linden/indra/llui/CMakeLists.txt
+++ b/linden/indra/llui/CMakeLists.txt
@@ -36,6 +36,7 @@ set(llui_SOURCE_FILES
     lleditmenuhandler.cpp
     llfloater.cpp
     llfocusmgr.cpp
+    llfunctorregistry.cpp
     lliconctrl.cpp
     llkeywords.cpp
     lllineeditor.cpp
@@ -43,7 +44,9 @@ set(llui_SOURCE_FILES
     llmodaldialog.cpp
     llmultislider.cpp
     llmultisliderctrl.cpp
+    llnotifications.cpp
     llpanel.cpp
+    llprogressbar.cpp
     llradiogroup.cpp
     llresizebar.cpp
     llresizehandle.cpp
@@ -61,10 +64,12 @@ set(llui_SOURCE_FILES
     lltabcontainervertical.cpp
     lltextbox.cpp
     lltexteditor.cpp
+    lltextparser.cpp
     llui.cpp
     lluictrl.cpp
     lluictrlfactory.cpp
     lluistring.cpp
+    lluitrans.cpp
     llundo.cpp
     llviewborder.cpp
     llview.cpp
@@ -85,6 +90,7 @@ set(llui_HEADER_FILES
     lleditmenuhandler.h
     llfloater.h
     llfocusmgr.h
+    llfunctorregistry.h
     llhtmlhelp.h
     lliconctrl.h
     llkeywords.h
@@ -94,7 +100,9 @@ set(llui_HEADER_FILES
     llmodaldialog.h
     llmultisliderctrl.h
     llmultislider.h
+    llnotifications.h
     llpanel.h
+    llprogressbar.h
     llradiogroup.h
     llresizebar.h
     llresizehandle.h
@@ -112,12 +120,14 @@ set(llui_HEADER_FILES
     lltabcontainervertical.h
     lltextbox.h
     lltexteditor.h
+    lltextparser.h
     lluiconstants.h
     lluictrlfactory.h
     lluictrl.h
     lluifwd.h
     llui.h
     lluistring.h
+    lluitrans.h
     lluixmltags.h
     llundo.h
     llviewborder.h
diff --git a/linden/indra/llui/llalertdialog.cpp b/linden/indra/llui/llalertdialog.cpp
index 80e54b6..f321db8 100644
--- a/linden/indra/llui/llalertdialog.cpp
+++ b/linden/indra/llui/llalertdialog.cpp
@@ -1,5 +1,4 @@
-/** 
- * @file llalertdialog.cpp
+/* @file llalertdialog.cpp
  * @brief LLAlertDialog base class
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
@@ -17,7 +16,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -46,85 +46,55 @@
 #include "llxmlnode.h"
 #include "lllineeditor.h"
 #include "lluictrlfactory.h"
-
+#include "llnotifications.h"
+#include "llfunctorregistry.h"
 
 const S32 MAX_ALLOWED_MSG_WIDTH = 400;
 const F32 DEFAULT_BUTTON_DELAY = 0.5f;
 const S32 MSG_PAD = 8;
 
-/*static*/ LLAlertDialog::template_map_t LLAlertDialog::sAlertTemplates;
-/*static*/ LLAlertDialog::template_map_t LLAlertDialog::sIgnorableTemplates;
 /*static*/ LLControlGroup* LLAlertDialog::sSettings = NULL;
-/*static*/ std::map<std::string,LLAlertDialog*> LLAlertDialog::sUniqueActiveMap;
-/*static*/ LLAlertDialog::display_callback_t LLAlertDialog::sDisplayCallback;
-/*static*/ std::string LLAlertDialog::sStringSkipNextTime("Skip this dialog next time");
-/*static*/ std::string LLAlertDialog::sStringAlwaysChoose("Always choose this option");
 /*static*/ LLAlertDialog::URLLoader* LLAlertDialog::sURLLoader;
 
-
 //static
-LLAlertDialog* LLAlertDialog::createXml( const std::string& xml_desc,
-                                                                                 alert_callback_t callback, void *user_data)
+void LLAlertDialog::initClass()
 {
-        LLStringUtil::format_map_t args;
-        return createXml(xml_desc, args, callback, user_data);
+        LLNotificationChannel::buildChannel("Alerts", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alert"));
+        LLNotificationChannel::buildChannel("AlertModal", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alertmodal"));
+        LLNotifications::instance().getChannel("Alerts")->connectChanged(boost::bind(&onNewNotification, _1, false));
+        LLNotifications::instance().getChannel("AlertModal")->connectChanged(boost::bind(&onNewNotification, _1, true));
 }
 
-//static
-LLAlertDialog* LLAlertDialog::createXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args,
-                                                                                 alert_callback_t callback, void *user_data)
+//static 
+bool LLAlertDialog::onNewNotification(const LLSD& notify, bool is_modal)
 {
-        template_map_t::iterator iter = sAlertTemplates.find(xml_desc);
-        if (iter != sAlertTemplates.end())
-        {
-                LLAlertDialogTemplate* xml_template = iter->second;
-                // deletes itself
-                llwarns << "Alert: [" << xml_desc << "] " << llendl;
-                LLAlertDialog* dialog = new LLAlertDialog( xml_template, args, callback, user_data);
-                return dialog;
-        }
-        else
+        LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID());
+        
+        if(notification)
         {
-                LLStringUtil::format_map_t args;
-                args["[ALERT_NAME]"] = xml_desc;
-                llwarns << "Missing Alert: [" << xml_desc << "]" << llendl;
-                LLAlertDialog* dialogp = LLAlertDialog::showXml("MissingAlert", args);
-                if (dialogp == NULL)
+                if (notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "load")
                 {
-                        llerrs << "Bad or missing alerts.xml!" << llendl;
+                        LLAlertDialog* dialog = new LLAlertDialog(notification, is_modal);
+                        dialog->show();
+                }
+                else if (notify["sigtype"].asString() == "change")
+                {
+                        LLAlertDialog* dialog = getInstance(notification->getID());
+                        if (dialog)
+                        {
+                                dialog->show();
+                        }
+                        else
+                        {
+                                LLAlertDialog* dialog = new LLAlertDialog(notification, is_modal);
+                                dialog->show();
+                        }
                 }
-                return NULL;
         }
-}
-
-//static
-LLAlertDialog* LLAlertDialog::showXml( const std::string& xml_desc,
-                                                         alert_callback_t callback, void *user_data)
-{
-        LLStringUtil::format_map_t args;
-        return showXml(xml_desc, args, callback, user_data);
-}
 
-//static
-LLAlertDialog* LLAlertDialog::showXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args,
-                                                         alert_callback_t callback, void *user_data)
-{
-        LLAlertDialog* dialog = createXml(xml_desc, args, callback, user_data);
-        return dialog && dialog->show() ? dialog : NULL;
+        return false;
 }
 
-//static
-LLAlertDialog* LLAlertDialog::showCritical( const std::string& desc, alert_callback_t callback, void *user_data)
-{
-        LLAlertDialogTemplate xml_template;
-        LLStringUtil::format_map_t args;
-        xml_template.mTitle = "Critical Error";
-        xml_template.mMessage = desc;
-        xml_template.mModal = TRUE;
-        xml_template.mOptions.push_back("Quit");
-        LLAlertDialog* dialog = new LLAlertDialog( &xml_template, args, callback, user_data);
-        return dialog && dialog->show() ? dialog : NULL;
-}
 
 //-----------------------------------------------------------------------------
 // Private methods
@@ -132,183 +102,110 @@ LLAlertDialog* LLAlertDialog::showCritical( const std::string& desc, alert_callb
 static const S32 VPAD = 16;
 static const S32 HPAD = 25;
 static const S32 BTN_HPAD = 8;
-static const LLFONT_ID font_name = LLFONT_SANSSERIF;
-
-LLAlertDialog::LLAlertDialog( const LLAlertDialogTemplate* xml_template,
-                                                          const LLStringUtil::format_map_t& args,
-                                                          alert_callback_t callback, void *user_data)
-        :       LLModalDialog( xml_template->mTitle, 100, 100, xml_template->mModal ),  // dummy size.  Will reshape below.
-                mCallback( callback ),
-                mUserData( user_data ),
-                mNumOptions( 0 ),
+static const LLFONT_ID FONT_NAME = LLFONT_SANSSERIF;
+
+LLAlertDialog::LLAlertDialog( LLNotificationPtr notification, bool modal)
+        :       LLModalDialog( notification->getLabel(), 100, 100, modal ),  // dummy size.  Will reshape below.
+                LLInstanceTracker<LLAlertDialog, LLUUID>(notification->getID()),
                 mDefaultOption( 0 ),
-                mOptionChosen( -1 ),
                 mCheck(NULL),
-                mCaution(xml_template->mCaution),
-                mUnique(xml_template->mUnique),
-                mIgnorable(xml_template->mIgnorable),
-                mLabel(xml_template->mLabel),
-                mIgnoreLabel(xml_template->mIgnoreLabel),
-                mButtonData(NULL),
+                mCaution(notification->getPriority() >= NOTIFICATION_PRIORITY_HIGH),
+                mLabel(notification->getName()),
                 mLineEditor(NULL),
-                mTextCallback(NULL),
-                mURLOption(0)
+                mNote(notification)
 {
-        mURL = xml_template->mURL;
-        mURLOption = xml_template->mURLOption;
-        createDialog(xml_template->mOptions, xml_template->mDefaultOption,
-                                 xml_template->mMessage, args,
-                                 xml_template->mEditLineText);
-        setTitle(xml_template->mTitle);
-        if (xml_template->mIgnorable)
-        {
-                if (xml_template->mIgnorable == IGNORE_USE_DEFAULT)
-                {
-                        setCheckBox(sStringSkipNextTime, xml_template->mIgnoreLabel);
-                }
-                else // xml_template->mIgnorable == IGNORE_USE_SAVED
-                {
-                        setCheckBox(sStringAlwaysChoose, xml_template->mIgnoreLabel);
-                }
-        }
-}
+        const LLFontGL* font = LLResMgr::getInstance()->getRes( FONT_NAME );
+        const S32 LINE_HEIGHT = llfloor(font->getLineHeight() + 0.99f);
+        const S32 EDITOR_HEIGHT = 20;
 
-// All logic for deciding not to show an alert is done here,
-// so that the alert is valid until show() is called.
-bool LLAlertDialog::show()
-{
-        // If modal, check to see if we are not displaying alerts,
-        //   and do any application logic before showing modal alerts
-        if (sDisplayCallback)
-        {
-                bool show = sDisplayCallback(isModal());
-                if (show == false)
-                {
-                        mOptionChosen = mDefaultOption;
-                        llinfos << "Alert: " << mLabel << llendl;
-                        close();
-                        return false;
-                }
-        }
+        LLNotificationFormPtr form = mNote->getForm();
+        std::string edit_text_name;
+        std::string edit_text_contents;
+        bool is_password = false;
+
+        setBackgroundVisible(TRUE);
+        setBackgroundOpaque(TRUE);
 
-        // Check to see if the user wants to ignore this alert
-        if (mIgnorable > 0)
+
+        typedef std::vector<std::pair<std::string, std::string> > options_t;
+        options_t supplied_options;
+
+        // for now, get LLSD to iterator over form elements
+        LLSD form_sd = form->asLLSD();
+
+        S32 option_index = 0;
+        for (LLSD::array_const_iterator it = form_sd.beginArray(); it != form_sd.endArray(); ++it)
         {
-                BOOL warn = sSettings->getWarning(mIgnoreLabel);
-                if (!warn)
+                std::string type = (*it)["type"].asString();
+                if (type == "button")
                 {
-                        switch(mIgnorable)
+                        if((*it)["default"])
                         {
-                        case IGNORE_USE_DEFAULT:
-                                mOptionChosen = mDefaultOption;
-                                break;
-                        case IGNORE_USE_SAVED:
-                                mOptionChosen = sSettings->getS32("Default" + mIgnoreLabel);
-                                break;
-                        case IGNORE_SHOW_AGAIN:
-                                break;
+                                mDefaultOption = option_index;
                         }
-                        close();
-                        return false;
-                }
-        }
 
-        // If this is a caution message, change the color and add an icon.
-        if (mCaution)
-        {
-                setBackgroundColor( LLUI::sColorsGroup->getColor( "AlertCautionBoxColor" ) );
-        }
-        else
-        {
-                setBackgroundColor( LLUI::sColorsGroup->getColor( "AlertBoxColor" ) );
-        }
+                        supplied_options.push_back(std::make_pair((*it)["name"].asString(), (*it)["text"].asString()));
 
-        // Check to see if we are already displaying the alert
-        if (mUnique)
-        {
-                std::map<std::string,LLAlertDialog*>::iterator iter = sUniqueActiveMap.find(mLabel);
-                if (iter != sUniqueActiveMap.end())
+                        ButtonData data;
+                        data.mSelf = this;
+                        if (option_index == mNote->getURLOption())
+                        {
+                                data.mURL = mNote->getURL();
+                        }
+
+                        mButtonData.push_back(data);
+                        option_index++;
+                }
+                else if (type == "text")
                 {
-                        gFloaterView->bringToFront(iter->second);
-                        mUnique = FALSE; // don't remove entry from map on destruction
-                        close();
-                        return false;
+                        edit_text_contents = (*it)["value"].asString();
+                        edit_text_name = (*it)["name"].asString();
+                }
+                else if (type == "password")
+                {
+                        edit_text_contents = (*it)["value"].asString();
+                        edit_text_name = (*it)["name"].asString();
+                        is_password = true;
                 }
-                sUniqueActiveMap[mLabel] = this;
-        }
-        startModal();
-        gFloaterView->adjustToFitScreen(this, FALSE);
-        open(); /* Flawfinder: ignore */
-        setFocus(TRUE);
-        if (mLineEditor)
-        {
-                mLineEditor->setFocus(TRUE);
-                mLineEditor->selectAll();
-        }
-        if(mDefaultOption >= 0)
-        {
-                // delay before enabling default button
-                mDefaultBtnTimer.start();
-                mDefaultBtnTimer.setTimerExpirySec(DEFAULT_BUTTON_DELAY);
         }
-        return true;
-}
-
-void LLAlertDialog::format(std::string& msg, const LLStringUtil::format_map_t& args)
-{
-        // XUI:translate!
-        LLStringUtil::format_map_t targs = args;
-        targs["[SECOND_LIFE]"] = "Second Life";
-        targs["[_URL]"] = mURL;
-        LLStringUtil::format(msg, targs);
-}
 
-void LLAlertDialog::createDialog(const options_list_t& options_in, S32 default_option,
-                                                                 const std::string& msg_in, const LLStringUtil::format_map_t& args,
-                                                                 const std::string& edit_text)
-{
-        setBackgroundVisible(TRUE);
-        setBackgroundOpaque(TRUE);
-
-        const LLFontGL* font = LLResMgr::getInstance()->getRes( font_name );
-        const S32 LINE_HEIGHT = llfloor(font->getLineHeight() + 0.99f);
-        const S32 EDITOR_HEIGHT = 20;
-
-        const options_list_t* optionsp = &options_in;
-        
         // Buttons
-        options_list_t default_option_list;
-        mNumOptions = options_in.size();
-        if( 0 == mNumOptions )
+        options_t options;
+        if (supplied_options.empty())
         {
-                default_option_list.push_back("Close");
-                optionsp = &default_option_list;
-                default_option = 0;
-                mNumOptions = 1;
+                options.push_back(std::make_pair(std::string("close"), std::string("Close")));
+
+                // add data for ok button.
+                ButtonData ok_button;
+                ok_button.mSelf = this;
+                
+                mButtonData.push_back(ok_button);
+                mDefaultOption = 0;
+        }
+        else
+        {
+                options = supplied_options;
         }
 
-        const options_list_t& options= *optionsp;
-        
-        mButtonData = new ButtonData[mNumOptions];
+        S32 num_options = options.size();
 
         // Calc total width of buttons
         S32 button_width = 0;
         S32 sp = font->getWidth(std::string("OO"));
-        for( S32 i = 0; i < mNumOptions; i++ )
+        for( S32 i = 0; i < num_options; i++ )
         {
-                S32 w = S32(font->getWidth( options[i] ) + 0.99f) + sp + 2 * LLBUTTON_H_PAD;
+                S32 w = S32(font->getWidth( options[i].second ) + 0.99f) + sp + 2 * LLBUTTON_H_PAD;
                 button_width = llmax( w, button_width );
         }
         S32 btn_total_width = button_width;
-        if( mNumOptions > 1 )
+        if( num_options > 1 )
         {
-                btn_total_width = (mNumOptions * button_width) + ((mNumOptions - 1) * BTN_HPAD);
+                btn_total_width = (num_options * button_width) + ((num_options - 1) * BTN_HPAD);
         }
 
         // Message: create text box using raw string, as text has been structure deliberately
         // Use size of created text box to generate dialog box size
-        std::string msg = msg_in;
-        format( msg, args );             
+        std::string msg = mNote->getMessage();
         llwarns << "Alert: " << msg << llendl;
         LLTextBox* msg_box = new LLTextBox( std::string("Alert message"), msg, (F32)MAX_ALLOWED_MSG_WIDTH, font );
 
@@ -321,16 +218,19 @@ void LLAlertDialog::createDialog(const options_list_t& options_in, S32 default_o
                 dialog_height += LINE_HEIGHT; // room for title bar
         }
 
-        if (edit_text.size() > 0)
+        // it's ok for the edit text body to be empty, but we want the name to exist if we're going to draw it
+        if (!edit_text_name.empty())
         {
-                dialog_width = llmax(dialog_width, S32(font->getWidth( edit_text ) + 0.99f));
-                dialog_height += EDITOR_HEIGHT;
+                dialog_height += EDITOR_HEIGHT + VPAD;
+                dialog_width = llmax(dialog_width, (S32)(font->getWidth( edit_text_contents ) + 0.99f));
         }
+
         if (mCaution)
         {
                 // Make room for the caution icon.
                 dialog_width += 32 + HPAD;
         }
+
         reshape( dialog_width, dialog_height, FALSE );
 
         S32 msg_y = getRect().getHeight() - VPAD;
@@ -352,6 +252,7 @@ void LLAlertDialog::createDialog(const options_list_t& options_in, S32 default_o
         {
                 msg_box->setColor( LLUI::sColorsGroup->getColor( "AlertTextColor" ) );
         }
+
         LLRect rect;
         rect.setLeftTopAndSize( msg_x, msg_y, text_rect.getWidth(), text_rect.getHeight() );
         msg_box->setRect( rect );
@@ -360,25 +261,26 @@ void LLAlertDialog::createDialog(const options_list_t& options_in, S32 default_o
         // Buttons      
         S32 button_left = (getRect().getWidth() - btn_total_width) / 2;
 
-        for( S32 i = 0; i < mNumOptions; i++ )
+        for( S32 i = 0; i < num_options; i++ )
         {
                 LLRect button_rect;
                 button_rect.setOriginAndSize( button_left, VPAD, button_width, BTN_HEIGHT );
 
-                LLButton* btn = new LLButton(std::string("btn"), button_rect,
-                                                                         LLStringUtil::null, LLStringUtil::null, LLStringUtil::null, 
-                                                                         &LLAlertDialog::onButtonPressed, (void*)(&mButtonData[i]),
-                                                                         font,
-                                                                         options[i], 
-                                                                         options[i]);
+                LLButton* btn = new LLButton(
+                        options[i].first, button_rect,
+                        "","", "", 
+                        NULL, NULL,
+                        font,
+                        options[i].second, 
+                        options[i].second);
 
-                mButtonData[i].mSelf = this;
                 mButtonData[i].mButton = btn;
-                mButtonData[i].mOption = i;
+
+                btn->setClickedCallback(&LLAlertDialog::onButtonPressed, (void*)(&mButtonData[i]));
 
                 addChild(btn);
 
-                if( i == default_option )
+                if( i == mDefaultOption )
                 {
                         btn->setFocus(TRUE);
                 }
@@ -387,21 +289,83 @@ void LLAlertDialog::createDialog(const options_list_t& options_in, S32 default_o
         }
 
         // (Optional) Edit Box  
-        if (edit_text.size() > 0)
+        if (!edit_text_name.empty())
         {
                 S32 y = VPAD + BTN_HEIGHT + VPAD/2;
-                mLineEditor = new LLLineEditor(std::string("lineeditor"),
+                mLineEditor = new LLLineEditor(edit_text_name,
                         LLRect( HPAD, y+EDITOR_HEIGHT, dialog_width-HPAD, y),
-                        edit_text,
-                        LLFontGL::sSansSerif,
+                        edit_text_contents,
+                        LLFontGL::getFontSansSerif(),
                         STD_STRING_STR_LEN);
+
+                // make sure all edit keys get handled properly (DEV-22396)
+                mLineEditor->setHandleEditKeysDirectly(TRUE);
+
                 addChild(mLineEditor);
         }
+        
+        if (mLineEditor)
+        {
+                mLineEditor->setDrawAsterixes(is_password);
+
+                setEditTextArgs(notification->getSubstitutions());
+        }
+
+        std::string ignore_label;
+
+        if (form->getIgnoreType() == LLNotificationForm::IGNORE_WITH_DEFAULT_RESPONSE)
+        {
+                setCheckBox(LLNotifications::instance().getGlobalString("skipnexttime"), ignore_label);
+        }
+        else if (form->getIgnoreType() == LLNotificationForm::IGNORE_WITH_LAST_RESPONSE)
+        {
+                setCheckBox(LLNotifications::instance().getGlobalString("alwayschoose"), ignore_label);
+        }
+}
+
+// All logic for deciding not to show an alert is done here,
+// so that the alert is valid until show() is called.
+bool LLAlertDialog::show()
+{
+        // If this is a caution message, change the color and add an icon.
+        if (mCaution)
+        {
+                setBackgroundColor( LLUI::sColorsGroup->getColor( "AlertCautionBoxColor" ) );
+        }
+        else
+        {
+                setBackgroundColor( LLUI::sColorsGroup->getColor( "AlertBoxColor" ) );
+        }
+
+        startModal();
+        gFloaterView->adjustToFitScreen(this, FALSE);
+        open(); /* Flawfinder: ignore */
+        setFocus(TRUE);
+        if (mLineEditor)
+        {
+                mLineEditor->setFocus(TRUE);
+                mLineEditor->selectAll();
+        }
+        if(mDefaultOption >= 0)
+        {
+                // delay before enabling default button
+                mDefaultBtnTimer.start();
+                mDefaultBtnTimer.setTimerExpirySec(DEFAULT_BUTTON_DELAY);
+        }
+
+        // attach to floater if necessary
+        LLUUID context_key = mNote->getPayload()["context"].asUUID();
+        LLFloaterNotificationContext* contextp = dynamic_cast<LLFloaterNotificationContext*>(LLNotificationContext::getInstance(context_key));
+        if (contextp && contextp->getFloater())
+        {
+                contextp->getFloater()->addDependentFloater(this, FALSE);
+        }
+        return true;
 }
 
 bool LLAlertDialog::setCheckBox( const std::string& check_title, const std::string& check_control )
 {
-        const LLFontGL* font = LLResMgr::getInstance()->getRes( font_name );
+        const LLFontGL* font = LLResMgr::getInstance()->getRes( FONT_NAME );
         const S32 LINE_HEIGHT = llfloor(font->getLineHeight() + 0.99f);
         
         // Extend dialog for "check next time"
@@ -422,16 +386,9 @@ bool LLAlertDialog::setCheckBox( const std::string& check_title, const std::stri
         check_rect.setOriginAndSize(msg_x, VPAD+BTN_HEIGHT+LINE_HEIGHT/2, 
                                                                 max_msg_width, LINE_HEIGHT);
 
-        mCheck = new LLCheckboxCtrl(std::string("check"), check_rect, check_title, font);
+        mCheck = new LLCheckboxCtrl(std::string("check"), check_rect, check_title, font, onClickIgnore, this);
         addChild(mCheck);
 
-        // mCheck is sometimes "show again" and sometimes "hide" :-(
-        // If it's "Show Again", and we showed it, it must be checked. JC
-        if (mIgnorable == IGNORE_SHOW_AGAIN)
-        {
-                mCheck->setValue(TRUE);
-        }
-
         return true;
 }
 
@@ -449,65 +406,12 @@ void LLAlertDialog::setVisible( BOOL visible )
 void LLAlertDialog::onClose(bool app_quitting)
 {
         LLModalDialog::onClose(app_quitting);
-        handleCallbacks();
 }
 
 LLAlertDialog::~LLAlertDialog()
 {
-        delete[] mButtonData;
-        if (mUnique)
-        {
-                sUniqueActiveMap.erase(mLabel);
-        }
 }
 
-void LLAlertDialog::handleCallbacks()
-{
-        if (mOptionChosen >= 0)
-        {
-                if (mTextCallback && mLineEditor)
-                {
-                        mTextCallback(mOptionChosen, mLineEditor->getText(), mUserData);
-                }
-                else if (mCallback)
-                {
-                        mCallback(mOptionChosen, mUserData);
-                }
-
-                // If we declared a URL and chose the URL option, go to the url
-                if (mOptionChosen == mURLOption)
-                {
-                        if (!mURL.empty() && sURLLoader != NULL)
-                        {
-                                sURLLoader->load(mURL);
-                        }
-                }
-
-                // Only change warn state if we actually warned.
-                if (mCheck
-                        && sSettings->getWarning(mIgnoreLabel))
-                {
-                        // mCheck sometimes means "hide and do the default" and
-                        // other times means "warn me again".  Yuck. JC
-                        BOOL check = mCheck->getValue();
-                        switch(mIgnorable)
-                        {
-                        case IGNORE_USE_DEFAULT:
-                                sSettings->setWarning(mIgnoreLabel, !check);
-                                break;
-                        case IGNORE_USE_SAVED:
-                                sSettings->setWarning(mIgnoreLabel, !check);
-                                sSettings->setS32("Default" + mIgnoreLabel, mOptionChosen);
-                                break;
-                        case IGNORE_SHOW_AGAIN:
-                                sSettings->setWarning(mIgnoreLabel, check);
-                                break;
-                        default:
-                                break;
-                        }
-                }
-        }
-}
 BOOL LLAlertDialog::hasTitleBar() const
 {
         return (getCurrentTitle() != "" && getCurrentTitle() != " ")    // has title
@@ -567,33 +471,11 @@ void LLAlertDialog::draw()
         LLModalDialog::draw();
 }
 
-void LLAlertDialog::setOptionEnabled( S32 option, BOOL enable )
-{
-        if( (option >= 0) && (option < mNumOptions) )
-        {
-                mButtonData[option].mButton->setEnabled( enable );
-        }
-}
-
-void LLAlertDialog::setEditTextCallback(alert_text_callback_t callback, void *user_data)
-{
-        if (mLineEditor)
-        {
-                mTextCallback = callback;
-                mUserData = user_data;
-        }
-        else
-        {
-                llwarns << "LLAlertDialog::setEditTextCallback called on dialog with no line editor" << llendl;
-        }
-}
-
-void LLAlertDialog::setEditTextArgs(const LLStringUtil::format_map_t& edit_args)
+void LLAlertDialog::setEditTextArgs(const LLSD& edit_args)
 {
         if (mLineEditor)
         {
                 std::string msg = mLineEditor->getText();
-                format(msg, edit_args);
                 mLineEditor->setText(msg);
         }
         else
@@ -602,268 +484,44 @@ void LLAlertDialog::setEditTextArgs(const LLStringUtil::format_map_t& edit_args)
         }
 }
 
-void LLAlertDialog::setDrawAsterixes(BOOL enable)
-{
-        if (mLineEditor)
-        {
-                if (enable)
-                {
-                        mLineEditor->clear();
-                }
-                mLineEditor->setDrawAsterixes(enable);
-        }
-}
-
 // static 
 void LLAlertDialog::onButtonPressed( void* userdata )
 {
         ButtonData* button_data = (ButtonData*)userdata;
         LLAlertDialog* self = button_data->mSelf;
 
-        self->mOptionChosen = button_data->mOption;
-        self->close(); // deletes self
-}
-
-//=============================================================================
-
-//static
-const std::string& LLAlertDialog::getTemplateMessage(const std::string& xml_desc)
-{
-        template_map_t::iterator iter = sAlertTemplates.find(xml_desc);
-        if (iter != sAlertTemplates.end())
+        LLSD response = self->mNote->getResponseTemplate();
+        if (self->mLineEditor)
         {
-                return iter->second->mMessage;
+                response[self->mLineEditor->getName()] = self->mLineEditor->getValue();
         }
-        else
+        response[button_data->mButton->getName()] = true;
+
+        // If we declared a URL and chose the URL option, go to the url
+        if (!button_data->mURL.empty() && sURLLoader != NULL)
         {
-                return xml_desc;
+                sURLLoader->load(button_data->mURL);
         }
+
+        self->mNote->respond(response); // new notification reponse
+        self->close(); // deletes self
 }
 
-//static
-bool LLAlertDialog::parseAlerts(const std::string& xml_filename, LLControlGroup* settings, BOOL settings_only)
+//static 
+void LLAlertDialog::onClickIgnore(LLUICtrl* ctrl, void* user_data)
 {
-        LLXMLNodePtr root;
-        BOOL success  = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);
+        LLAlertDialog* self = (LLAlertDialog*)user_data;
 
-        if (!success || root.isNull() || !root->hasName( "alerts" ))
+        // checkbox sometimes means "hide and do the default" and
+        // other times means "warn me again".  Yuck. JC
+        BOOL check = ctrl->getValue();
+        if (self->mNote->getForm()->getIgnoreType() == LLNotificationForm::IGNORE_SHOW_AGAIN)
         {
-                llerrs << "Problem reading UI Alerts file: " << xml_filename << llendl;
-                return false;
+                // question was "show again" so invert value to get "ignore"
+                check = !check;
         }
 
-        BOOL add_settings = FALSE;
-        if (settings)
-        {
-                sSettings = settings;
-                add_settings = TRUE;
-        }
-        llassert(sSettings);
-        
-        for (LLXMLNode* alert = root->getFirstChild();
-                 alert != NULL; alert = alert->getNextSibling())
-        {
-                if (alert->hasName("global"))
-                {
-                        std::string global_name;
-                        if (alert->getAttributeString("name", global_name))
-                        {
-                                if (global_name == "skipnexttime")
-                                {
-                                        sStringSkipNextTime = alert->getTextContents();
-                                }
-                                else if (global_name == "alwayschoose")
-                                {
-                                        sStringAlwaysChoose = alert->getTextContents();
-                                }
-                        }
-                        continue;
-                }
-
-                if (!alert->hasName("alert"))
-                {
-                        continue;
-                }
-                
-                LLAlertDialogTemplate* xml_template = settings_only ? NULL : new LLAlertDialogTemplate;
-
-                // name=
-                std::string alert_name;
-                if (alert->getAttributeString("name", alert_name))
-                {
-                        if (xml_template)
-                        {
-                                xml_template->mLabel = alert_name;
-                        }
-                }
-                else
-                {
-                        llwarns << "Unable to parse alert with no name" << llendl;
-                        delete xml_template;
-                        continue;
-                }
-                // title=
-                std::string title;
-                if (alert->getAttributeString("title", title))
-                {
-                        if (xml_template)
-                        {
-                                xml_template->mTitle = title;
-                        }
-                }
-                // modal=
-                BOOL modal;
-                if (alert->getAttributeBOOL("modal", modal))
-                {
-                        if (xml_template)
-                        {
-                                xml_template->mModal = modal;
-                        }
-                }
-                // caution=
-                BOOL caution;
-                if (alert->getAttributeBOOL("caution", caution))
-                {
-                        if (xml_template)
-                        {
-                                xml_template->mCaution = caution;
-                        }
-                }
-                // unique=
-                BOOL unique;
-                if (alert->getAttributeBOOL("unique", unique))
-                {
-                        if (xml_template)
-                        {
-                                xml_template->mUnique = unique;
-                        }
-                }
-                                
-                S32 default_option = 0;
-                BOOL nodefault;
-                if (alert->getAttributeBOOL("nodefault", nodefault))
-                {
-                        if (nodefault)
-                        {
-                                if (xml_template)
-                                {
-                                        xml_template->mDefaultOption = -1;
-                                }
-                                default_option = -1;
-                        }
-                }
-
-                S32 btn_idx = 0;
-                for (LLXMLNode* child = alert->getFirstChild();
-                         child != NULL; child = child->getNextSibling())
-                {
-                        // <message>
-                        if (child->hasName("message"))
-                        {
-                                if (xml_template)
-                                {
-                                        xml_template->mMessage = child->getTextContents();
-                                }
-                        }
+        self->mNote->setIgnored(check);
+}
 
-                        // <option>
-                        if (child->hasName("option"))
-                        {
-                                std::string label = child->getTextContents();
-                                BOOL is_default = FALSE;
-                                child->getAttributeBOOL("default", is_default);
-                                std::string ignore_text;
-                                if (!child->getAttributeString("ignore", ignore_text))
-                                {
-                                        ignore_text = label;
-                                }
-                                if (xml_template)
-                                {
-                                        xml_template->addOption(label, ignore_text, is_default);
-                                }
-                                if (is_default)
-                                {
-                                        default_option = btn_idx;
-                                }
-                                btn_idx++;
-                        }
-                
-                        // <editline>
-                        if (child->hasName("editline"))
-                        {
-                                if (xml_template)
-                                {
-                                        xml_template->mEditLineText = child->getTextContents();
-                                        if (xml_template->mEditLineText.empty())
-                                        {
-                                                xml_template->mEditLineText = " ";
-                                        }
-                                }
-                        }
-                        
-                        // <ignore>
-                        if (child->hasName("ignore"))
-                        {
-                                std::string ignore_text = child->getTextContents();
-                                // label=
-                                std::string name;
-                                child->getAttributeString("name", name);
-                                
-                                //always set to alert_name for the sake of i18n
-                                //if (name.empty())
-                                name = alert_name;
-                                
-                                if (xml_template)
-                                {
-                                        xml_template->mIgnorable = LLAlertDialog::IGNORE_USE_DEFAULT;
-                                        xml_template->mIgnoreListText = ignore_text;
-                                        xml_template->mIgnoreLabel = name;
-                                }
-                                if (!ignore_text.empty())
-                                {
-                                        if (add_settings)
-                                        {
-                                                settings->addWarning(name);
-                                        }
-                                        if (xml_template)
-                                        {
-                                                sIgnorableTemplates[name] = xml_template; // will override any previous entry
-                                        }
-                                }
-                                // save_option=
-                                BOOL save_option = FALSE;
-                                child->getAttributeBOOL("save_option", save_option);
-                                if (save_option)
-                                {
-                                        if (xml_template)
-                                        {
-                                                xml_template->mIgnorable = LLAlertDialog::IGNORE_USE_SAVED;
-                                        }
-                                        if (add_settings)
-                                        {
-                                                settings->declareS32(std::string("Default") + name, default_option, std::string("Default option number for this alert dialog"));
-                                        }
-                                }
-                        }
 
-                        // <url>
-                        if (child->hasName("url"))
-                        {
-                                S32 url_option = 0;
-                                child->getAttributeS32("option", url_option);
-                                if (xml_template)
-                                {
-                                        xml_template->mURL = child->getTextContents();
-                                        xml_template->mURLOption = url_option;
-                                }
-                        }
-                        
-                }
-                if (xml_template)
-                {
-                        xml_template->mDefaultOption = default_option;
-                        sAlertTemplates[xml_template->mLabel] = xml_template;
-                }
-        }
-        return true;
-}
diff --git a/linden/indra/llui/llalertdialog.h b/linden/indra/llui/llalertdialog.h
index 7d82fb5..04caea6 100644
--- a/linden/indra/llui/llalertdialog.h
+++ b/linden/indra/llui/llalertdialog.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -36,6 +37,7 @@
 #include "llmodaldialog.h"
 #include "llmemory.h"
 #include "llui.h"
+#include "llnotifications.h"
 
 class LLButton;
 class LLCheckBoxCtrl;
@@ -43,21 +45,20 @@ class LLAlertDialogTemplate;
 class LLLineEditor;
 
 // https://wiki.lindenlab.com/mediawiki/index.php?title=LLAlertDialog&oldid=81388
-class LLAlertDialog : public LLModalDialog
+class LLAlertDialog 
+        : public LLModalDialog,
+          public LLInitClass<LLAlertDialog>,
+          public LLInstanceTracker<LLAlertDialog, LLUUID>
+
 {
 public:
-        typedef void (*alert_callback_t)(S32 option, void* user_data);
-        typedef void (*alert_text_callback_t)(S32 option, const std::string& text, void* user_data);
         typedef bool (*display_callback_t)(S32 modal);
-        typedef std::vector<std::string> options_list_t;
-        
-        enum { IGNORE_USE_DEFAULT=1, IGNORE_USE_SAVED=2, IGNORE_SHOW_AGAIN=3 };
 
         class URLLoader
         {
         public:
                 virtual void load(const std::string& url) = 0;
-        virtual ~URLLoader() {}
+                virtual ~URLLoader() {}
         };
         
         static void setURLLoader(URLLoader* loader)
@@ -67,8 +68,7 @@ public:
         
 public:
         // User's responsibility to call show() after creating these.
-        LLAlertDialog( const LLAlertDialogTemplate* xml_template, const LLStringUtil::format_map_t& args,
-                                   alert_callback_t callback = NULL, void *user_data = NULL);
+        LLAlertDialog( LLNotificationPtr notep, bool is_modal );
 
         virtual BOOL    handleKeyHere(KEY key, MASK mask );
 
@@ -77,150 +77,52 @@ public:
         virtual void    onClose(bool app_quitting);
 
         bool                    setCheckBox( const std::string&, const std::string& );  
-        void                    setOptionEnabled( S32 option, BOOL enable );
         void                    setCaution(BOOL val = TRUE) { mCaution = val; }
         // If mUnique==TRUE only one copy of this message should exist
         void                    setUnique(BOOL val = TRUE) { mUnique = val; }
-        void                    setEditTextCallback(alert_text_callback_t callback, void *user_data);
-        void                    setEditTextArgs(const LLStringUtil::format_map_t& edit_args);
-        void                    setDrawAsterixes(BOOL enable);
+        void                    setEditTextArgs(const LLSD& edit_args);
         
         bool                    show(); // May instantly destroy the message if it is unique (returns false)
         
         //statics
-        static void             onButtonPressed(void* userdata);
-
-        static LLAlertDialog* createXml( const std::string& xml_desc,
-                                                                         alert_callback_t callback = NULL, void *user_data = NULL);
-        static LLAlertDialog* createXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args,
-                                                                         alert_callback_t callback = NULL, void *user_data = NULL);
-        
-        static LLAlertDialog*   showXml( const std::string& xml_desc,
-                                                         alert_callback_t callback = NULL, void *user_data = NULL);
-        static LLAlertDialog*   showXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args,
-                                                         alert_callback_t callback = NULL, void *user_data = NULL);
-
-        static LLAlertDialog*   showCritical( const std::string& msg, alert_callback_t callback = NULL, void *user_data = NULL);
-        
-        static bool parseAlerts(const std::string& xml_filename, LLControlGroup* settings = NULL, BOOL settings_only = FALSE);
-        static const std::string& getTemplateMessage(const std::string& xml_desc);
-
-        static void setDisplayCallback(display_callback_t callback) { sDisplayCallback = callback; }
-
-private:
-        void format(std::string& msg, const LLStringUtil::format_map_t& args);
-
-public:
-        static LLControlGroup* sSettings;
-
-        // use LLPointer so they delete themselves when sTemplates is destroyed
-        typedef std::map<std::string, LLPointer<LLAlertDialogTemplate> > template_map_t;
-        static template_map_t sAlertTemplates; // by mLabel
-        static template_map_t sIgnorableTemplates; // by mIgnoreLabel
+        static void initClass();
+        static bool onNewNotification(const LLSD& notify, bool is_modal);
+        static void     onButtonPressed(void* userdata);
+        static void onClickIgnore(LLUICtrl* ctrl, void* user_data);
 
 private:
+        LLNotificationPtr mNote;
 
         static std::map<std::string, LLAlertDialog*> sUniqueActiveMap;
-        static display_callback_t sDisplayCallback;
 
-        static std::string sStringSkipNextTime;
-        static std::string sStringAlwaysChoose;
-
-        void createDialog(const options_list_t& options_in, S32 default_option,
-                                          const std::string& msg, const LLStringUtil::format_map_t& args,
-                                          const std::string& edit_text);
-        
         virtual ~LLAlertDialog();
-        void handleCallbacks();
         // No you can't kill it.  It can only kill itself.
 
         // Does it have a readable title label, or minimize or close buttons?
         BOOL hasTitleBar() const;
 
+private:
+        static URLLoader* sURLLoader;
+        static LLControlGroup* sSettings;
+
         struct ButtonData
         {
                 LLAlertDialog* mSelf;
                 LLButton* mButton;
-                S32 mOption;
-        } * mButtonData;
-
-        alert_callback_t mCallback;
-        void*   mUserData;
-        S32             mNumOptions;
-        S32             mDefaultOption;
-        BOOL    mOptionChosen;
+                std::string mURL;
+        };
+        std::vector<ButtonData> mButtonData;
+
+        S32                             mDefaultOption;
         LLCheckBoxCtrl* mCheck;
-        BOOL    mCaution;
-        BOOL    mUnique;
-        S32             mIgnorable;
-        std::string mLabel;
-        std::string mIgnoreLabel;
-        LLFrameTimer mDefaultBtnTimer;
+        BOOL                    mCaution;
+        BOOL                    mUnique;
+        std::string             mLabel;
+        LLFrameTimer    mDefaultBtnTimer;
         // For Dialogs that take a line as text as input:
         LLLineEditor* mLineEditor;
-        alert_text_callback_t mTextCallback;
-        // For Dialogs linked to a URL
-        std::string mURL;                               // Some alerts will direct the resident to a URL
-        S32 mURLOption;
 
-private:
-        static URLLoader* sURLLoader;
 };
 
-//============================================================================
-
-class LLAlertDialogTemplate : public LLRefCount
-{
-public:
-        LLAlertDialogTemplate() : mTitle(), mURLOption(0), mModal(FALSE), mCaution(FALSE), mUnique(FALSE), mIgnorable(0), mDefaultOption(0) {}
-        
-        void addOption(const std::string& label, const std::string& ignore_text, BOOL is_default = FALSE)
-        {
-                if (is_default)
-                {
-                        mDefaultOption = mOptions.size();
-                }
-                mOptions.push_back(label);
-                mOptionDefaultText.push_back(ignore_text);
-        }
-
-        S32 getIgnore()
-        {
-                if (mIgnorable)
-                {
-                        return LLAlertDialog::sSettings->getWarning(mIgnoreLabel) ? FALSE : mIgnorable;
-                }
-                else
-                {
-                        return FALSE;
-                }
-        }
-
-        void setIgnore(bool state)
-        {
-                if (mIgnorable)
-                {
-                        LLAlertDialog::sSettings->setWarning(mIgnoreLabel, !state);
-                }
-        }
-
-        
-public:
-        std::string mLabel;                     // Handle for access from code, etc
-        std::string mTitle;                     // (optional) text to display in title bar
-        std::string mMessage;                   // Message to display
-        std::string mIgnoreListText;    // Text to display in enable/disable dialog (if mIgnorable == TRUE)
-        std::string mIgnoreLabel;               // Handle for ignore variable (may be shared by multiple templates)
-        std::string mURL;                               // Some alerts will direct the resident to a URL
-        S32 mURLOption;
-        BOOL mModal;
-        BOOL mCaution;
-        BOOL mUnique;
-        S32 mIgnorable; // 0 = Never Ignore, 1 = Do default option, 2 = Do saved option
-        LLAlertDialog::options_list_t mOptions;
-        LLAlertDialog::options_list_t mOptionDefaultText;
-        S32 mDefaultOption;
-        std::string mEditLineText;
-};
 
 #endif  // LL_ALERTDIALOG_H
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 34e62c8..2c2c1c2 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -187,7 +188,7 @@ LLButton::LLButton(const std::string& name, const LLRect& rect,
 
 void LLButton::init(void (*click_callback)(void*), void *callback_data, const LLFontGL* font, const std::string& control_name)
 {
-        mGLFont = ( font ? font : LLFontGL::sSansSerif);
+        mGLFont = ( font ? font : LLFontGL::getFontSansSerif());
 
         // Hack to make sure there is space for at least one character
         if (getRect().getWidth() - (mRightHPad + mLeftHPad) < mGLFont->getWidth(std::string(" ")))
@@ -422,13 +423,7 @@ void LLButton::draw()
         // Unselected image assignments
         S32 local_mouse_x;
         S32 local_mouse_y;
-        LLCoordWindow cursor_pos_window;
-        getWindow()->getCursorPosition(&cursor_pos_window);
-        LLCoordGL cursor_pos_gl;
-        getWindow()->convertCoords(cursor_pos_window, &cursor_pos_gl);
-        cursor_pos_gl.mX = llround((F32)cursor_pos_gl.mX / LLUI::sGLScaleFactor.mV[VX]);
-        cursor_pos_gl.mY = llround((F32)cursor_pos_gl.mY / LLUI::sGLScaleFactor.mV[VY]);
-        screenPointToLocal(cursor_pos_gl.mX, cursor_pos_gl.mY, &local_mouse_x, &local_mouse_y);
+        LLUI::getCursorPositionLocal(this, &local_mouse_x, &local_mouse_y);
 
         BOOL pressed = pressed_by_keyboard 
                                         || (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y)) 
diff --git a/linden/indra/llui/llbutton.h b/linden/indra/llui/llbutton.h
index 556e12c..724b775 100644
--- a/linden/indra/llui/llbutton.h
+++ b/linden/indra/llui/llbutton.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -163,7 +164,7 @@ public:
         void                    setDisabledLabelColor( const LLColor4& c )              { mDisabledLabelColor = c; }
         
         void                    setFont(const LLFontGL *font)           
-                { mGLFont = ( font ? font : LLFontGL::sSansSerif); }
+                { mGLFont = ( font ? font : LLFontGL::getFontSansSerif()); }
         void                    setScaleImage(BOOL scale)                       { mScaleImage = scale; }
         BOOL                    getScaleImage() const                           { return mScaleImage; }
 
diff --git a/linden/indra/llui/llcallbackmap.h b/linden/indra/llui/llcallbackmap.h
index db11c39..eadb9c9 100644
--- a/linden/indra/llui/llcallbackmap.h
+++ b/linden/indra/llui/llcallbackmap.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llcheckboxctrl.cpp b/linden/indra/llui/llcheckboxctrl.cpp
index d4c372a..eda9467 100644
--- a/linden/indra/llui/llcheckboxctrl.cpp
+++ b/linden/indra/llui/llcheckboxctrl.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -72,7 +73,7 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const std::string& name, const LLRect& rect,
         }
         else
         {
-                mFont = LLFontGL::sSansSerifSmall;
+                mFont = LLFontGL::getFontSansSerifSmall();
         }
 
         // must be big enough to hold all children
@@ -122,7 +123,7 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const std::string& name, const LLRect& rect,
                 inactive_false_id = "UIImgRadioInactiveUUID";
                 mButton = new LLButton(std::string("Radio control button"), btn_rect,
                                                            active_false_id, active_true_id, control_which,
-                                                           &LLCheckBoxCtrl::onButtonPress, this, LLFontGL::sSansSerif ); 
+                                                           &LLCheckBoxCtrl::onButtonPress, this, LLFontGL::getFontSansSerif() ); 
                 mButton->setDisabledImages( inactive_false_id, inactive_true_id );
                 mButton->setHoverGlowStrength(0.35f);
         }
@@ -134,7 +135,7 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const std::string& name, const LLRect& rect,
                 inactive_false_id = "UIImgCheckboxInactiveUUID";
                 mButton = new LLButton(std::string("Checkbox control button"), btn_rect,
                                                            active_false_id, active_true_id, control_which,
-                                                           &LLCheckBoxCtrl::onButtonPress, this, LLFontGL::sSansSerif ); 
+                                                           &LLCheckBoxCtrl::onButtonPress, this, LLFontGL::getFontSansSerif() ); 
                 mButton->setDisabledImages( inactive_false_id, inactive_true_id );
                 mButton->setHoverGlowStrength(0.35f);
         }
diff --git a/linden/indra/llui/llcheckboxctrl.h b/linden/indra/llui/llcheckboxctrl.h
index 8a70c62..ff867f5 100644
--- a/linden/indra/llui/llcheckboxctrl.h
+++ b/linden/indra/llui/llcheckboxctrl.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llclipboard.cpp b/linden/indra/llui/llclipboard.cpp
index d5255e7..8a7a214 100644
--- a/linden/indra/llui/llclipboard.cpp
+++ b/linden/indra/llui/llclipboard.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llclipboard.h b/linden/indra/llui/llclipboard.h
index 706ed2a..37ed1ff 100644
--- a/linden/indra/llui/llclipboard.h
+++ b/linden/indra/llui/llclipboard.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index 3aec2ee..28a05c1 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -72,11 +73,12 @@ LLComboBox::LLComboBox(	const std::string& name, const LLRect &rect, const std::
         mTextEntryTentative(TRUE),
         mListPosition(BELOW),
         mPrearrangeCallback( NULL ),
-        mTextEntryCallback( NULL )
+        mTextEntryCallback( NULL ),
+        mLabel(label)
 {
         // Always use text box 
         // Text label button
-        mButton = new LLButton(label,
+        mButton = new LLButton(mLabel,
                                                                 LLRect(), 
                                                                 LLStringUtil::null,
                                                                 NULL, this);
@@ -87,7 +89,7 @@ LLComboBox::LLComboBox(	const std::string& name, const LLRect &rect, const std::
         mButton->setScaleImage(TRUE);
 
         mButton->setMouseDownCallback(onButtonDown);
-        mButton->setFont(LLFontGL::sSansSerifSmall);
+        mButton->setFont(LLFontGL::getFontSansSerifSmall());
         mButton->setFollows(FOLLOWS_LEFT | FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
         mButton->setHAlign( LLFontGL::LEFT );
         mButton->setRightHPad(2);
@@ -197,7 +199,12 @@ LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
                 }
         }
 
-        combo_box->selectFirstItem();
+        // if providing user text entry or descriptive label
+        // don't select an item under the hood
+        if (!combo_box->acceptsTextInput() && combo_box->mLabel.empty())
+        {
+                combo_box->selectFirstItem();
+        }
 
         return combo_box;
 }
@@ -259,7 +266,10 @@ LLScrollListItem* LLComboBox::add(const std::string& name, EAddPosition pos, BOO
 {
         LLScrollListItem* item = mList->addSimpleElement(name, pos);
         item->setEnabled(enabled);
-        mList->selectFirstItem();
+        if (!mAllowTextEntry && mLabel.empty())
+        {
+                selectFirstItem();
+        }
         return item;
 }
 
@@ -268,7 +278,10 @@ LLScrollListItem* LLComboBox::add(const std::string& name, const LLUUID& id, EAd
 {
         LLScrollListItem* item = mList->addSimpleElement(name, pos, id);
         item->setEnabled(enabled);
-        mList->selectFirstItem();
+        if (!mAllowTextEntry && mLabel.empty())
+        {
+                selectFirstItem();
+        }
         return item;
 }
 
@@ -278,7 +291,10 @@ LLScrollListItem* LLComboBox::add(const std::string& name, void* userdata, EAddP
         LLScrollListItem* item = mList->addSimpleElement(name, pos);
         item->setEnabled(enabled);
         item->setUserdata( userdata );
-        mList->selectFirstItem();
+        if (!mAllowTextEntry && mLabel.empty())
+        {
+                selectFirstItem();
+        }
         return item;
 }
 
@@ -287,7 +303,10 @@ LLScrollListItem* LLComboBox::add(const std::string& name, LLSD value, EAddPosit
 {
         LLScrollListItem* item = mList->addSimpleElement(name, pos, value);
         item->setEnabled(enabled);
-        mList->selectFirstItem();
+        if (!mAllowTextEntry && mLabel.empty())
+        {
+                selectFirstItem();
+        }
         return item;
 }
 
@@ -498,7 +517,7 @@ void LLComboBox::updateLayout()
                         mTextEntry = new LLLineEditor(std::string("combo_text_entry"),
                                                                                 text_entry_rect,
                                                                                 LLStringUtil::null,
-                                                                                LLFontGL::sSansSerifSmall,
+                                                                                LLFontGL::getFontSansSerifSmall(),
                                                                                 mMaxChars,
                                                                                 onTextCommit,
                                                                                 onTextEntry,
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index efcb798..33e1baa 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -188,6 +189,7 @@ protected:
         LLScrollListCtrl*       mList;
         EPreferredPosition      mListPosition;
         LLPointer<LLUIImage>    mArrowImage;
+        std::string                     mLabel;
 
 private:
         S32                                     mButtonPadding;
diff --git a/linden/indra/llui/llctrlselectioninterface.cpp b/linden/indra/llui/llctrlselectioninterface.cpp
index 282f43c..dac0939 100644
--- a/linden/indra/llui/llctrlselectioninterface.cpp
+++ b/linden/indra/llui/llctrlselectioninterface.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llctrlselectioninterface.h b/linden/indra/llui/llctrlselectioninterface.h
index 6f5f5c8..45727d6 100644
--- a/linden/indra/llui/llctrlselectioninterface.h
+++ b/linden/indra/llui/llctrlselectioninterface.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lldraghandle.cpp b/linden/indra/llui/lldraghandle.cpp
index c76bdfb..6c92ea1 100644
--- a/linden/indra/llui/lldraghandle.cpp
+++ b/linden/indra/llui/lldraghandle.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lldraghandle.h b/linden/indra/llui/lldraghandle.h
index 35408da..9eb3e55 100644
--- a/linden/indra/llui/lldraghandle.h
+++ b/linden/indra/llui/lldraghandle.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lleditmenuhandler.cpp b/linden/indra/llui/lleditmenuhandler.cpp
index d6f04f2..821afae 100644
--- a/linden/indra/llui/lleditmenuhandler.cpp
+++ b/linden/indra/llui/lleditmenuhandler.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
-* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lleditmenuhandler.h b/linden/indra/llui/lleditmenuhandler.h
index c0c6d7b..1de9c56 100644
--- a/linden/indra/llui/lleditmenuhandler.h
+++ b/linden/indra/llui/lleditmenuhandler.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
-* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 2924c29..94af186 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -147,6 +148,7 @@ LLFloater::LLFloater() :
         }
         mDragHandle = NULL;
         mHandle.bind(this);
+        mNotificationContext = new LLFloaterNotificationContext(getHandle());
 }
 
 LLFloater::LLFloater(const std::string& name)
@@ -220,6 +222,7 @@ void LLFloater::initFloater(const std::string& title,
                                          BOOL drag_on_left, BOOL minimizable, BOOL close_btn)
 {
         mHandle.bind(this);
+        mNotificationContext = new LLFloaterNotificationContext(getHandle());
 
         // Init function can be called more than once, so clear out old data.
         for (S32 i = 0; i < BUTTON_COUNT; i++)
@@ -429,6 +432,9 @@ void LLFloater::initFloater(const std::string& title,
 // virtual
 LLFloater::~LLFloater()
 {
+        delete mNotificationContext;
+        mNotificationContext = NULL;
+
         control_map_t::iterator itor;
         for (itor = mFloaterControls.begin(); itor != mFloaterControls.end(); ++itor)
         {
@@ -774,7 +780,7 @@ void LLFloater::snappedTo(const LLView* snap_view)
 
 void LLFloater::userSetShape(const LLRect& new_rect)
 {
-        const LLRect& old_rect = getRect();
+        const LLRect old_rect = getRect();
         LLView::userSetShape(new_rect);
 
         // if not minimized, adjust all snapped dependents to new shape
@@ -1697,7 +1703,7 @@ void LLFloater::buildButtons()
                         LLStringUtil::null,
                         sButtonCallbacks[i],
                         this,
-                        LLFontGL::sSansSerif);
+                        LLFontGL::getFontSansSerif());
 
                 buttonp->setTabStop(FALSE);
                 buttonp->setFollowsTop();
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index a6fe3cc..a8f7c21 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -39,6 +40,7 @@
 #include "llpanel.h"
 #include "lluuid.h"
 #include "lltabcontainer.h"
+#include "llnotifications.h"
 #include <set>
 
 class LLDragHandle;
@@ -46,6 +48,7 @@ class LLResizeHandle;
 class LLResizeBar;
 class LLButton;
 class LLMultiFloater;
+class LLFloater;
 
 const S32 LLFLOATER_VPAD = 6;
 const S32 LLFLOATER_HPAD = 6;
@@ -70,6 +73,20 @@ const BOOL CLOSE_NO = FALSE;
 const BOOL ADJUST_VERTICAL_YES = TRUE;
 const BOOL ADJUST_VERTICAL_NO = FALSE;
 
+// associates a given notification instance with a particular floater
+class LLFloaterNotificationContext : 
+        public LLNotificationContext
+{
+public:
+        LLFloaterNotificationContext(LLHandle<LLFloater> floater_handle) :
+                mFloaterHandle(floater_handle)
+        {}
+
+        LLFloater* getFloater() { return mFloaterHandle.get(); }
+private:
+        LLHandle<LLFloater> mFloaterHandle;
+};
+
 
 class LLFloater : public LLPanel
 {
@@ -213,6 +230,11 @@ public:
         // handle refocusing.
         static void             closeFocusedFloater();
 
+        LLNotification::Params contextualNotification(const std::string& name) 
+        { 
+            return LLNotification::Params(name).context(mNotificationContext); 
+        }
+
         static void             onClickClose(void *userdata);
         static void             onClickMinimize(void *userdata);
         static void             onClickTearOff(void *userdata);
@@ -299,7 +321,7 @@ private:
         S32                             mPreviousMinimizedBottom;
         S32                             mPreviousMinimizedLeft;
         
-private:
+        LLFloaterNotificationContext* mNotificationContext;
         LLRootHandle<LLFloater>         mHandle;        
 };
 
@@ -461,13 +483,12 @@ public:
 
 
 // singleton implementation for floaters (provides visibility policy)
-// https://wiki.lindenlab.com/mediawiki/index.php?title=LLFloaterSingleton&oldid=79410
+// https://wiki.lindenlab.com/mediawiki/index.php?title=LLFloaterSingleton&oldid=164990
 
 template <class T> class LLFloaterSingleton : public LLUISingleton<T, VisibilityPolicy<LLFloater> >
 {
 };
 
-
 extern LLFloaterView* gFloaterView;
 
 #endif  // LL_FLOATER_H
diff --git a/linden/indra/llui/llfocusmgr.cpp b/linden/indra/llui/llfocusmgr.cpp
index 69010cd..661ffdd 100644
--- a/linden/indra/llui/llfocusmgr.cpp
+++ b/linden/indra/llui/llfocusmgr.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llfocusmgr.h b/linden/indra/llui/llfocusmgr.h
index 61daca7..aaeb25a 100644
--- a/linden/indra/llui/llfocusmgr.h
+++ b/linden/indra/llui/llfocusmgr.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llfunctorregistry.cpp b/linden/indra/llui/llfunctorregistry.cpp
new file mode 100644
index 0000000..0c5b165
--- /dev/null
+++ b/linden/indra/llui/llfunctorregistry.cpp
@@ -0,0 +1,38 @@
+/**
+ * @file llfunctorregistry.cpp
+ * @author Kent Quirk
+ * @brief Maintains a registry of named callback functors taking a single LLSD parameter
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ **/
+
+#include "llfunctorregistry.h"
+
+// This is a default functor always resident in the system.
+// It's used whenever a functor isn't found in the registry, so that
+// we at least log the data relating to the user response.
diff --git a/linden/indra/llui/llfunctorregistry.h b/linden/indra/llui/llfunctorregistry.h
new file mode 100644
index 0000000..8864f7a
--- /dev/null
+++ b/linden/indra/llui/llfunctorregistry.h
@@ -0,0 +1,146 @@
+/**
+ * @file llfunctorregistry.h
+ * @author Kent Quirk
+ * @brief Maintains a registry of named callback functors taking a single LLSD parameter
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFUNCTORREGISTRY_H
+#define LL_LLFUNCTORREGISTRY_H
+
+#include <string>
+#include <map>
+
+#include <boost/function.hpp>
+
+#include "llsd.h"
+#include "llmemory.h"
+
+/**
+ * @class LLFunctorRegistry
+ * @brief Maintains a collection of named functors for remote binding
+ * (mainly for use in callbacks from notifications and other signals)
+ * @see LLNotifications
+ *
+ * This class maintains a collection of named functors in a singleton.
+ * We wanted to be able to persist notifications with their callbacks
+ * across restarts of the viewer; we couldn't store functors that way.
+ * Using this registry, systems that require a functor to be maintained
+ * long term can register it at system startup, and then pass in the
+ * functor by name. 
+ */
+
+template <typename FUNCTOR_TYPE>
+class LLFunctorRegistry : public LLSingleton<LLFunctorRegistry<FUNCTOR_TYPE> >
+{
+        friend class LLSingleton<LLFunctorRegistry>;
+        LOG_CLASS(LLFunctorRegistry);
+private:
+        LLFunctorRegistry() : LOGFUNCTOR("LogFunctor"), DONOTHING("DoNothing")
+        {
+                mMap[LOGFUNCTOR] = log_functor;
+                mMap[DONOTHING] = do_nothing;
+        }
+
+public:
+        typedef FUNCTOR_TYPE ResponseFunctor;
+        typedef typename std::map<std::string, FUNCTOR_TYPE> FunctorMap;
+        
+        bool registerFunctor(const std::string& name, ResponseFunctor f)
+        {
+                bool retval = true;
+                typename FunctorMap::iterator it = mMap.find(name);
+                if (mMap.count(name) == 0)
+                {
+                        mMap[name] = f;
+                }
+                else
+                {
+                        llerrs << "attempt to store duplicate name '" << name << "' in LLFunctorRegistry. NOT ADDED." << llendl;
+                        retval = false;
+                }
+                
+                return retval;
+        }
+
+        bool unregisterFunctor(const std::string& name)
+        {
+                if (mMap.count(name) == 0)
+                {
+                        llwarns << "trying to remove '" << name << "' from LLFunctorRegistry but it's not there." << llendl;
+                        return false;
+                }
+                mMap.erase(name);
+                return true;
+        }
+
+        FUNCTOR_TYPE getFunctor(const std::string& name)
+        {
+                typename FunctorMap::iterator it = mMap.find(name);
+                if (mMap.count(name) != 0)
+                {
+                        return mMap[name];
+                }
+                else
+                {
+                        llwarns << "tried to find '" << name << "' in LLFunctorRegistry, but it wasn't there." << llendl;
+                        return mMap[LOGFUNCTOR];
+                }
+        }
+
+        const std::string LOGFUNCTOR;
+        const std::string DONOTHING;
+        
+private:
+
+        static void log_functor(const LLSD& notification, const LLSD& payload)
+        {
+                llwarns << "log_functor called with payload: " << payload << llendl;
+        }
+
+        static void do_nothing(const LLSD& notification, const LLSD& payload)
+        {
+                // what the sign sez
+        }
+
+        FunctorMap mMap;
+};
+
+template <typename FUNCTOR_TYPE>
+class LLFunctorRegistration
+{
+public:
+        LLFunctorRegistration(const std::string& name, FUNCTOR_TYPE functor) 
+        {
+                LLFunctorRegistry<FUNCTOR_TYPE>::instance().registerFunctor(name, functor);
+        }
+};
+
+#endif//LL_LLFUNCTORREGISTRY_H
+
diff --git a/linden/indra/llui/llhtmlhelp.h b/linden/indra/llui/llhtmlhelp.h
index 3383148..2841a12 100644
--- a/linden/indra/llui/llhtmlhelp.h
+++ b/linden/indra/llui/llhtmlhelp.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lliconctrl.cpp b/linden/indra/llui/lliconctrl.cpp
index 71c2315..cb3b2a3 100644
--- a/linden/indra/llui/lliconctrl.cpp
+++ b/linden/indra/llui/lliconctrl.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lliconctrl.h b/linden/indra/llui/lliconctrl.h
index a8a265d..50778cf 100644
--- a/linden/indra/llui/lliconctrl.h
+++ b/linden/indra/llui/lliconctrl.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp
index 53df1c1..51ef3db 100644
--- a/linden/indra/llui/llkeywords.cpp
+++ b/linden/indra/llui/llkeywords.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llkeywords.h b/linden/indra/llui/llkeywords.h
index 1ae0b3c..38f5e99 100644
--- a/linden/indra/llui/llkeywords.h
+++ b/linden/indra/llui/llkeywords.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 64b1284..6aa2aac 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -151,7 +152,7 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
         }
         else
         {
-                mGLFont = LLFontGL::sSansSerifSmall;
+                mGLFont = LLFontGL::getFontSansSerifSmall();
         }
 
         setFocusLostCallback(focus_lost_callback);
@@ -361,7 +362,7 @@ void LLLineEditor::setCursor( S32 pos )
         {
                 S32 width_chars_to_left = mGLFont->getWidth(mText.getWString().c_str(), 0, mScrollHPos);
                 S32 last_visible_char = mGLFont->maxDrawableChars(mText.getWString().c_str(), llmax(0.f, (F32)(mMaxHPixels - mMinHPixels + width_chars_to_left))); 
-                S32 min_scroll = mGLFont->firstDrawableChar(mText.getWString().c_str(), (F32)(mMaxHPixels - mMinHPixels), mText.length(), getCursor());
+                S32 min_scroll = mGLFont->firstDrawableChar(mText.getWString().c_str(), (F32)(mMaxHPixels - mMinHPixels - UI_LINEEDITOR_CURSOR_THICKNESS - UI_LINEEDITOR_H_PAD), mText.length(), getCursor());
                 if (old_cursor_pos == last_visible_char)
                 {
                         mScrollHPos = llmin(mText.length(), llmax(min_scroll, mScrollHPos + SCROLL_INCREMENT_ADD));
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index 52cbfcf..254ba19 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -26,7 +26,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llmemberlistener.h b/linden/indra/llui/llmemberlistener.h
index 3b702ed..a5e019c 100644
--- a/linden/indra/llui/llmemberlistener.h
+++ b/linden/indra/llui/llmemberlistener.h
@@ -43,7 +43,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 907777d..f2f2aae 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -58,6 +59,8 @@
 #include "llresmgr.h"
 #include "llui.h"
 
+#include "lluitrans.h"
+
 #include "llstl.h"
 
 #include "v2math.h"
@@ -139,7 +142,7 @@ LLMenuItemGL::LLMenuItemGL( const std::string& name, const std::string& label, K
         mHighlight( FALSE ),
         mGotHover( FALSE ),
         mBriefItem( FALSE ),
-        mFont( LLFontGL::sSansSerif ),
+        mFont( LLFontGL::getFontSansSerif() ),
         mStyle(LLFontGL::NORMAL),
         mDrawTextDisabled( FALSE )
 {
@@ -266,24 +269,24 @@ void LLMenuItemGL::appendAcceleratorString( std::string& st ) const
         {
                 if ( mAcceleratorMask & MASK_MAC_CONTROL )
                 {
-                        st.append( "Ctrl-" );
+                        st.append( LLUITrans::getString("accel-mac-control") );
                 }
                 else
                 {
-                        st.append( "Cmd-" );            // Symbol would be "\xE2\x8C\x98"
+                        st.append( LLUITrans::getString("accel-mac-command") );         // Symbol would be "\xE2\x8C\x98"
                 }
         }
         if( mAcceleratorMask & MASK_ALT )
-                st.append( "Opt-" );            // Symbol would be "\xE2\x8C\xA5"
+                st.append( LLUITrans::getString("accel-mac-option") );          // Symbol would be "\xE2\x8C\xA5"
         if( mAcceleratorMask & MASK_SHIFT )
-                st.append( "Shift-" );          // Symbol would be "\xE2\x8C\xA7"
+                st.append( LLUITrans::getString("accel-mac-shift") );           // Symbol would be "\xE2\x8C\xA7"
 #else
         if( mAcceleratorMask & MASK_CONTROL )
-                st.append( "Ctrl-" );
+                st.append( LLUITrans::getString("accel-win-control") );
         if( mAcceleratorMask & MASK_ALT )
-                st.append( "Alt-" );
+                st.append( LLUITrans::getString("accel-win-alt") );
         if( mAcceleratorMask & MASK_SHIFT )
-                st.append( "Shift-" );
+                st.append( LLUITrans::getString("accel-win-shift") );
 #endif
 
         std::string keystr = LLKeyboard::stringFromKey( mAcceleratorKey );
@@ -2165,8 +2168,8 @@ void LLMenuGL::arrange( void )
                 U32 max_width = getTornOff() ? U32_MAX : menu_region_rect.getWidth();
                 U32 max_height = getTornOff() ? U32_MAX : menu_region_rect.getHeight();
                 // *FIX: create the item first and then ask for its dimensions?
-                S32 spillover_item_width = PLAIN_PAD_PIXELS + LLFontGL::sSansSerif->getWidth( std::string("More") );
-                S32 spillover_item_height = llround(LLFontGL::sSansSerif->getLineHeight()) + MENU_ITEM_PADDING;
+                S32 spillover_item_width = PLAIN_PAD_PIXELS + LLFontGL::getFontSansSerif()->getWidth( std::string("More") );
+                S32 spillover_item_height = llround(LLFontGL::getFontSansSerif()->getLineHeight()) + MENU_ITEM_PADDING;
 
                 if (mHorizontalLayout)
                 {
@@ -3492,7 +3495,7 @@ void LLPieMenu::drawBackground(LLMenuItemGL* itemp, LLColor4& color)
 BOOL LLPieMenu::append(LLMenuItemGL *item)
 {
         item->setBriefItem(TRUE);
-        item->setFont( LLFontGL::sSansSerifSmall );
+        item->setFont( LLFontGL::getFontSansSerifSmall() );
         return LLMenuGL::append(item);
 }
 
@@ -3500,7 +3503,7 @@ BOOL LLPieMenu::append(LLMenuItemGL *item)
 BOOL LLPieMenu::appendSeparator(const std::string &separator_name)
 {
         LLMenuItemGL* separator = new LLMenuItemBlankGL();
-        separator->setFont( LLFontGL::sSansSerifSmall );
+        separator->setFont( LLFontGL::getFontSansSerifSmall() );
         return append( separator );
 }
 
@@ -3514,7 +3517,7 @@ BOOL LLPieMenu::appendPieMenu(LLPieMenu *menu)
         LLPieMenuBranch *item;
         item = new LLPieMenuBranch(menu->getName(), menu->getLabel(), menu);
         getParent()->addChild(item->getBranch());
-        item->setFont( LLFontGL::sSansSerifSmall );
+        item->setFont( LLFontGL::getFontSansSerifSmall() );
         return append( item );
 }
 
diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index d981e78..a2ef968 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llmodaldialog.cpp b/linden/indra/llui/llmodaldialog.cpp
index 682cc08..1662ff7 100644
--- a/linden/indra/llui/llmodaldialog.cpp
+++ b/linden/indra/llui/llmodaldialog.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llmodaldialog.h b/linden/indra/llui/llmodaldialog.h
index 5bb1a74..f6abd0a 100644
--- a/linden/indra/llui/llmodaldialog.h
+++ b/linden/indra/llui/llmodaldialog.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llmultislider.cpp b/linden/indra/llui/llmultislider.cpp
index 415e96b..c1487be 100644
--- a/linden/indra/llui/llmultislider.cpp
+++ b/linden/indra/llui/llmultislider.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llmultislider.h b/linden/indra/llui/llmultislider.h
index 08cfa78..cdbdb59 100644
--- a/linden/indra/llui/llmultislider.h
+++ b/linden/indra/llui/llmultislider.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llmultisliderctrl.cpp b/linden/indra/llui/llmultisliderctrl.cpp
index 53c0799..8bcf9f9 100644
--- a/linden/indra/llui/llmultisliderctrl.cpp
+++ b/linden/indra/llui/llmultisliderctrl.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -543,7 +544,7 @@ LLView* LLMultiSliderCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFa
         // HACK: Font might not be specified.
         if (!font)
         {
-                font = LLFontGL::sSansSerifSmall;
+                font = LLFontGL::getFontSansSerifSmall();
         }
 
         S32 label_width = 0;
diff --git a/linden/indra/llui/llmultisliderctrl.h b/linden/indra/llui/llmultisliderctrl.h
index 4145d70..b62b5ec 100644
--- a/linden/indra/llui/llmultisliderctrl.h
+++ b/linden/indra/llui/llmultisliderctrl.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llnotifications.cpp b/linden/indra/llui/llnotifications.cpp
new file mode 100644
index 0000000..2ae9672
--- /dev/null
+++ b/linden/indra/llui/llnotifications.cpp
@@ -0,0 +1,1487 @@
+/**
+* @file llnotifications.cpp
+* @brief Non-UI queue manager for keeping a prioritized list of notifications
+*
+* $LicenseInfo:firstyear=2008&license=viewergpl$
+* 
+* Copyright (c) 2008-2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#include "linden_common.h"
+#include "lluictrlfactory.h"
+#include "lldir.h"
+#include "llsdserialize.h"
+
+#include "llnotifications.h"
+
+#include <algorithm>
+#include <boost/regex.hpp>
+
+
+const std::string NOTIFICATION_PERSIST_VERSION = "0.93";
+
+// local channel for notification history
+class LLNotificationHistoryChannel : public LLNotificationChannel
+{
+        LOG_CLASS(LLNotificationHistoryChannel);
+public:
+        LLNotificationHistoryChannel(const std::string& filename) : 
+                LLNotificationChannel("History", "Visible", &historyFilter, LLNotificationComparators::orderByUUID()),
+                mFileName(filename)
+        {
+                connectChanged(boost::bind(&LLNotificationHistoryChannel::historyHandler, this, _1));
+                loadPersistentNotifications();
+        }
+
+private:
+        bool historyHandler(const LLSD& payload)
+        {
+                // we ignore "load" messages, but rewrite the persistence file on any other
+                std::string sigtype = payload["sigtype"];
+                if (sigtype != "load")
+                {
+                        savePersistentNotifications();
+                }
+                return false;
+        }
+
+        // The history channel gets all notifications except those that have been cancelled
+        static bool historyFilter(LLNotificationPtr pNotification)
+        {
+                return !pNotification->isCancelled();
+        }
+
+        void savePersistentNotifications()
+        {
+                llinfos << "Saving open notifications to " << mFileName << llendl;
+
+                llofstream notify_file(mFileName.c_str());
+                if (!notify_file.is_open()) 
+                {
+                        llwarns << "Failed to open " << mFileName << llendl;
+                        return;
+                }
+
+                LLSD output;
+                output["version"] = NOTIFICATION_PERSIST_VERSION;
+                LLSD& data = output["data"];
+
+                for (LLNotificationSet::iterator it = mItems.begin(); it != mItems.end(); ++it)
+                {
+                        if (!LLNotifications::instance().templateExists((*it)->getName())) continue;
+
+                        // only store notifications flagged as persisting
+                        LLNotificationTemplatePtr templatep = LLNotifications::instance().getTemplate((*it)->getName());
+                        if (!templatep->mPersist) continue;
+
+                        data.append((*it)->asLLSD());
+                }
+
+                LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
+                formatter->format(output, notify_file, LLSDFormatter::OPTIONS_PRETTY);
+        }
+
+        void loadPersistentNotifications()
+        {
+                llinfos << "Loading open notifications from " << mFileName << llendl;
+
+                llifstream notify_file(mFileName.c_str());
+                if (!notify_file.is_open()) 
+                {
+                        llwarns << "Failed to open " << mFileName << llendl;
+                        return;
+                }
+
+                LLSD input;
+                LLPointer<LLSDParser> parser = new LLSDXMLParser();
+                if (parser->parse(notify_file, input, LLSDSerialize::SIZE_UNLIMITED) < 0)
+                {
+                        llwarns << "Failed to parse open notifications" << llendl;
+                        return;
+                }
+
+                if (input.isUndefined()) return;
+                std::string version = input["version"];
+                if (version != NOTIFICATION_PERSIST_VERSION)
+                {
+                        llwarns << "Bad open notifications version: " << version << llendl;
+                        return;
+                }
+                LLSD& data = input["data"];
+                if (data.isUndefined()) return;
+
+                LLNotifications& instance = LLNotifications::instance();
+                for (LLSD::array_const_iterator notification_it = data.beginArray();
+                        notification_it != data.endArray();
+                        ++notification_it)
+                {
+                        instance.add(LLNotificationPtr(new LLNotification(*notification_it)));
+                }
+        }
+
+        //virtual
+        void onDelete(LLNotificationPtr pNotification)
+        {
+                // we want to keep deleted notifications in our log
+                mItems.insert(pNotification);
+                
+                return;
+        }
+        
+private:
+        std::string mFileName;
+};
+
+bool filterIgnoredNotifications(LLNotificationPtr notification)
+{
+        LLNotificationFormPtr form = notification->getForm();
+        // Check to see if the user wants to ignore this alert
+        if (form->getIgnoreType() != LLNotificationForm::IGNORE_NO)
+        {
+                return LLUI::sConfigGroup->getWarning(notification->getName());
+        }
+
+        return true;
+}
+
+bool handleIgnoredNotification(const LLSD& payload)
+{
+        if (payload["sigtype"].asString() == "add")
+        {
+                LLNotificationPtr pNotif = LLNotifications::instance().find(payload["id"].asUUID());
+                if (!pNotif) return false;
+
+                LLNotificationFormPtr form = pNotif->getForm();
+                LLSD response;
+                switch(form->getIgnoreType())
+                {
+                case LLNotificationForm::IGNORE_WITH_DEFAULT_RESPONSE:
+                        response = pNotif->getResponseTemplate(LLNotification::WITH_DEFAULT_BUTTON);
+                        break;
+                case LLNotificationForm::IGNORE_WITH_LAST_RESPONSE:
+                        response = LLUI::sIgnoresGroup->getLLSD("Default" + pNotif->getName());
+                        break;
+                case LLNotificationForm::IGNORE_SHOW_AGAIN:
+                        break;
+                default:
+                        return false;
+                }
+                pNotif->setIgnored(true);
+                pNotif->respond(response);
+                return true;    // don't process this item any further
+        }
+        return false;
+}
+
+namespace LLNotificationFilters
+{
+        // a sample filter
+        bool includeEverything(LLNotificationPtr p)
+        {
+                return true;
+        }
+};
+
+LLNotificationForm::LLNotificationForm()
+:       mFormData(LLSD::emptyArray()),
+        mIgnore(IGNORE_NO)
+{
+}
+
+
+LLNotificationForm::LLNotificationForm(const std::string& name, const LLXMLNodePtr xml_node) 
+:       mFormData(LLSD::emptyArray()),
+        mIgnore(IGNORE_NO)
+{
+        if (!xml_node->hasName("form"))
+        {
+                llwarns << "Bad xml node for form: " << xml_node->getName() << llendl;
+        }
+        LLXMLNodePtr child = xml_node->getFirstChild();
+        while(child)
+        {
+                child = LLNotifications::instance().checkForXMLTemplate(child);
+
+                LLSD item_entry;
+                std::string element_name = child->getName()->mString;
+
+                if (element_name == "ignore")
+                {
+                        bool save_option = false;
+                        child->getAttribute_bool("save_option", save_option);
+                        if (!save_option)
+                        {
+                                mIgnore = IGNORE_WITH_DEFAULT_RESPONSE;
+                        }
+                        else
+                        {
+                                // remember last option chosen by user and automatically respond with that in the future
+                                mIgnore = IGNORE_WITH_LAST_RESPONSE;
+                                LLUI::sIgnoresGroup->declareLLSD(std::string("Default") + name, "", std::string("Default response for notification " + name));
+                        }
+                        child->getAttributeString("text", mIgnoreMsg);
+                        LLUI::sIgnoresGroup->addWarning(name);
+                }
+                else
+                {
+                        // flatten xml form entry into single LLSD map with type==name
+                        item_entry["type"] = element_name;
+                        const LLXMLAttribList::iterator attrib_end = child->mAttributes.end();
+                        for(LLXMLAttribList::iterator attrib_it = child->mAttributes.begin();
+                                attrib_it != attrib_end;
+                                ++attrib_it)
+                        {
+                                item_entry[std::string(attrib_it->second->getName()->mString)] = attrib_it->second->getValue();
+                        }
+                        item_entry["value"] = child->getTextContents();
+                        mFormData.append(item_entry);
+                }
+
+                child = child->getNextSibling();
+        }
+}
+
+LLNotificationForm::LLNotificationForm(const LLSD& sd)
+{
+        if (sd.isArray())
+        {
+                mFormData = sd;
+        }
+        else
+        {
+                llwarns << "Invalid form data " << sd << llendl;
+                mFormData = LLSD::emptyArray();
+        }
+}
+
+LLSD LLNotificationForm::asLLSD() const
+{ 
+        return mFormData; 
+}
+
+LLSD LLNotificationForm::getElement(const std::string& element_name)
+{
+        for (LLSD::array_const_iterator it = mFormData.beginArray();
+                it != mFormData.endArray();
+                ++it)
+        {
+                if ((*it)["name"].asString() == element_name) return (*it);
+        }
+        return LLSD();
+}
+
+
+bool LLNotificationForm::hasElement(const std::string& element_name)
+{
+        for (LLSD::array_const_iterator it = mFormData.beginArray();
+                it != mFormData.endArray();
+                ++it)
+        {
+                if ((*it)["name"].asString() == element_name) return true;
+        }
+        return false;
+}
+
+void LLNotificationForm::addElement(const std::string& type, const std::string& name, const LLSD& value)
+{
+        LLSD element;
+        element["type"] = type;
+        element["name"] = name;
+        element["label"] = name;
+        element["value"] = value;
+        element["index"] = mFormData.size();
+        mFormData.append(element);
+}
+
+void LLNotificationForm::append(const LLSD& sub_form)
+{
+        if (sub_form.isArray())
+        {
+                for (LLSD::array_const_iterator it = sub_form.beginArray();
+                        it != sub_form.endArray();
+                        ++it)
+                {
+                        mFormData.append(*it);
+                }
+        }
+}
+
+void LLNotificationForm::formatElements(const LLSD& substitutions)
+{
+        for (LLSD::array_iterator it = mFormData.beginArray();
+                it != mFormData.endArray();
+                ++it)
+        {
+                // format "text" component of each form element
+                if ((*it).has("text"))
+                {
+                        std::string text = (*it)["text"].asString();
+                        text = LLNotification::format(text, substitutions);
+                        (*it)["text"] = text;
+                }
+                if ((*it)["type"].asString() == "text" && (*it).has("value"))
+                {
+                        std::string value = (*it)["value"].asString();
+                        value = LLNotification::format(value, substitutions);
+                        (*it)["value"] = value;
+                }
+        }
+}
+
+std::string LLNotificationForm::getDefaultOption()
+{
+        for (LLSD::array_const_iterator it = mFormData.beginArray();
+                it != mFormData.endArray();
+                ++it)
+        {
+                if ((*it)["default"]) return (*it)["name"].asString();
+        }
+        return "";
+}
+
+LLNotificationTemplate::LLNotificationTemplate() :
+        mExpireSeconds(0),
+        mExpireOption(-1),
+        mURLOption(-1),
+        mUnique(false),
+        mPriority(NOTIFICATION_PRIORITY_NORMAL)
+{
+        mForm = LLNotificationFormPtr(new LLNotificationForm()); 
+}
+
+LLNotification::LLNotification(const LLNotification::Params& p) : 
+        mTimestamp(p.timestamp), 
+        mSubstitutions(p.substitutions),
+        mPayload(p.payload),
+        mExpiresAt(0),
+        mResponseFunctorName(p.functor_name),
+        mTemporaryResponder(p.mTemporaryResponder),
+        mRespondedTo(false),
+        mPriority(p.priority),
+        mCancelled(false),
+        mIgnored(false)
+{
+        mId.generate();
+        init(p.name, p.form_elements);
+}
+
+
+LLNotification::LLNotification(const LLSD& sd) :
+        mTemporaryResponder(false),
+        mRespondedTo(false),
+        mCancelled(false),
+        mIgnored(false)
+{ 
+        mId.generate();
+        mSubstitutions = sd["substitutions"];
+        mPayload = sd["payload"]; 
+        mTimestamp = sd["time"]; 
+        mExpiresAt = sd["expiry"];
+        mPriority = (ENotificationPriority)sd["priority"].asInteger();
+        mResponseFunctorName = sd["responseFunctor"].asString();
+        std::string templatename = sd["name"].asString();
+        init(templatename, LLSD());
+        // replace form with serialized version
+        mForm = LLNotificationFormPtr(new LLNotificationForm(sd["form"]));
+}
+
+
+LLSD LLNotification::asLLSD()
+{
+        LLSD output;
+        output["name"] = mTemplatep->mName;
+        output["form"] = getForm()->asLLSD();
+        output["substitutions"] = mSubstitutions;
+        output["payload"] = mPayload;
+        output["time"] = mTimestamp;
+        output["expiry"] = mExpiresAt;
+        output["priority"] = (S32)mPriority;
+        output["responseFunctor"] = mResponseFunctorName;
+        return output;
+}
+
+void LLNotification::update()
+{
+        LLNotifications::instance().update(shared_from_this());
+}
+
+void LLNotification::updateFrom(LLNotificationPtr other)
+{
+        // can only update from the same notification type
+        if (mTemplatep != other->mTemplatep) return;
+
+        // NOTE: do NOT change the ID, since it is the key to
+        // this given instance, just update all the metadata
+        //mId = other->mId;
+
+        mPayload = other->mPayload;
+        mSubstitutions = other->mSubstitutions;
+        mTimestamp = other->mTimestamp;
+        mExpiresAt = other->mExpiresAt;
+        mCancelled = other->mCancelled;
+        mIgnored = other->mIgnored;
+        mPriority = other->mPriority;
+        mForm = other->mForm;
+        mResponseFunctorName = other->mResponseFunctorName;
+        mRespondedTo = other->mRespondedTo;
+        mTemporaryResponder = other->mTemporaryResponder;
+
+        update();
+}
+
+const LLNotificationFormPtr LLNotification::getForm()
+{
+        return mForm;
+}
+
+void LLNotification::cancel()
+{
+        mCancelled = true;
+}
+
+LLSD LLNotification::getResponseTemplate(EResponseTemplateType type)
+{
+        LLSD response = LLSD::emptyMap();
+        for (S32 element_idx = 0;
+                element_idx < mForm->getNumElements();
+                ++element_idx)
+        {
+                LLSD element = mForm->getElement(element_idx);
+                if (element.has("name"))
+                {
+                        response[element["name"].asString()] = element["value"];
+                }
+
+                if ((type == WITH_DEFAULT_BUTTON) 
+                        && element["default"].asBoolean())
+                {
+                        response[element["name"].asString()] = true;
+                }
+        }
+        return response;
+}
+
+//static
+S32 LLNotification::getSelectedOption(const LLSD& notification, const LLSD& response)
+{
+        LLNotificationForm form(notification["form"]);
+
+        for (S32 element_idx = 0;
+                element_idx < form.getNumElements();
+                ++element_idx)
+        {
+                LLSD element = form.getElement(element_idx);
+
+                // only look at buttons
+                if (element["type"].asString() == "button" 
+                        && response[element["name"].asString()].asBoolean())
+                {
+                        return element["index"].asInteger();
+                }
+        }
+
+        return -1;
+}
+
+//static
+std::string LLNotification::getSelectedOptionName(const LLSD& response)
+{
+        for (LLSD::map_const_iterator response_it = response.beginMap();
+                response_it != response.endMap();
+                ++response_it)
+        {
+                if (response_it->second.isBoolean() && response_it->second.asBoolean())
+                {
+                        return response_it->first;
+                }
+        }
+        return "";
+}
+
+
+void LLNotification::respond(const LLSD& response)
+{
+        mRespondedTo = true;
+        LLNotificationFunctorRegistry::instance().getFunctor(mResponseFunctorName)(asLLSD(), response);
+        if (mTemporaryResponder)
+        {
+                LLNotificationFunctorRegistry::instance().unregisterFunctor(mResponseFunctorName);
+                mResponseFunctorName = "";
+                mTemporaryResponder = false;
+        }
+
+        if (mForm->getIgnoreType() != LLNotificationForm::IGNORE_NO)
+        {
+                LLUI::sIgnoresGroup->setWarning(getName(), !mIgnored);
+                if (mIgnored && mForm->getIgnoreType() == LLNotificationForm::IGNORE_WITH_LAST_RESPONSE)
+                {
+                        LLUI::sIgnoresGroup->setLLSD("Default" + getName(), response);
+                }
+        }
+
+        update();
+}
+
+void LLNotification::setIgnored(bool ignore)
+{
+        mIgnored = ignore;
+}
+
+void LLNotification::setResponseFunctor(std::string const &responseFunctorName)
+{
+        if (mTemporaryResponder)
+                // get rid of the old one
+                LLNotificationFunctorRegistry::instance().unregisterFunctor(mResponseFunctorName);
+        mResponseFunctorName = responseFunctorName;
+        mTemporaryResponder = false;
+}
+
+bool LLNotification::payloadContainsAll(const std::vector<std::string>& required_fields) const
+{
+        for(std::vector<std::string>::const_iterator required_fields_it = required_fields.begin(); 
+                required_fields_it != required_fields.end();
+                required_fields_it++)
+        {
+                std::string required_field_name = *required_fields_it;
+                if( ! getPayload().has(required_field_name))
+                {
+                        return false; // a required field was not found
+                }
+        }
+        return true; // all required fields were found
+}
+
+bool LLNotification::isEquivalentTo(LLNotificationPtr that) const
+{
+        if (this->mTemplatep->mName != that->mTemplatep->mName) 
+        {
+                return false; // must have the same template name or forget it
+        }
+        if (this->mTemplatep->mUnique)
+        {
+                // highlander bit sez there can only be one of these
+                return
+                        this->payloadContainsAll(that->mTemplatep->mUniqueContext) &&
+                        that->payloadContainsAll(this->mTemplatep->mUniqueContext);
+        }
+        return false; 
+}
+
+void LLNotification::init(const std::string& template_name, const LLSD& form_elements)
+{
+        mTemplatep = LLNotifications::instance().getTemplate(template_name);
+        if (!mTemplatep) return;
+
+        // add default substitutions
+        // TODO: change this to read from the translatable strings file!
+        mSubstitutions["SECOND_LIFE"] = "Second Life";
+        mSubstitutions["_URL"] = getURL();
+        mSubstitutions["_NAME"] = template_name;
+        // TODO: something like this so that a missing alert is sensible:
+        //mSubstitutions["_ARGS"] = get_all_arguments_as_text(mSubstitutions);
+
+        mForm = LLNotificationFormPtr(new LLNotificationForm(*mTemplatep->mForm));
+        mForm->append(form_elements);
+
+        // apply substitution to form labels
+        mForm->formatElements(mSubstitutions);
+
+        LLDate rightnow = LLDate::now();
+        if (mTemplatep->mExpireSeconds)
+        {
+                mExpiresAt = LLDate(rightnow.secondsSinceEpoch() + mTemplatep->mExpireSeconds);
+        }
+
+        if (mPriority == NOTIFICATION_PRIORITY_UNSPECIFIED)
+        {
+                mPriority = mTemplatep->mPriority;
+        }
+}
+
+std::string LLNotification::summarize() const
+{
+        std::string s = "Notification(";
+        s += getName();
+        s += ") : ";
+        s += mTemplatep ? mTemplatep->mMessage : "";
+        // should also include timestamp and expiration time (but probably not payload)
+        return s;
+}
+
+//static
+std::string LLNotification::format(const std::string& s, const LLSD& substitutions)
+{
+        if (!substitutions.isMap()) 
+        {
+                return s;
+        }
+
+        std::ostringstream output;
+        // match strings like [NAME]
+        const boost::regex key("\\[([0-9_A-Z]+)]");
+        
+        std::string::const_iterator start = s.begin();
+        std::string::const_iterator end = s.end();
+        boost::smatch match;
+        
+        while (boost::regex_search(start, end, match, key, boost::match_default))
+        {
+                bool found_replacement = false;
+                std::string replacement;
+                
+                // see if we have a replacement for the bracketed string (without the brackets)
+                // test first using has() because if we just look up with operator[] we get back an
+                // empty string even if the value is missing. We want to distinguish between 
+                // missing replacements and deliberately empty replacement strings.
+                if (substitutions.has(std::string(match[1].first, match[1].second)))
+                {
+                        replacement = substitutions[std::string(match[1].first, match[1].second)].asString();
+                        found_replacement = true;
+                }
+                // if not, see if there's one WITH brackets
+                else if (substitutions.has(std::string(match[0].first, match[0].second)))
+                {
+                        replacement = substitutions[std::string(match[0].first, match[0].second)].asString();
+                        found_replacement = true;
+                }
+                
+                if (found_replacement)
+                {
+                        // found a replacement
+                        // "hello world" is output
+                        output << std::string(start, match[0].first) << replacement;
+                }
+                else
+                {
+                        // we had no replacement, so leave the string we searched for so that it gets noticed by QA
+                        // "hello [NAME_NOT_FOUND]" is output
+                        output << std::string(start, match[0].second);
+                }
+                
+                // update search position 
+                start = match[0].second; 
+        }
+        // send the remainder of the string (with no further matches for bracketed names)
+        output << std::string(start, end);
+        return output.str();
+}
+
+std::string LLNotification::getMessage() const
+{
+        // all our callers cache this result, so it gives us more flexibility
+        // to do the substitution at call time rather than attempting to 
+        // cache it in the notification
+        if (!mTemplatep)
+                return std::string();
+        return format(mTemplatep->mMessage, mSubstitutions);
+}
+
+std::string LLNotification::getLabel() const
+{
+        return (mTemplatep ? format(mTemplatep->mLabel, mSubstitutions) : "");
+}
+
+
+
+// =========================================================
+// LLNotificationChannel implementation
+// ---
+void LLNotificationChannelBase::connectChanged(const LLStandardSignal::slot_type& slot)
+{
+        // when someone wants to connect to a channel, we first throw them
+        // all of the notifications that are already in the channel
+        // we use a special signal called "load" in case the channel wants to care
+        // only about new notifications
+        for (LLNotificationSet::iterator it = mItems.begin(); it != mItems.end(); ++it)
+        {
+                slot.get_slot_function()(LLSD().insert("sigtype", "load").insert("id", (*it)->id()));
+        }
+        // and then connect the signal so that all future notifications will also be
+        // forwarded.
+        mChanged.connect(slot);
+}
+
+void LLNotificationChannelBase::connectPassedFilter(const LLStandardSignal::slot_type& slot)
+{
+        // these two filters only fire for notifications added after the current one, because
+        // they don't participate in the hierarchy.
+        mPassedFilter.connect(slot);
+}
+
+void LLNotificationChannelBase::connectFailedFilter(const LLStandardSignal::slot_type& slot)
+{
+        mFailedFilter.connect(slot);
+}
+
+// external call, conforms to our standard signature
+bool LLNotificationChannelBase::updateItem(const LLSD& payload)
+{       
+        // first check to see if it's in the master list
+        LLNotificationPtr pNotification  = LLNotifications::instance().find(payload["id"]);
+        if (!pNotification)
+                return false;   // not found
+        
+        return updateItem(payload, pNotification);
+}
+
+
+//FIX QUIT NOT WORKING
+
+
+// internal call, for use in avoiding lookup
+bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPtr pNotification)
+{       
+        std::string cmd = payload["sigtype"];
+        LLNotificationSet::iterator foundItem = mItems.find(pNotification);
+        bool wasFound = (foundItem != mItems.end());
+        bool passesFilter = mFilter(pNotification);
+        
+        // first, we offer the result of the filter test to the simple
+        // signals for pass/fail. One of these is guaranteed to be called.
+        // If either signal returns true, the change processing is NOT performed
+        // (so don't return true unless you know what you're doing!)
+        bool abortProcessing = false;
+        if (passesFilter)
+        {
+                abortProcessing = mPassedFilter(payload);
+        }
+        else
+        {
+                abortProcessing = mFailedFilter(payload);
+        }
+        
+        if (abortProcessing)
+        {
+                return true;
+        }
+        
+        if (cmd == "load")
+        {
+                // should be no reason we'd ever get a load if we already have it
+                // if passes filter send a load message, else do nothing
+                assert(!wasFound);
+                if (passesFilter)
+                {
+                        // not in our list, add it and say so
+                        mItems.insert(pNotification);
+                        abortProcessing = mChanged(payload);
+                        onLoad(pNotification);
+                }
+        }
+        else if (cmd == "change")
+        {
+                // if it passes filter now and was found, we just send a change message
+                // if it passes filter now and wasn't found, we have to add it
+                // if it doesn't pass filter and wasn't found, we do nothing
+                // if it doesn't pass filter and was found, we need to delete it
+                if (passesFilter)
+                {
+                        if (wasFound)
+                        {
+                                // it already existed, so this is a change
+                                // since it changed in place, all we have to do is resend the signal
+                                abortProcessing = mChanged(payload);
+                                onChange(pNotification);
+                        }
+                        else
+                        {
+                                // not in our list, add it and say so
+                                mItems.insert(pNotification);
+                                // our payload is const, so make a copy before changing it
+                                LLSD newpayload = payload;
+                                newpayload["sigtype"] = "add";
+                                abortProcessing = mChanged(newpayload);
+                                onChange(pNotification);
+                        }
+                }
+                else
+                {
+                        if (wasFound)
+                        {
+                                // it already existed, so this is a delete
+                                mItems.erase(pNotification);
+                                // our payload is const, so make a copy before changing it
+                                LLSD newpayload = payload;
+                                newpayload["sigtype"] = "delete";
+                                abortProcessing = mChanged(newpayload);
+                                onChange(pNotification);
+                        }
+                        // didn't pass, not on our list, do nothing
+                }
+        }
+        else if (cmd == "add")
+        {
+                // should be no reason we'd ever get an add if we already have it
+                // if passes filter send an add message, else do nothing
+                assert(!wasFound);
+                if (passesFilter)
+                {
+                        // not in our list, add it and say so
+                        mItems.insert(pNotification);
+                        abortProcessing = mChanged(payload);
+                        onAdd(pNotification);
+                }
+        }
+        else if (cmd == "delete")
+        {
+                // if we have it in our list, pass on the delete, then delete it, else do nothing
+                if (wasFound)
+                {
+                        abortProcessing = mChanged(payload);
+                        mItems.erase(pNotification);
+                        onDelete(pNotification);
+                }
+        }
+        return abortProcessing;
+}
+
+/* static */
+LLNotificationChannelPtr LLNotificationChannel::buildChannel(const std::string& name, 
+                                                                                                                         const std::string& parent,
+                                                                                                                         LLNotificationFilter filter, 
+                                                                                                                         LLNotificationComparator comparator)
+{
+        // note: this is not a leak; notifications are self-registering.
+        // This factory helps to prevent excess deletions by making sure all smart
+        // pointers to notification channels come from the same source
+        new LLNotificationChannel(name, parent, filter, comparator);
+        return LLNotifications::instance().getChannel(name);
+}
+
+
+LLNotificationChannel::LLNotificationChannel(const std::string& name, 
+                                                                                         const std::string& parent,
+                                                                                         LLNotificationFilter filter, 
+                                                                                         LLNotificationComparator comparator) : 
+LLNotificationChannelBase(filter, comparator),
+mName(name),
+mParent(parent)
+{
+        // store myself in the channel map
+        LLNotifications::instance().addChannel(LLNotificationChannelPtr(this));
+        // bind to notification broadcast
+        if (parent.empty())
+        {
+                LLNotifications::instance().connectChanged(
+                        boost::bind(&LLNotificationChannelBase::updateItem, this, _1));
+        }
+        else
+        {
+                LLNotificationChannelPtr p = LLNotifications::instance().getChannel(parent);
+                LLStandardSignal::slot_type f = boost::bind(&LLNotificationChannelBase::updateItem, this, _1);
+                p->connectChanged(f);
+        }
+}
+
+
+void LLNotificationChannel::setComparator(LLNotificationComparator comparator) 
+{ 
+        mComparator = comparator; 
+        LLNotificationSet s2(mComparator);
+        s2.insert(mItems.begin(), mItems.end());
+        mItems.swap(s2);
+        
+        // notify clients that we've been resorted
+        mChanged(LLSD().insert("sigtype", "sort")); 
+}
+
+bool LLNotificationChannel::isEmpty() const
+{
+        return mItems.empty();
+}
+
+LLNotificationChannel::Iterator LLNotificationChannel::begin()
+{
+        return mItems.begin();
+}
+
+LLNotificationChannel::Iterator LLNotificationChannel::end()
+{
+        return mItems.end();
+}
+
+std::string LLNotificationChannel::summarize()
+{
+        std::string s("Channel '");
+        s += mName;
+        s += "'\n  ";
+        for (LLNotificationChannel::Iterator it = begin(); it != end(); ++it)
+        {
+                s += (*it)->summarize();
+                s += "\n  ";
+        }
+        return s;
+}
+
+
+// ---
+// END OF LLNotificationChannel implementation
+// =========================================================
+
+
+// =========================================================
+// LLNotifications implementation
+// ---
+LLNotifications::LLNotifications() : LLNotificationChannelBase(LLNotificationFilters::includeEverything,
+                                                                                                                           LLNotificationComparators::orderByUUID())
+{
+}
+
+
+// The expiration channel gets all notifications that are cancelled
+bool LLNotifications::expirationFilter(LLNotificationPtr pNotification)
+{
+        return pNotification->isCancelled() || pNotification->isRespondedTo();
+}
+
+bool LLNotifications::expirationHandler(const LLSD& payload)
+{
+        if (payload["sigtype"].asString() != "delete")
+        {
+                // anything added to this channel actually should be deleted from the master
+                cancel(find(payload["id"]));
+                return true;    // don't process this item any further
+        }
+        return false;
+}
+
+bool LLNotifications::uniqueFilter(LLNotificationPtr pNotif)
+{
+        if (!pNotif->hasUniquenessConstraints())
+        {
+                return true;
+        }
+
+        // checks against existing unique notifications
+        for (LLNotificationMap::iterator existing_it = mUniqueNotifications.find(pNotif->getName());
+                existing_it != mUniqueNotifications.end();
+                ++existing_it)
+        {
+                LLNotificationPtr existing_notification = existing_it->second;
+                if (pNotif != existing_notification 
+                        && pNotif->isEquivalentTo(existing_notification))
+                {
+                        return false;
+                }
+        }
+
+        return true;
+}
+
+bool LLNotifications::uniqueHandler(const LLSD& payload)
+{
+        LLNotificationPtr pNotif = LLNotifications::instance().find(payload["id"].asUUID());
+        if (pNotif && pNotif->hasUniquenessConstraints()) 
+        {
+                if (payload["sigtype"].asString() == "add")
+                {
+                        // not a duplicate according to uniqueness criteria, so we keep it
+                        // and store it for future uniqueness checks
+                        mUniqueNotifications.insert(std::make_pair(pNotif->getName(), pNotif));
+                }
+                else if (payload["sigtype"].asString() == "delete")
+                {
+                        mUniqueNotifications.erase(pNotif->getName());
+                }
+        }
+
+        return false;
+}
+
+bool LLNotifications::failedUniquenessTest(const LLSD& payload)
+{
+        LLNotificationPtr pNotif = LLNotifications::instance().find(payload["id"].asUUID());
+        
+        if (!pNotif || !pNotif->hasUniquenessConstraints())
+        {
+                return false;
+        }
+
+        // checks against existing unique notifications
+        for (LLNotificationMap::iterator existing_it = mUniqueNotifications.find(pNotif->getName());
+                existing_it != mUniqueNotifications.end();
+                ++existing_it)
+        {
+                LLNotificationPtr existing_notification = existing_it->second;
+                if (pNotif != existing_notification 
+                        && pNotif->isEquivalentTo(existing_notification))
+                {
+                        // copy notification instance data over to oldest instance
+                        // of this unique notification and update it
+                        existing_notification->updateFrom(pNotif);
+                        // then delete the new one
+                        pNotif->cancel();
+                }
+        }
+
+        return false;
+}
+
+
+void LLNotifications::addChannel(LLNotificationChannelPtr pChan)
+{
+        mChannels[pChan->getName()] = pChan;
+}
+
+LLNotificationChannelPtr LLNotifications::getChannel(const std::string& channelName)
+{
+        ChannelMap::iterator p = mChannels.find(channelName);
+        if(p == mChannels.end())
+        {
+                llerrs << "Did not find channel named " << channelName << llendl;
+        }
+        return p->second;
+}
+
+
+// this function is called once at construction time, after the object is constructed.
+void LLNotifications::initSingleton()
+{
+        loadTemplates();
+        createDefaultChannels();
+}
+
+void LLNotifications::createDefaultChannels()
+{
+        // now construct the various channels AFTER loading the notifications,
+        // because the history channel is going to rewrite the stored notifications file
+        LLNotificationChannel::buildChannel("Expiration", "",
+                boost::bind(&LLNotifications::expirationFilter, this, _1));
+        LLNotificationChannel::buildChannel("Unexpired", "",
+                !boost::bind(&LLNotifications::expirationFilter, this, _1)); // use negated bind
+        LLNotificationChannel::buildChannel("Unique", "Unexpired",
+                boost::bind(&LLNotifications::uniqueFilter, this, _1));
+        LLNotificationChannel::buildChannel("Ignore", "Unique",
+                filterIgnoredNotifications);
+        LLNotificationChannel::buildChannel("Visible", "Ignore",
+                &LLNotificationFilters::includeEverything);
+
+        // create special history channel
+        //std::string notifications_log_file = gDirUtilp->getExpandedFilename ( LL_PATH_PER_SL_ACCOUNT, "open_notifications.xml" );
+        // use ^^^ when done debugging notifications serialization
+        std::string notifications_log_file = gDirUtilp->getExpandedFilename ( LL_PATH_USER_SETTINGS, "open_notifications.xml" );
+        // this isn't a leak, don't worry about the empty "new"
+        new LLNotificationHistoryChannel(notifications_log_file);
+
+        // connect action methods to these channels
+        LLNotifications::instance().getChannel("Expiration")->
+                connectChanged(boost::bind(&LLNotifications::expirationHandler, this, _1));
+        LLNotifications::instance().getChannel("Unique")->
+                connectChanged(boost::bind(&LLNotifications::uniqueHandler, this, _1));
+        LLNotifications::instance().getChannel("Unique")->
+                connectFailedFilter(boost::bind(&LLNotifications::failedUniquenessTest, this, _1));
+        LLNotifications::instance().getChannel("Ignore")->
+                connectFailedFilter(&handleIgnoredNotification);
+}
+
+static std::string sStringSkipNextTime("Skip this dialog next time");
+static std::string sStringAlwaysChoose("Always choose this option");
+
+bool LLNotifications::addTemplate(const std::string &name, 
+                                                                  LLNotificationTemplatePtr theTemplate)
+{
+        if (mTemplates.count(name))
+        {
+                llwarns << "LLNotifications -- attempted to add template '" << name << "' twice." << llendl;
+                return false;
+        }
+        mTemplates[name] = theTemplate;
+        return true;
+}
+
+LLNotificationTemplatePtr LLNotifications::getTemplate(const std::string& name)
+{
+        if (mTemplates.count(name))
+        {
+                return mTemplates[name];
+        }
+        else
+        {
+                return mTemplates["MissingAlert"];
+        }
+}
+
+bool LLNotifications::templateExists(const std::string& name)
+{
+        return (mTemplates.count(name) != 0);
+}
+
+void LLNotifications::clearTemplates()
+{
+        mTemplates.clear();
+}
+
+void LLNotifications::forceResponse(const LLNotification::Params& params, S32 option)
+{
+        LLNotificationPtr temp_notify(new LLNotification(params));
+        LLSD response = temp_notify->getResponseTemplate();
+        LLSD selected_item = temp_notify->getForm()->getElement(option);
+        
+        if (selected_item.isUndefined())
+        {
+                llwarns << "Invalid option" << option << " for notification " << (std::string)params.name << llendl;
+                return;
+        }
+        response[selected_item["name"].asString()] = true;
+
+        temp_notify->respond(response);
+}
+
+LLNotifications::TemplateNames LLNotifications::getTemplateNames() const
+{
+        TemplateNames names;
+        for (TemplateMap::const_iterator it = mTemplates.begin(); it != mTemplates.end(); ++it)
+        {
+                names.push_back(it->first);
+        }
+        return names;
+}
+
+typedef std::map<std::string, std::string> StringMap;
+void replaceSubstitutionStrings(LLXMLNodePtr node, StringMap& replacements)
+{
+        //llwarns << "replaceSubstitutionStrings" << llendl;
+        // walk the list of attributes looking for replacements
+        for (LLXMLAttribList::iterator it=node->mAttributes.begin();
+                 it != node->mAttributes.end(); ++it)
+        {
+                std::string value = it->second->getValue();
+                if (value[0] == '$')
+                {
+                        value.erase(0, 1);      // trim off the $
+                        std::string replacement;
+                        StringMap::const_iterator found = replacements.find(value);
+                        if (found != replacements.end())
+                        {
+                                replacement = found->second;
+                                //llwarns << "replaceSubstituionStrings: value: " << value << " repl: " << replacement << llendl;
+
+                                it->second->setValue(replacement);
+                        }
+                        else
+                        {
+                                llwarns << "replaceSubstituionStrings FAILURE: value: " << value << " repl: " << replacement << llendl;
+                        }
+                }
+        }
+        
+        // now walk the list of children and call this recursively.
+        for (LLXMLNodePtr child = node->getFirstChild(); 
+                 child.notNull(); child = child->getNextSibling())
+        {
+                replaceSubstitutionStrings(child, replacements);
+        }
+}
+
+// private to this file
+// returns true if the template request was invalid and there's nothing else we
+// can do with this node, false if you should keep processing (it may have
+// replaced the contents of the node referred to)
+LLXMLNodePtr LLNotifications::checkForXMLTemplate(LLXMLNodePtr item)
+{
+        if (item->hasName("usetemplate"))
+        {
+                std::string replacementName;
+                if (item->getAttributeString("name", replacementName))
+                {
+                        StringMap replacements;
+                        for (LLXMLAttribList::const_iterator it=item->mAttributes.begin(); 
+                                 it != item->mAttributes.end(); ++it)
+                        {
+                                replacements[it->second->getName()->mString] = it->second->getValue();
+                        }
+                        if (mXmlTemplates.count(replacementName))
+                        {
+                                item=LLXMLNode::replaceNode(item, mXmlTemplates[replacementName]);
+                                
+                                // walk the nodes looking for $(substitution) here and replace
+                                replaceSubstitutionStrings(item, replacements);
+                        }
+                        else
+                        {
+                                llwarns << "XML template lookup failure on '" << replacementName << "' " << llendl;
+                        }
+                }
+        }
+        return item;
+}
+
+bool LLNotifications::loadTemplates()
+{
+        const std::string xml_filename = "notifications.xml";
+        LLXMLNodePtr root;
+        
+        BOOL success  = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);
+        
+        if (!success || root.isNull() || !root->hasName( "notifications" ))
+        {
+                llerrs << "Problem reading UI Notifications file: " << xml_filename << llendl;
+                return false;
+        }
+        
+        clearTemplates();
+        
+        for (LLXMLNodePtr item = root->getFirstChild();
+                 item.notNull(); item = item->getNextSibling())
+        {
+                // we do this FIRST so that item can be changed if we 
+                // encounter a usetemplate -- we just replace the
+                // current xml node and keep processing
+                item = checkForXMLTemplate(item);
+                
+                if (item->hasName("global"))
+                {
+                        std::string global_name;
+                        if (item->getAttributeString("name", global_name))
+                        {
+                                mGlobalStrings[global_name] = item->getTextContents();
+                        }
+                        continue;
+                }
+                
+                if (item->hasName("template"))
+                {
+                        // store an xml template; templates must have a single node (can contain
+                        // other nodes)
+                        std::string name;
+                        item->getAttributeString("name", name);
+                        LLXMLNodePtr ptr = item->getFirstChild();
+                        mXmlTemplates[name] = ptr;
+                        continue;
+                }
+                
+                if (!item->hasName("notification"))
+                {
+            llwarns << "Unexpected entity " << item->getName()->mString << 
+                       " found in " << xml_filename << llendl;
+                        continue;
+                }
+                
+                // now we know we have a notification entry, so let's build it
+                LLNotificationTemplatePtr pTemplate(new LLNotificationTemplate());
+
+                if (!item->getAttributeString("name", pTemplate->mName))
+                {
+                        llwarns << "Unable to parse notification with no name" << llendl;
+                        continue;
+                }
+                
+                //llinfos << "Parsing " << pTemplate->mName << llendl;
+                
+                pTemplate->mMessage = item->getTextContents();
+                pTemplate->mDefaultFunctor = pTemplate->mName;
+                item->getAttributeString("type", pTemplate->mType);
+                item->getAttributeString("icon", pTemplate->mIcon);
+                item->getAttributeString("label", pTemplate->mLabel);
+                item->getAttributeU32("duration", pTemplate->mExpireSeconds);
+                item->getAttributeU32("expireOption", pTemplate->mExpireOption);
+
+                std::string priority;
+                item->getAttributeString("priority", priority);
+                pTemplate->mPriority = NOTIFICATION_PRIORITY_NORMAL;
+                if (!priority.empty())
+                {
+                        if (priority == "low")      pTemplate->mPriority = NOTIFICATION_PRIORITY_LOW;
+                        if (priority == "normal")   pTemplate->mPriority = NOTIFICATION_PRIORITY_NORMAL;
+                        if (priority == "high")     pTemplate->mPriority = NOTIFICATION_PRIORITY_HIGH;
+                        if (priority == "critical") pTemplate->mPriority = NOTIFICATION_PRIORITY_CRITICAL;
+                }
+                
+                item->getAttributeString("functor", pTemplate->mDefaultFunctor);
+
+                BOOL persist = false;
+                item->getAttributeBOOL("persist", persist);
+                pTemplate->mPersist = persist;
+                
+                std::string sound;
+                item->getAttributeString("sound", sound);
+                if (!sound.empty())
+                {
+                        // TODO: test for bad sound effect name / missing effect
+                        pTemplate->mSoundEffect = LLUUID(LLUI::sConfigGroup->getString(sound.c_str()));
+                }
+
+                for (LLXMLNodePtr child = item->getFirstChild();
+                         !child.isNull(); child = child->getNextSibling())
+                {
+                        child = checkForXMLTemplate(child);
+                        
+                        // <url>
+                        if (child->hasName("url"))
+                        {
+                                pTemplate->mURL = child->getTextContents();
+                                child->getAttributeU32("option", pTemplate->mURLOption);
+                        }
+                        
+            if (child->hasName("unique"))
+            {
+                pTemplate->mUnique = true;
+                for (LLXMLNodePtr formitem = child->getFirstChild();
+                     !formitem.isNull(); formitem = formitem->getNextSibling())
+                {
+                    if (formitem->hasName("context"))
+                    {
+                        std::string key;
+                        formitem->getAttributeString("key", key);
+                        pTemplate->mUniqueContext.push_back(key);
+                        //llwarns << "adding " << key << " to unique context" << llendl;
+                    }
+                    else
+                    {
+                        llwarns << "'unique' has unrecognized subelement " 
+                        << formitem->getName()->mString << llendl;
+                    }
+                }
+            }
+            
+                        // <form>
+                        if (child->hasName("form"))
+                        {
+                pTemplate->mForm = LLNotificationFormPtr(new LLNotificationForm(pTemplate->mName, child));
+                        }
+                }
+                addTemplate(pTemplate->mName, pTemplate);
+        }
+        
+        //std::ostringstream ostream;
+        //root->writeToOstream(ostream, "\n  ");
+        //llwarns << ostream.str() << llendl;
+        
+        return true;
+}
+
+// we provide a couple of simple add notification functions so that it's reasonable to create notifications in one line
+LLNotificationPtr LLNotifications::add(const std::string& name, 
+                                                                                const LLSD& substitutions, 
+                                                                                const LLSD& payload)
+{
+        return add(LLNotification::Params(name).substitutions(substitutions).payload(payload)); 
+}
+
+LLNotificationPtr LLNotifications::add(const std::string& name, 
+                                                                                const LLSD& substitutions, 
+                                                                                const LLSD& payload, 
+                                                                                const std::string& functor_name)
+{
+        return add(LLNotification::Params(name).substitutions(substitutions).payload(payload).functor_name(functor_name));      
+}
+
+LLNotificationPtr LLNotifications::add(const std::string& name, 
+                                                                                const LLSD& substitutions, 
+                                                                                const LLSD& payload, 
+                                                                                LLNotificationFunctorRegistry::ResponseFunctor functor)
+{
+        return add(LLNotification::Params(name).substitutions(substitutions).payload(payload).functor(functor));        
+}
+
+// generalized add function that takes a parameter block object for more complex instantiations
+LLNotificationPtr LLNotifications::add(const LLNotification::Params& p)
+{
+        LLNotificationPtr pNotif(new LLNotification(p));
+        add(pNotif);
+        return pNotif;
+}
+
+
+void LLNotifications::add(const LLNotificationPtr pNotif)
+{
+        // first see if we already have it -- if so, that's a problem
+        LLNotificationSet::iterator it=mItems.find(pNotif);
+        if (it != mItems.end())
+        {
+                llerrs << "Notification added a second time to the master notification channel." << llendl;
+        }
+
+        updateItem(LLSD().insert("sigtype", "add").insert("id", pNotif->id()), pNotif);
+}
+
+void LLNotifications::cancel(LLNotificationPtr pNotif)
+{
+        LLNotificationSet::iterator it=mItems.find(pNotif);
+        if (it == mItems.end())
+        {
+                llerrs << "Attempted to delete nonexistent notification " << pNotif->getName() << llendl;
+        }
+        updateItem(LLSD().insert("sigtype", "delete").insert("id", pNotif->id()), pNotif);
+        pNotif->cancel();
+}
+
+void LLNotifications::update(const LLNotificationPtr pNotif)
+{
+        LLNotificationSet::iterator it=mItems.find(pNotif);
+        if (it != mItems.end())
+        {
+                updateItem(LLSD().insert("sigtype", "change").insert("id", pNotif->id()), pNotif);
+        }
+}
+
+
+LLNotificationPtr LLNotifications::find(LLUUID uuid)
+{
+        LLNotificationPtr target = LLNotificationPtr(new LLNotification(uuid));
+        LLNotificationSet::iterator it=mItems.find(target);
+        if (it == mItems.end())
+        {
+                llwarns << "Tried to dereference uuid '" << uuid << "' as a notification key but didn't find it." << llendl;
+                return LLNotificationPtr((LLNotification*)NULL);
+        }
+        else
+        {
+                return *it;
+        }
+}
+
+void LLNotifications::forEachNotification(NotificationProcess process)
+{
+        std::for_each(mItems.begin(), mItems.end(), process);
+}
+
+std::string LLNotifications::getGlobalString(const std::string& key) const
+{
+        GlobalStringMap::const_iterator it = mGlobalStrings.find(key);
+        if (it != mGlobalStrings.end())
+        {
+                return it->second;
+        }
+        else
+        {
+                // if we don't have the key as a global, return the key itself so that the error
+                // is self-diagnosing.
+                return key;
+        }
+}
+
+                                                                                                        
+// ---
+// END OF LLNotifications implementation
+// =========================================================
+
+std::ostream& operator<<(std::ostream& s, const LLNotification& notification)
+{
+        s << notification.summarize();
+        return s;
+}
+
diff --git a/linden/indra/llui/llnotifications.h b/linden/indra/llui/llnotifications.h
new file mode 100644
index 0000000..bb37912
--- /dev/null
+++ b/linden/indra/llui/llnotifications.h
@@ -0,0 +1,903 @@
+/**
+* @file llnotifications.h
+* @brief Non-UI manager and support for keeping a prioritized list of notifications
+* @author Q (with assistance from Richard and Coco)
+*
+* $LicenseInfo:firstyear=2008&license=viewergpl$
+* 
+* Copyright (c) 2008-2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef LL_LLNOTIFICATIONS_H
+#define LL_LLNOTIFICATIONS_H
+
+/**
+ * This system is intended to provide a singleton mechanism for adding
+ * notifications to one of an arbitrary set of event channels.
+ * 
+ * Controlling JIRA: DEV-9061
+ *
+ * Every notification has (see code for full list):
+ *  - a textual name, which is used to look up its template in the XML files
+ *  - a payload, which is a block of LLSD
+ *  - a channel, which is normally extracted from the XML files but
+ *        can be overridden.
+ *  - a timestamp, used to order the notifications
+ *  - expiration time -- if nonzero, specifies a time after which the
+ *    notification will no longer be valid.
+ *  - a callback name and a couple of status bits related to callbacks (see below)
+ * 
+ * There is a management class called LLNotifications, which is an LLSingleton.
+ * The class maintains a collection of all of the notifications received
+ * or processed during this session, and also manages the persistence
+ * of those notifications that must be persisted.
+ * 
+ * We also have Channels. A channel is a view on a collection of notifications;
+ * The collection is defined by a filter function that controls which
+ * notifications are in the channel, and its ordering is controlled by 
+ * a comparator. 
+ *
+ * There is a hierarchy of channels; notifications flow down from
+ * the management class (LLNotifications, which itself inherits from
+ * The channel base class) to the individual channels.
+ * Any change to notifications (add, delete, modify) is 
+ * automatically propagated through the channel hierarchy.
+ * 
+ * We provide methods for adding a new notification, for removing
+ * one, and for managing channels. Channels are relatively cheap to construct
+ * and maintain, so in general, human interfaces should use channels to
+ * select and manage their lists of notifications.
+ * 
+ * We also maintain a collection of templates that are loaded from the 
+ * XML file of template translations. The system supports substitution
+ * of named variables from the payload into the XML file.
+ * 
+ * By default, only the "unknown message" template is built into the system.
+ * It is not an error to add a notification that's not found in the 
+ * template system, but it is logged.
+ *
+ */
+
+#include <string>
+#include <list>
+#include <vector>
+#include <map>
+#include <set>
+#include <iomanip>
+#include <sstream>
+
+#include <boost/utility.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/signal.hpp>
+#include <boost/type_traits.hpp>
+
+// we want to minimize external dependencies, but this one is important
+#include "llsd.h"
+
+// and we need this to manage the notification callbacks
+#include "llfunctorregistry.h"
+#include "llui.h"
+
+class LLNotification;
+typedef boost::shared_ptr<LLNotification> LLNotificationPtr;
+
+/*****************************************************************************
+*   Signal and handler declarations
+*   Using a single handler signature means that we can have a common handler
+*   type, rather than needing a distinct one for each different handler.
+*****************************************************************************/
+
+/**
+ * A boost::signals Combiner that stops the first time a handler returns true
+ * We need this because we want to have our handlers return bool, so that
+ * we have the option to cause a handler to stop further processing. The
+ * default handler fails when the signal returns a value but has no slots.
+ */
+struct LLStopWhenHandled
+{
+    typedef bool result_type;
+
+    template<typename InputIterator>
+    result_type operator()(InputIterator first, InputIterator last) const
+    {
+        for (InputIterator si = first; si != last; ++si)
+                {
+            if (*si)
+                        {
+                return true;
+                        }
+                }
+        return false;
+    }
+};
+
+        
+typedef enum e_notification_priority
+{
+        NOTIFICATION_PRIORITY_UNSPECIFIED,
+        NOTIFICATION_PRIORITY_LOW,
+        NOTIFICATION_PRIORITY_NORMAL,
+        NOTIFICATION_PRIORITY_HIGH,
+        NOTIFICATION_PRIORITY_CRITICAL
+} ENotificationPriority;
+
+/**
+ * We want to have a standard signature for all signals; this way,
+ * we can easily document a protocol for communicating across
+ * dlls and into scripting languages someday.
+ * we want to return a bool to indicate whether the signal has been
+ * handled and should NOT be passed on to other listeners.
+ * Return true to stop further handling of the signal, and false
+ * to continue.
+ * We take an LLSD because this way the contents of the signal
+ * are independent of the API used to communicate it.
+ * It is const ref because then there's low cost to pass it;
+ * if you only need to inspect it, it's very cheap.
+ */
+
+typedef boost::function<void (const LLSD&, const LLSD&)> LLNotificationResponder;
+
+typedef LLFunctorRegistry<LLNotificationResponder> LLNotificationFunctorRegistry;
+typedef LLFunctorRegistration<LLNotificationResponder> LLNotificationFunctorRegistration;
+
+typedef boost::signal<bool(const LLSD&), LLStopWhenHandled>  LLStandardSignal;
+
+// context data that can be looked up via a notification's payload by the display logic
+// derive from this class to implement specific contexts
+class LLNotificationContext : public LLInstanceTracker<LLNotificationContext, LLUUID>
+{
+public:
+        LLNotificationContext() : LLInstanceTracker<LLNotificationContext, LLUUID>(LLUUID::generateNewID())
+        {
+        }
+
+        virtual ~LLNotificationContext() {}
+
+        LLSD asLLSD() const
+        {
+                return getKey();
+        }
+
+private:
+
+};
+
+// Contains notification form data, such as buttons and text fields along with
+// manipulator functions
+class LLNotificationForm
+{
+        LOG_CLASS(LLNotificationForm);
+
+public:
+        typedef enum e_ignore_type
+        { 
+                IGNORE_NO,
+                IGNORE_WITH_DEFAULT_RESPONSE, 
+                IGNORE_WITH_LAST_RESPONSE, 
+                IGNORE_SHOW_AGAIN 
+        } EIgnoreType;
+
+        LLNotificationForm();
+        LLNotificationForm(const LLSD& sd);
+        LLNotificationForm(const std::string& name, const LLXMLNodePtr xml_node);
+
+        LLSD asLLSD() const;
+
+        S32 getNumElements() { return mFormData.size(); }
+        LLSD getElement(S32 index) { return mFormData.get(index); }
+        LLSD getElement(const std::string& element_name);
+        bool hasElement(const std::string& element_name);
+        void addElement(const std::string& type, const std::string& name, const LLSD& value = LLSD());
+        void formatElements(const LLSD& substitutions);
+        // appends form elements from another form serialized as LLSD
+        void append(const LLSD& sub_form);
+        std::string getDefaultOption();
+
+        EIgnoreType getIgnoreType() { return mIgnore; }
+        std::string getIgnoreMessage() { return mIgnoreMsg; }
+
+private:
+        LLSD    mFormData;
+        EIgnoreType mIgnore;
+        std::string mIgnoreMsg;
+};
+
+typedef boost::shared_ptr<LLNotificationForm> LLNotificationFormPtr;
+
+// This is the class of object read from the XML file (notifications.xml, 
+// from the appropriate local language directory).
+struct LLNotificationTemplate
+{
+        LLNotificationTemplate();
+    // the name of the notification -- the key used to identify it
+    // Ideally, the key should follow variable naming rules 
+    // (no spaces or punctuation).
+    std::string mName;
+    // The type of the notification
+    // used to control which queue it's stored in
+    std::string mType;
+    // The text used to display the notification. Replaceable parameters
+    // are enclosed in square brackets like this [].
+    std::string mMessage;
+        // The label for the notification; used for 
+        // certain classes of notification (those with a window and a window title). 
+        // Also used when a notification pops up underneath the current one.
+        // Replaceable parameters can be used in the label.
+        std::string mLabel;
+        // The name of the icon image. This should include an extension.
+        std::string mIcon;
+    // This is the Highlander bit -- "There Can Be Only One"
+    // An outstanding notification with this bit set
+    // is updated by an incoming notification with the same name,
+    // rather than creating a new entry in the queue.
+    // (used for things like progress indications, or repeating warnings
+    // like "the grid is going down in N minutes")
+    bool mUnique;
+    // if we want to be unique only if a certain part of the payload is constant
+    // specify the field names for the payload. The notification will only be
+    // combined if all of the fields named in the context are identical in the
+    // new and the old notification; otherwise, the notification will be
+    // duplicated. This is to support suppressing duplicate offers from the same
+    // sender but still differentiating different offers. Example: Invitation to
+    // conference chat.
+    std::vector<std::string> mUniqueContext;
+    // If this notification expires automatically, this value will be 
+    // nonzero, and indicates the number of seconds for which the notification
+    // will be valid (a teleport offer, for example, might be valid for 
+    // 300 seconds). 
+    U32 mExpireSeconds;
+    // if the offer expires, one of the options is chosen automatically
+    // based on its "value" parameter. This controls which one. 
+    // If expireSeconds is specified, expireOption should also be specified.
+    U32 mExpireOption;
+    // if the notification contains a url, it's stored here (and replaced 
+    // into the message where [_URL] is found)
+    std::string mURL;
+    // if there's a URL in the message, this controls which option visits
+    // that URL. Obsolete this and eliminate the buttons for affected
+    // messages when we allow clickable URLs in the UI
+    U32 mURLOption;
+        // does this notification persist across sessions? if so, it will be
+        // serialized to disk on first receipt and read on startup
+        bool mPersist;
+        // This is the name of the default functor, if present, to be
+        // used for the notification's callback. It is optional, and used only if 
+        // the notification is constructed without an identified functor.
+        std::string mDefaultFunctor;
+        // The form data associated with a given notification (buttons, text boxes, etc)
+    LLNotificationFormPtr mForm;
+        // default priority for notifications of this type
+        ENotificationPriority mPriority;
+        // UUID of the audio file to be played when this notification arrives
+        // this is loaded as a name, but looked up to get the UUID upon template load.
+        // If null, it wasn't specified.
+        LLUUID mSoundEffect;
+};
+
+// we want to keep a map of these by name, and it's best to manage them
+// with smart pointers
+typedef boost::shared_ptr<LLNotificationTemplate> LLNotificationTemplatePtr;
+
+/**
+ * @class LLNotification
+ * @brief The object that expresses the details of a notification
+ * 
+ * We make this noncopyable because
+ * we want to manage these through LLNotificationPtr, and only
+ * ever create one instance of any given notification.
+ * 
+ * The enable_shared_from_this flag ensures that if we construct
+ * a smart pointer from a notification, we'll always get the same
+ * shared pointer.
+ */
+class LLNotification  : 
+        boost::noncopyable,
+        public boost::enable_shared_from_this<LLNotification>
+{
+LOG_CLASS(LLNotification);
+friend class LLNotifications;
+
+public:
+        // parameter object used to instantiate a new notification
+        class Params : public LLParamBlock<Params>
+        {
+                friend class LLNotification;
+        public:
+                Params(const std::string& _name) 
+                        :       name(_name),
+                                mTemporaryResponder(false),
+                                functor_name(_name),
+                                priority(NOTIFICATION_PRIORITY_UNSPECIFIED),
+                                timestamp(LLDate::now())
+                {
+                }
+
+                // pseudo-param
+                Params& functor(LLNotificationFunctorRegistry::ResponseFunctor f) 
+                {       
+                        functor_name = LLUUID::generateNewID().asString();
+                        LLNotificationFunctorRegistry::instance().registerFunctor(functor_name, f);
+
+                        mTemporaryResponder = true;
+                        return *this;
+                }
+
+                LLMandatoryParam<std::string>                                   name;
+
+                // optional
+                LLOptionalParam<LLSD>                                                   substitutions;
+                LLOptionalParam<LLSD>                                                   payload;
+                LLOptionalParam<ENotificationPriority>                  priority;
+                LLOptionalParam<LLSD>                                                   form_elements;
+                LLOptionalParam<LLDate>                                                 timestamp;
+                LLOptionalParam<LLNotificationContext*>                 context;
+                LLOptionalParam<std::string>                                    functor_name;
+
+        private:
+                bool                                    mTemporaryResponder;
+        };
+
+private:
+        
+        LLUUID mId;
+        LLSD mPayload;
+        LLSD mSubstitutions;
+        LLDate mTimestamp;
+        LLDate mExpiresAt;
+        bool mCancelled;
+        bool mRespondedTo;      // once the notification has been responded to, this becomes true
+        bool mIgnored;
+        ENotificationPriority mPriority;
+        LLNotificationFormPtr mForm;
+        
+        // a reference to the template
+        LLNotificationTemplatePtr mTemplatep;
+        
+        /*
+         We want to be able to store and reload notifications so that they can survive
+         a shutdown/restart of the client. So we can't simply pass in callbacks;
+         we have to specify a callback mechanism that can be used by name rather than 
+         by some arbitrary pointer -- and then people have to initialize callbacks 
+         in some useful location. So we use LLNotificationFunctorRegistry to manage them.
+         */
+         std::string mResponseFunctorName;
+        
+        /*
+         In cases where we want to specify an explict, non-persisted callback, 
+         we store that in the callback registry under a dynamically generated
+         key, and store the key in the notification, so we can still look it up
+         using the same mechanism.
+         */
+        bool mTemporaryResponder;
+
+        void init(const std::string& template_name, const LLSD& form_elements);
+
+        LLNotification(const Params& p);
+
+        // this is just for making it easy to look things up in a set organized by UUID -- DON'T USE IT
+        // for anything real!
+        LLNotification(LLUUID uuid) : mId(uuid) {}
+
+        void cancel();
+
+        bool payloadContainsAll(const std::vector<std::string>& required_fields) const;
+
+public:
+
+        // constructor from a saved notification
+        LLNotification(const LLSD& sd);
+
+        // This is a string formatter for substituting into the message directly 
+        // from LLSD without going through the hopefully-to-be-obsoleted LLString
+        static std::string format(const std::string& text, const LLSD& substitutions);
+
+        void setResponseFunctor(std::string const &responseFunctorName);
+
+        typedef enum e_response_template_type
+        {
+                WITHOUT_DEFAULT_BUTTON,
+                WITH_DEFAULT_BUTTON
+        } EResponseTemplateType;
+
+        // return response LLSD filled in with default form contents and (optionally) the default button selected
+        LLSD getResponseTemplate(EResponseTemplateType type = WITHOUT_DEFAULT_BUTTON);
+
+        // returns index of first button with value==TRUE
+        // usually this the button the user clicked on
+        // returns -1 if no button clicked (e.g. form has not been displayed)
+        static S32 getSelectedOption(const LLSD& notification, const LLSD& response);
+        // returns name of first button with value==TRUE
+        static std::string getSelectedOptionName(const LLSD& notification);
+
+        // after someone responds to a notification (usually by clicking a button,
+        // but sometimes by filling out a little form and THEN clicking a button),
+    // the result of the response (the name and value of the button clicked,
+        // plus any other data) should be packaged up as LLSD, then passed as a
+        // parameter to the notification's respond() method here. This will look up
+        // and call the appropriate responder.
+        //
+        // response is notification serialized as LLSD:
+        // ["name"] = notification name
+        // ["form"] = LLSD tree that includes form description and any prefilled form data
+        // ["response"] = form data filled in by user
+        // (including, but not limited to which button they clicked on)
+        // ["payload"] = transaction specific data, such as ["source_id"] (originator of notification),  
+        //                              ["item_id"] (attached inventory item), etc.
+        // ["substitutions"] = string substitutions used to generate notification message
+    // from the template
+        // ["time"] = time at which notification was generated;
+        // ["expiry"] = time at which notification expires;
+        // ["responseFunctor"] = name of registered functor that handles responses to notification;
+        LLSD asLLSD();
+
+        void respond(const LLSD& sd);
+
+        void setIgnored(bool ignore);
+
+        bool isCancelled() const
+        {
+                return mCancelled;
+        }
+
+        bool isRespondedTo() const
+        {
+                return mRespondedTo;
+        }
+
+        bool isIgnored() const
+        {
+                return mIgnored;
+        }
+
+        const std::string& getName() const
+        {
+                return mTemplatep->mName;
+        }
+        
+        const LLUUID& id() const
+        {
+                return mId;
+        }
+        
+        const LLSD& getPayload() const
+        {
+                return mPayload;
+        }
+
+        const LLSD& getSubstitutions() const
+        {
+                return mSubstitutions;
+        }
+
+        const LLDate& getDate() const
+        {
+                return mTimestamp;
+        }
+
+        std::string getType() const
+        {
+                return (mTemplatep ? mTemplatep->mType : "");
+        }
+
+        std::string getMessage() const;
+        std::string getLabel() const;
+
+        std::string getURL() const
+        {
+                return (mTemplatep ? mTemplatep->mURL : "");
+        }
+
+        S32 getURLOption() const
+        {
+                return (mTemplatep ? mTemplatep->mURLOption : -1);
+        }
+
+        const LLNotificationFormPtr getForm();
+
+        const LLDate getExpiration() const
+        {
+                return mExpiresAt;
+        }
+
+        ENotificationPriority getPriority() const
+        {
+                return mPriority;
+        }
+
+        const LLUUID getID() const
+        {
+                return mId;
+        }
+        
+        // comparing two notifications normally means comparing them by UUID (so we can look them
+        // up quickly this way)
+        bool operator<(const LLNotification& rhs) const
+        {
+                return mId < rhs.mId;
+        }
+
+        bool operator==(const LLNotification& rhs) const
+        {
+                return mId == rhs.mId;
+        }
+
+        bool operator!=(const LLNotification& rhs) const
+        {
+                return !operator==(rhs);
+        }
+
+        bool isSameObjectAs(const LLNotification* rhs) const
+        {
+                return this == rhs;
+        }
+        
+        // this object has been updated, so tell all our clients
+        void update();
+
+        void updateFrom(LLNotificationPtr other);
+        
+        // A fuzzy equals comparator.
+        // true only if both notifications have the same template and 
+        //     1) flagged as unique (there can be only one of these) OR 
+        //     2) all required payload fields of each also exist in the other.
+        bool isEquivalentTo(LLNotificationPtr that) const;
+        
+        // if the current time is greater than the expiration, the notification is expired
+        bool isExpired() const
+        {
+                if (mExpiresAt.secondsSinceEpoch() == 0)
+                {
+                        return false;
+                }
+                
+                LLDate rightnow = LLDate::now();
+                return rightnow > mExpiresAt;
+        }
+        
+        std::string summarize() const;
+
+        bool hasUniquenessConstraints() const { return (mTemplatep ? mTemplatep->mUnique : false);}
+
+        virtual ~LLNotification() {}
+};
+
+std::ostream& operator<<(std::ostream& s, const LLNotification& notification);
+
+namespace LLNotificationFilters
+{
+        // a sample filter
+        bool includeEverything(LLNotificationPtr p);
+
+        typedef enum e_comparison 
+        { 
+                EQUAL, 
+                LESS, 
+                GREATER, 
+                LESS_EQUAL, 
+                GREATER_EQUAL 
+        } EComparison;
+
+        // generic filter functor that takes method or member variable reference
+        template<typename T>
+        struct filterBy
+        {
+                typedef boost::function<T (LLNotificationPtr)>  field_t;
+                typedef typename boost::remove_reference<T>::type               value_t;
+                
+                filterBy(field_t field, value_t value, EComparison comparison = EQUAL) 
+                        :       mField(field), 
+                                mFilterValue(value),
+                                mComparison(comparison)
+                {
+                }               
+                
+                bool operator()(LLNotificationPtr p)
+                {
+                        switch(mComparison)
+                        {
+                        case EQUAL:
+                                return mField(p) == mFilterValue;
+                        case LESS:
+                                return mField(p) < mFilterValue;
+                        case GREATER:
+                                return mField(p) > mFilterValue;
+                        case LESS_EQUAL:
+                                return mField(p) <= mFilterValue;
+                        case GREATER_EQUAL:
+                                return mField(p) >= mFilterValue;
+                        default:
+                                return false;
+                        }
+                }
+
+                field_t mField;
+                value_t mFilterValue;
+                EComparison mComparison;
+        };
+};
+
+namespace LLNotificationComparators
+{
+        typedef enum e_direction { ORDER_DECREASING, ORDER_INCREASING } EDirection;
+
+        // generic order functor that takes method or member variable reference
+        template<typename T>
+        struct orderBy
+        {
+                typedef boost::function<T (LLNotificationPtr)> field_t;
+                orderBy(field_t field, EDirection = ORDER_INCREASING) : mField(field) {}
+                bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs)
+                {
+                        if (mDirection == ORDER_DECREASING)
+                        {
+                                return mField(lhs) > mField(rhs);
+                        }
+                        else
+                        {
+                                return mField(lhs) < mField(rhs);
+                        }
+                }
+
+                field_t mField;
+                EDirection mDirection;
+        };
+
+        struct orderByUUID : public orderBy<const LLUUID&>
+        {
+                orderByUUID(EDirection direction = ORDER_INCREASING) : orderBy<const LLUUID&>(&LLNotification::id, direction) {}
+        };
+
+        struct orderByDate : public orderBy<const LLDate&>
+        {
+                orderByDate(EDirection direction = ORDER_INCREASING) : orderBy<const LLDate&>(&LLNotification::getDate, direction) {}
+        };
+};
+
+typedef boost::function<bool (LLNotificationPtr)> LLNotificationFilter;
+typedef boost::function<bool (LLNotificationPtr, LLNotificationPtr)> LLNotificationComparator;
+typedef std::set<LLNotificationPtr, LLNotificationComparator> LLNotificationSet;
+typedef std::multimap<std::string, LLNotificationPtr> LLNotificationMap;
+
+// ========================================================
+// Abstract base class (interface) for a channel; also used for the master container.
+// This lets us arrange channels into a call hierarchy.
+
+// We maintain a heirarchy of notification channels; events are always started at the top
+// and propagated through the hierarchy only if they pass a filter.
+// Any channel can be created with a parent. A null parent (empty string) means it's
+// tied to the root of the tree (the LLNotifications class itself).
+// The default hierarchy looks like this:
+//
+// LLNotifications --+-- Expiration --+-- Mute --+-- Ignore --+-- Visible --+-- History
+//                                                                          +-- Alerts
+//                                                                          +-- Notifications
+//
+// In general, new channels that want to only see notifications that pass through 
+// all of the built-in tests should attach to the "Visible" channel
+//
+class LLNotificationChannelBase :
+        public boost::signals::trackable
+{
+        LOG_CLASS(LLNotificationChannelBase);
+public:
+        LLNotificationChannelBase(LLNotificationFilter filter, LLNotificationComparator comp) : 
+                mFilter(filter), mItems(comp) 
+        {}
+        virtual ~LLNotificationChannelBase() {}
+        // you can also connect to a Channel, so you can be notified of
+        // changes to this channel
+        virtual void connectChanged(const LLStandardSignal::slot_type& slot);
+        virtual void connectPassedFilter(const LLStandardSignal::slot_type& slot);
+        virtual void connectFailedFilter(const LLStandardSignal::slot_type& slot);
+
+        // use this when items change or to add a new one
+        bool updateItem(const LLSD& payload);
+        const LLNotificationFilter& getFilter() { return mFilter; }
+
+protected:
+        LLNotificationSet mItems;
+        LLStandardSignal mChanged;
+        LLStandardSignal mPassedFilter;
+        LLStandardSignal mFailedFilter;
+        
+        // these are action methods that subclasses can override to take action 
+        // on specific types of changes; the management of the mItems list is
+        // still handled by the generic handler.
+        virtual void onLoad(LLNotificationPtr p) {}
+        virtual void onAdd(LLNotificationPtr p) {}
+        virtual void onDelete(LLNotificationPtr p) {}
+        virtual void onChange(LLNotificationPtr p) {}
+
+        bool updateItem(const LLSD& payload, LLNotificationPtr pNotification);
+        LLNotificationFilter mFilter;
+};
+
+// The type of the pointers that we're going to manage in the NotificationQueue system
+// Because LLNotifications is a singleton, we don't actually expect to ever 
+// destroy it, but if it becomes necessary to do so, the shared_ptr model
+// will ensure that we don't leak resources.
+class LLNotificationChannel;
+typedef boost::shared_ptr<LLNotificationChannel> LLNotificationChannelPtr;
+
+// manages a list of notifications
+// Note that if this is ever copied around, we might find ourselves with multiple copies
+// of a queue with notifications being added to different nonequivalent copies. So we 
+// make it inherit from boost::noncopyable, and then create a map of shared_ptr to manage it.
+// 
+// NOTE: LLNotificationChannel is self-registering. The *correct* way to create one is to 
+// do something like:
+//              LLNotificationChannel::buildChannel("name", "parent"...);
+// This returns an LLNotificationChannelPtr, which you can store, or
+// you can then retrieve the channel by using the registry:
+//              LLNotifications::instance().getChannel("name")...
+//
+class LLNotificationChannel : 
+        boost::noncopyable, 
+        public LLNotificationChannelBase
+{
+        LOG_CLASS(LLNotificationChannel);
+
+public:  
+        virtual ~LLNotificationChannel() {}
+        typedef LLNotificationSet::iterator Iterator;
+    
+        std::string getName() const { return mName; }
+        std::string getParentChannelName() { return mParent; }
+    
+    bool isEmpty() const;
+    
+    Iterator begin();
+    Iterator end();
+
+    // Channels have a comparator to control sort order;
+        // the default sorts by arrival date
+    void setComparator(LLNotificationComparator comparator);
+        
+        std::string summarize();
+
+        // factory method for constructing these channels; since they're self-registering,
+        // we want to make sure that you can't use new to make them
+        static LLNotificationChannelPtr buildChannel(const std::string& name, const std::string& parent,
+                                                LLNotificationFilter filter=LLNotificationFilters::includeEverything, 
+                                                LLNotificationComparator comparator=LLNotificationComparators::orderByUUID());
+        
+protected:
+    // Notification Channels have a filter, which determines which notifications
+        // will be added to this channel. 
+        // Channel filters cannot change.
+        // Channels have a protected constructor so you can't make smart pointers that don't 
+        // come from our internal reference; call NotificationChannel::build(args)
+        LLNotificationChannel(const std::string& name, const std::string& parent,
+                                                  LLNotificationFilter filter, LLNotificationComparator comparator);
+
+private:
+        std::string mName;
+        std::string mParent;
+        LLNotificationComparator mComparator;
+};
+
+
+
+class LLNotifications : 
+        public LLSingleton<LLNotifications>, 
+        public LLNotificationChannelBase
+{
+        LOG_CLASS(LLNotifications);
+
+        friend class LLSingleton<LLNotifications>;
+public:
+        // load notification descriptions from file; 
+        // OK to call more than once because it will reload
+        bool loadTemplates();  
+        LLXMLNodePtr checkForXMLTemplate(LLXMLNodePtr item);
+
+        // we provide a collection of simple add notification functions so that it's reasonable to create notifications in one line
+        LLNotificationPtr add(const std::string& name, 
+                                                const LLSD& substitutions = LLSD(), 
+                                                const LLSD& payload = LLSD());
+        LLNotificationPtr add(const std::string& name, 
+                                                const LLSD& substitutions, 
+                                                const LLSD& payload, 
+                                                const std::string& functor_name);
+        LLNotificationPtr add(const std::string& name, 
+                                                const LLSD& substitutions, 
+                                                const LLSD& payload, 
+                                                LLNotificationFunctorRegistry::ResponseFunctor functor);
+        LLNotificationPtr add(const LLNotification::Params& p);
+
+        void add(const LLNotificationPtr pNotif);
+        void cancel(LLNotificationPtr pNotif);
+        void update(const LLNotificationPtr pNotif);
+
+        LLNotificationPtr find(LLUUID uuid);
+        
+        typedef boost::function<void (LLNotificationPtr)> NotificationProcess;
+        
+        void forEachNotification(NotificationProcess process);
+
+        // This is all stuff for managing the templates
+        // take your template out
+        LLNotificationTemplatePtr getTemplate(const std::string& name);
+        
+        // get the whole collection
+        typedef std::vector<std::string> TemplateNames;
+        TemplateNames getTemplateNames() const;  // returns a list of notification names
+        
+        typedef std::map<std::string, LLNotificationTemplatePtr> TemplateMap;
+
+        TemplateMap::const_iterator templatesBegin() { return mTemplates.begin(); }
+        TemplateMap::const_iterator templatesEnd() { return mTemplates.end(); }
+
+        // test for existence
+        bool templateExists(const std::string& name);
+        // useful if you're reloading the file
+        void clearTemplates();   // erase all templates
+
+        void forceResponse(const LLNotification::Params& params, S32 option);
+
+        void createDefaultChannels();
+
+        typedef std::map<std::string, LLNotificationChannelPtr> ChannelMap;
+        ChannelMap mChannels;
+
+        void addChannel(LLNotificationChannelPtr pChan);
+        LLNotificationChannelPtr getChannel(const std::string& channelName);
+        
+        std::string getGlobalString(const std::string& key) const;
+
+private:
+        // we're a singleton, so we don't have a public constructor
+        LLNotifications();
+        /*virtual*/ void initSingleton();
+        
+        void loadPersistentNotifications();
+
+        bool expirationFilter(LLNotificationPtr pNotification);
+        bool expirationHandler(const LLSD& payload);
+        bool uniqueFilter(LLNotificationPtr pNotification);
+        bool uniqueHandler(const LLSD& payload);
+        bool failedUniquenessTest(const LLSD& payload);
+        LLNotificationChannelPtr pHistoryChannel;
+        LLNotificationChannelPtr pExpirationChannel;
+        
+        // put your template in
+        bool addTemplate(const std::string& name, LLNotificationTemplatePtr theTemplate);
+        TemplateMap mTemplates;
+
+        std::string mFileName;
+        
+        typedef std::map<std::string, LLXMLNodePtr> XMLTemplateMap;
+        XMLTemplateMap mXmlTemplates;
+
+        LLNotificationMap mUniqueNotifications;
+        
+        typedef std::map<std::string, std::string> GlobalStringMap;
+        GlobalStringMap mGlobalStrings;
+};
+
+
+#endif//LL_LLNOTIFICATIONS_H
+
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index d37517f..92d045d 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -58,8 +59,6 @@
 #include "llresizebar.h"
 #include "llcriticaldamp.h"
 
-LLPanel::alert_queue_t LLPanel::sAlertQueue;
-
 const S32 RESIZE_BAR_OVERLAP = 1;
 const S32 RESIZE_BAR_HEIGHT = 3;
 
@@ -344,14 +343,14 @@ BOOL LLPanel::checkRequirements()
 {
         if (!mRequirementsError.empty())
         {
-                LLStringUtil::format_map_t args;
-                args["[COMPONENTS]"] = mRequirementsError;
-                args["[FLOATER]"] = getName();
+                LLSD args;
+                args["COMPONENTS"] = mRequirementsError;
+                args["FLOATER"] = getName();
 
                 llwarns << getName() << " failed requirements check on: \n"  
                                 << mRequirementsError << llendl;
-                        
-                alertXml(std::string("FailedRequirementsCheck"), args);
+                
+                LLNotifications::instance().add(LLNotification::Params("FailedRequirementsCheck").payload(args));
                 mRequirementsError.clear();
                 return FALSE;
         }
@@ -359,25 +358,6 @@ BOOL LLPanel::checkRequirements()
         return TRUE;
 }
 
-//static
-void LLPanel::alertXml(const std::string& label, LLStringUtil::format_map_t args)
-{
-        sAlertQueue.push(LLAlertInfo(label,args));
-}
-
-//static
-BOOL LLPanel::nextAlert(LLAlertInfo &alert)
-{
-        if (!sAlertQueue.empty())
-        {
-                alert = sAlertQueue.front();
-                sAlertQueue.pop();
-                return TRUE;
-        }
-
-        return FALSE;
-}
-
 void LLPanel::setFocus(BOOL b)
 {
         if( b )
@@ -927,7 +907,7 @@ LLPanel *LLPanel::childGetVisibleTab(const std::string& id) const
         return NULL;
 }
 
-void LLPanel::childSetTabChangeCallback(const std::string& id, const std::string& tabname, void (*on_tab_clicked)(void*, bool), void *userdata)
+void LLPanel::childSetTabChangeCallback(const std::string& id, const std::string& tabname, void (*on_tab_clicked)(void*, bool), void *userdata, void (*on_precommit)(void*,bool))
 {
         LLTabContainer* child = getChild<LLTabContainer>(id);
         if (child)
@@ -937,6 +917,10 @@ void LLPanel::childSetTabChangeCallback(const std::string& id, const std::string
                 {
                         child->setTabChangeCallback(panel, on_tab_clicked);
                         child->setTabUserData(panel, userdata);
+                        if (on_precommit)
+                        {
+                                child->setTabPrecommitChangeCallback(panel, on_precommit);
+                        }
                 }
         }
 }
@@ -982,12 +966,12 @@ void LLPanel::childSetAction(const std::string& id, void(*function)(void*), void
         }
 }
 
-void LLPanel::childSetActionTextbox(const std::string& id, void(*function)(void*))
+void LLPanel::childSetActionTextbox(const std::string& id, void(*function)(void*), void* value)
 {
         LLTextBox* textbox = getChild<LLTextBox>(id);
         if (textbox)
         {
-                textbox->setClickedCallback(function);
+                textbox->setClickedCallback(function, value);
         }
 }
 
@@ -1039,9 +1023,9 @@ void LLPanel::childDisplayNotFound()
                 mExpectedMembers.insert(*itor);
         }
         mNewExpectedMembers.clear();
-        LLStringUtil::format_map_t args;
-        args["[CONTROLS]"] = msg;
-        LLAlertDialog::showXml("FloaterNotFound", args);
+        LLSD args;
+        args["CONTROLS"] = msg;
+        LLNotifications::instance().add("FloaterNotFound", args);
 }
 
 void LLPanel::storeRectControl()
@@ -1065,6 +1049,8 @@ struct LLLayoutStack::LLEmbeddedPanel
                         mAutoResize(auto_resize),
                         mUserResize(user_resize),
                         mOrientation(orientation),
+                        mCollapsed(FALSE),
+                        mCollapseAmt(0.f),
                         mVisibleAmt(1.f) // default to fully visible
         {
                 LLResizeBar::Side side = (orientation == HORIZONTAL) ? LLResizeBar::RIGHT : LLResizeBar::BOTTOM;
@@ -1095,14 +1081,28 @@ struct LLLayoutStack::LLEmbeddedPanel
                 mResizeBar = NULL;
         }
 
+        F32 getCollapseFactor()
+        {
+                if (mOrientation == HORIZONTAL)
+                {
+                        return mVisibleAmt * clamp_rescale(mCollapseAmt, 0.f, 1.f, 1.f, (F32)mMinWidth / (F32)mPanel->getRect().getWidth());
+                }
+                else
+                {
+                        return mVisibleAmt * clamp_rescale(mCollapseAmt, 0.f, 1.f, 1.f, (F32)mMinHeight / (F32)mPanel->getRect().getHeight());
+                }
+        }
+
         LLPanel* mPanel;
         S32 mMinWidth;
         S32 mMinHeight;
         BOOL mAutoResize;
         BOOL mUserResize;
+        BOOL mCollapsed;
         LLResizeBar* mResizeBar;
         eLayoutOrientation mOrientation;
         F32 mVisibleAmt;
+        F32 mCollapseAmt;
 };
 
 static LLRegisterWidget<LLLayoutStack> r2("layout_stack");
@@ -1123,28 +1123,27 @@ LLLayoutStack::~LLLayoutStack()
 void LLLayoutStack::draw()
 {
         updateLayout();
+
+        e_panel_list_t::iterator panel_it;
+        for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
         {
-                e_panel_list_t::iterator panel_it;
-                for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
+                // clip to layout rectangle, not bounding rectangle
+                LLRect clip_rect = (*panel_it)->mPanel->getRect();
+                // scale clipping rectangle by visible amount
+                if (mOrientation == HORIZONTAL)
                 {
-                        // clip to layout rectangle, not bounding rectangle
-                        LLRect clip_rect = (*panel_it)->mPanel->getRect();
-                        // scale clipping rectangle by visible amount
-                        if (mOrientation == HORIZONTAL)
-                        {
-                                clip_rect.mRight = clip_rect.mLeft + llround((F32)clip_rect.getWidth() * (*panel_it)->mVisibleAmt);
-                        }
-                        else
-                        {
-                                clip_rect.mBottom = clip_rect.mTop - llround((F32)clip_rect.getHeight() * (*panel_it)->mVisibleAmt);
-                        }
+                        clip_rect.mRight = clip_rect.mLeft + llround((F32)clip_rect.getWidth() * (*panel_it)->getCollapseFactor());
+                }
+                else
+                {
+                        clip_rect.mBottom = clip_rect.mTop - llround((F32)clip_rect.getHeight() * (*panel_it)->getCollapseFactor());
+                }
 
-                        LLPanel* panelp = (*panel_it)->mPanel;
+                LLPanel* panelp = (*panel_it)->mPanel;
 
-                        LLLocalClipRect clip(clip_rect);
-                        // only force drawing invisible children if visible amount is non-zero
-                        drawChild(panelp, 0, 0, !clip_rect.isNull());
-                }
+                LLLocalClipRect clip(clip_rect);
+                // only force drawing invisible children if visible amount is non-zero
+                drawChild(panelp, 0, 0, !clip_rect.isNull());
         }
 }
 
@@ -1276,8 +1275,13 @@ S32 LLLayoutStack::getDefaultWidth(S32 cur_width)
         return cur_width;
 }
 
-void LLLayoutStack::addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, S32 index)
+void LLLayoutStack::addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, EAnimate animate, S32 index)
 {
+        // panel starts off invisible (collapsed)
+        if (animate == ANIMATE)
+        {
+                panel->setVisible(FALSE);
+        }
         LLEmbeddedPanel* embedded_panel = new LLEmbeddedPanel(panel, mOrientation, min_width, min_height, auto_resize, user_resize);
         
         mPanels.insert(mPanels.begin() + llclamp(index, 0, (S32)mPanels.size()), embedded_panel);
@@ -1293,6 +1297,11 @@ void LLLayoutStack::addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL
                 sendChildToFront(resize_barp);
         }
 
+        // start expanding panel animation
+        if (animate == ANIMATE)
+        {
+                panel->setVisible(TRUE);
+        }
 }
 
 void LLLayoutStack::removePanel(LLPanel* panel)
@@ -1300,6 +1309,14 @@ void LLLayoutStack::removePanel(LLPanel* panel)
         removeChild(panel);
 }
 
+void LLLayoutStack::collapsePanel(LLPanel* panel, BOOL collapsed)
+{
+        LLEmbeddedPanel* panel_container = findEmbeddedPanel(panel);
+        if (!panel_container) return;
+
+        panel_container->mCollapsed = collapsed;
+}
+
 void LLLayoutStack::updateLayout(BOOL force_resize)
 {
         calcMinExtents();
@@ -1332,6 +1349,15 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                         }
                 }
 
+                if ((*panel_it)->mCollapsed)
+                {
+                        (*panel_it)->mCollapseAmt = lerp((*panel_it)->mCollapseAmt, 1.f, LLCriticalDamp::getInterpolant(ANIM_CLOSE_TIME));
+                }
+                else
+                {
+                        (*panel_it)->mCollapseAmt = lerp((*panel_it)->mCollapseAmt, 0.f, LLCriticalDamp::getInterpolant(ANIM_CLOSE_TIME));
+                }
+
                 if (mOrientation == HORIZONTAL)
                 {
                         // enforce minimize size constraint by default
@@ -1339,7 +1365,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                         {
                                 panelp->reshape((*panel_it)->mMinWidth, panelp->getRect().getHeight());
                         }
-                total_width += llround(panelp->getRect().getWidth() * (*panel_it)->mVisibleAmt);
+                total_width += llround(panelp->getRect().getWidth() * (*panel_it)->getCollapseFactor());
                 // want n-1 panel gaps for n panels
                         if (panel_it != mPanels.begin())
                         {
@@ -1353,7 +1379,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                         {
                                 panelp->reshape(panelp->getRect().getWidth(), (*panel_it)->mMinHeight);
                         }
-                        total_height += llround(panelp->getRect().getHeight() * (*panel_it)->mVisibleAmt);
+                        total_height += llround(panelp->getRect().getHeight() * (*panel_it)->getCollapseFactor());
                         if (panel_it != mPanels.begin())
                         {
                                 total_height += mPanelSpacing;
@@ -1367,7 +1393,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
         for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
         {
                 // panels that are not fully visible do not count towards shrink headroom
-                if ((*panel_it)->mVisibleAmt < 1.f) 
+                if ((*panel_it)->getCollapseFactor() < 1.f) 
                 {
                         continue;
                 }
@@ -1431,7 +1457,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                 S32 delta_size = 0;
 
                 // if panel can automatically resize (not animating, and resize flag set)...
-                if ((*panel_it)->mVisibleAmt == 1.f 
+                if ((*panel_it)->getCollapseFactor() == 1.f 
                         && (force_resize || (*panel_it)->mAutoResize) 
                         && !(*panel_it)->mResizeBar->hasMouseCapture()) 
                 {
@@ -1515,11 +1541,11 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
 
                 if (mOrientation == HORIZONTAL)
                 {
-                        cur_x += llround(new_width * (*panel_it)->mVisibleAmt) + mPanelSpacing;
+                        cur_x += llround(new_width * (*panel_it)->getCollapseFactor()) + mPanelSpacing;
                 }
                 else //VERTICAL
                 {
-                        cur_y -= llround(new_height * (*panel_it)->mVisibleAmt) + mPanelSpacing;
+                        cur_y -= llround(new_height * (*panel_it)->getCollapseFactor()) + mPanelSpacing;
                 }
         }
 
diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h
index 46022e5..756d02e 100644
--- a/linden/indra/llui/llpanel.h
+++ b/linden/indra/llui/llpanel.h
@@ -18,7 +18,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -49,23 +50,13 @@ const BOOL BORDER_YES = TRUE;
 const BOOL BORDER_NO = FALSE;
 
 
-struct LLAlertInfo
-{
-        std::string mLabel;
-        LLStringUtil::format_map_t mArgs;
-
-        LLAlertInfo(std::string label, LLStringUtil::format_map_t args) : mLabel(label), mArgs(args) { }
-        LLAlertInfo(){}
-};
-
-
 /*
  * General purpose concrete view base class.
  * Transparent or opaque,
  * With or without border,
  * Can contain LLUICtrls.
  */
-class LLPanel : public LLUICtrl 
+class LLPanel : public LLUICtrl, public boost::signals::trackable
 {
 public:
 
@@ -205,7 +196,7 @@ public:
         // LLTabContainer
         void childShowTab(const std::string& id, const std::string& tabname, bool visible = true);
         LLPanel *childGetVisibleTab(const std::string& id) const;
-        void childSetTabChangeCallback(const std::string& id, const std::string& tabname, void (*on_tab_clicked)(void*, bool), void *userdata);
+        void childSetTabChangeCallback(const std::string& id, const std::string& tabname, void (*on_tab_clicked)(void*, bool), void *userdata, void (*on_precommit)(void*,bool) = NULL);
 
         // LLTextBox
         void childSetWrappedText(const std::string& id, const std::string& text, bool visible = true);
@@ -220,15 +211,13 @@ public:
 
         // LLButton
         void childSetAction(const std::string& id, void(*function)(void*), void* value);
-        void childSetActionTextbox(const std::string& id, void(*function)(void*));
+        void childSetActionTextbox(const std::string& id, void(*function)(void*), void* value = NULL);
         void childSetControlName(const std::string& id, const std::string& control_name);
 
         // Error reporting
         void childNotFound(const std::string& id) const;
         void childDisplayNotFound();
 
-        static void             alertXml(const std::string& label, LLStringUtil::format_map_t args = LLStringUtil::format_map_t());
-        static BOOL             nextAlert(LLAlertInfo &alert);
         static LLView*  fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
         
 protected:
@@ -266,8 +255,6 @@ private:
 
         std::string             mRequirementsError;
 
-        typedef std::queue<LLAlertInfo> alert_queue_t;
-        static alert_queue_t sAlertQueue;
 }; // end class LLPanel
 
 
@@ -292,8 +279,16 @@ public:
         S32 getMinWidth() const { return mMinWidth; }
         S32 getMinHeight() const { return mMinHeight; }
         
-        void addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, S32 index = S32_MAX);
+        typedef enum e_animate
+        {
+                NO_ANIMATE,
+                ANIMATE
+        } EAnimate;
+
+        void addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, EAnimate animate = NO_ANIMATE, S32 index = S32_MAX);
         void removePanel(LLPanel* panel);
+        void collapsePanel(LLPanel* panel, BOOL collapsed = TRUE);
+        S32 getNumPanels() { return mPanels.size(); }
 
 private:
         struct LLEmbeddedPanel;
diff --git a/linden/indra/llui/llprogressbar.cpp b/linden/indra/llui/llprogressbar.cpp
new file mode 100644
index 0000000..8833494
--- /dev/null
+++ b/linden/indra/llui/llprogressbar.cpp
@@ -0,0 +1,181 @@
+/** 
+ * @file llprogressbar.cpp
+ * @brief LLProgressBar class implementation
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llprogressbar.h"
+
+#include "indra_constants.h"
+#include "llmath.h"
+#include "llgl.h"
+#include "llui.h"
+#include "llfontgl.h"
+#include "llimagegl.h"
+#include "lltimer.h"
+#include "llglheaders.h"
+
+#include "llfocusmgr.h"
+
+static LLRegisterWidget<LLProgressBar> r("progress_bar");
+
+LLProgressBar::LLProgressBar(const std::string& name, const LLRect &rect) 
+        : LLView(name, rect, FALSE),
+          mImageBar( NULL ),
+          mImageShadow( NULL )
+{
+        mPercentDone = 0.f;
+
+        // Defaults:
+
+        setImageBar("rounded_square.tga");      
+        setImageShadow("rounded_square_soft.tga");
+
+        mColorBackground = LLColor4(0.3254f, 0.4000f, 0.5058f, 1.0f);
+        mColorBar        = LLColor4(0.5764f, 0.6627f, 0.8352f, 1.0f);
+        mColorBar2       = LLColor4(0.5764f, 0.6627f, 0.8352f, 1.0f);
+        mColorShadow     = LLColor4(0.2000f, 0.2000f, 0.4000f, 1.0f);
+}
+
+LLProgressBar::~LLProgressBar()
+{
+        gFocusMgr.releaseFocusIfNeeded( this );
+}
+
+void LLProgressBar::draw()
+{
+        static LLTimer timer;
+
+        LLUIImagePtr shadow_imagep = LLUI::getUIImage("rounded_square_soft.tga");
+        LLUIImagePtr bar_fg_imagep = LLUI::getUIImage("progressbar_fill.tga");
+        LLUIImagePtr bar_bg_imagep = LLUI::getUIImage("progressbar_track.tga");
+        LLUIImagePtr bar_imagep = LLUI::getUIImage("rounded_square.tga");
+        LLColor4 background_color = LLUI::sColorsGroup->getColor("LoginProgressBarBgColor");
+        
+        bar_bg_imagep->draw(getLocalRect(),
+                background_color);
+
+        F32 alpha = 0.5f + 0.5f*0.5f*(1.f + (F32)sin(3.f*timer.getElapsedTimeF32()));
+        LLColor4 bar_color = LLUI::sColorsGroup->getColor("LoginProgressBarFgColor");
+        bar_color.mV[3] = alpha;
+        LLRect progress_rect = getLocalRect();
+        progress_rect.mRight = llround(getRect().getWidth() * (mPercentDone / 100.f));
+        bar_fg_imagep->draw(progress_rect);
+}
+
+void LLProgressBar::setPercent(const F32 percent)
+{
+        mPercentDone = llclamp(percent, 0.f, 100.f);
+}
+
+void LLProgressBar::setImageBar( const std::string &bar_name )
+{
+        mImageBar = LLUI::sImageProvider->getUIImage(bar_name)->getImage();
+}
+
+void LLProgressBar::setImageShadow(const std::string &shadow_name)
+{
+        mImageShadow = LLUI::sImageProvider->getUIImage(shadow_name)->getImage();
+}
+
+void LLProgressBar::setColorBar(const LLColor4 &c)
+{
+        mColorBar = c;
+}
+void LLProgressBar::setColorBar2(const LLColor4 &c)
+{
+        mColorBar2 = c;
+}
+void LLProgressBar::setColorShadow(const LLColor4 &c)
+{
+        mColorShadow = c;
+}
+void LLProgressBar::setColorBackground(const LLColor4 &c)
+{
+        mColorBackground = c;
+}
+
+
+// static
+LLView* LLProgressBar::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
+{
+        std::string name("progress_bar");
+        node->getAttributeString("name", name);
+
+        LLProgressBar *progress = new LLProgressBar(name, LLRect());
+
+
+        std::string image_bar;
+        if (node->hasAttribute("image_bar")) node->getAttributeString("image_bar",image_bar);
+        if (image_bar != LLStringUtil::null) progress->setImageBar(image_bar);
+
+
+        std::string image_shadow;
+        if (node->hasAttribute("image_shadow")) node->getAttributeString("image_shadow",image_shadow);
+        if (image_shadow != LLStringUtil::null) progress->setImageShadow(image_shadow);
+
+
+        LLColor4 color_bar;
+        if (node->hasAttribute("color_bar"))
+        {
+                node->getAttributeColor4("color_bar",color_bar);
+                progress->setColorBar(color_bar);
+        }
+
+
+        LLColor4 color_bar2;
+        if (node->hasAttribute("color_bar2"))
+        {
+                node->getAttributeColor4("color_bar2",color_bar2);
+                progress->setColorBar2(color_bar2);
+        }
+
+
+        LLColor4 color_shadow;
+        if (node->hasAttribute("color_shadow"))
+        {
+                node->getAttributeColor4("color_shadow",color_shadow);
+                progress->setColorShadow(color_shadow);
+        }
+
+
+        LLColor4 color_bg;
+        if (node->hasAttribute("color_bg"))
+        {
+                node->getAttributeColor4("color_bg",color_bg);
+                progress->setColorBackground(color_bg);
+        }
+
+        
+        progress->initFromXML(node, parent);
+        
+        return progress;
+}
diff --git a/linden/indra/llui/llprogressbar.h b/linden/indra/llui/llprogressbar.h
new file mode 100644
index 0000000..00ad61d
--- /dev/null
+++ b/linden/indra/llui/llprogressbar.h
@@ -0,0 +1,76 @@
+/** 
+ * @file llprogressbar.h
+ * @brief LLProgressBar class definition
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLPROGRESSBAR_H
+#define LL_LLPROGRESSBAR_H
+
+#include "llview.h"
+#include "llframetimer.h"
+
+class LLProgressBar
+        : public LLView
+{
+public:
+        LLProgressBar(const std::string& name, const LLRect &rect);
+        virtual ~LLProgressBar();
+
+        void setPercent(const F32 percent);
+
+        void setImageBar(const std::string &bar_name);
+        void setImageShadow(const std::string &shadow_name);
+
+        void setColorBar(const LLColor4 &c);
+        void setColorBar2(const LLColor4 &c);
+        void setColorShadow(const LLColor4 &c);
+        void setColorBackground(const LLColor4 &c);
+
+        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+
+        /*virtual*/ void draw();
+
+protected:
+        F32 mPercentDone;
+
+        LLPointer<LLImageGL>  mImageBar;
+        //LLUUID                mImageBarID;
+        //LLString              mImageBarName;
+        LLColor4              mColorBar;
+        LLColor4              mColorBar2;
+
+        LLPointer<LLImageGL>  mImageShadow;
+        //LLUUID                mImageShadowID;
+        //LLString              mImageShadowName;
+        LLColor4              mColorShadow;
+        LLColor4              mColorBackground;
+};
+
+#endif // LL_LLPROGRESSBAR_H
diff --git a/linden/indra/llui/llradiogroup.cpp b/linden/indra/llui/llradiogroup.cpp
index f6778f3..33b9398 100644
--- a/linden/indra/llui/llradiogroup.cpp
+++ b/linden/indra/llui/llradiogroup.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llradiogroup.h b/linden/indra/llui/llradiogroup.h
index 06729bc..3410b74 100644
--- a/linden/indra/llui/llradiogroup.h
+++ b/linden/indra/llui/llradiogroup.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llresizebar.cpp b/linden/indra/llui/llresizebar.cpp
index 0ba02fa..5b9fe72 100644
--- a/linden/indra/llui/llresizebar.cpp
+++ b/linden/indra/llui/llresizebar.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llresizebar.h b/linden/indra/llui/llresizebar.h
index b8494b0..b9fc405 100644
--- a/linden/indra/llui/llresizebar.h
+++ b/linden/indra/llui/llresizebar.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llresizehandle.cpp b/linden/indra/llui/llresizehandle.cpp
index 3202ffe..c5d57d8 100644
--- a/linden/indra/llui/llresizehandle.cpp
+++ b/linden/indra/llui/llresizehandle.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llresizehandle.h b/linden/indra/llui/llresizehandle.h
index 32d382a..0e23d52 100644
--- a/linden/indra/llui/llresizehandle.h
+++ b/linden/indra/llui/llresizehandle.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llresmgr.cpp b/linden/indra/llui/llresmgr.cpp
index d111bd6..32d3d1f 100644
--- a/linden/indra/llui/llresmgr.cpp
+++ b/linden/indra/llui/llresmgr.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -54,11 +55,11 @@ LLResMgr::LLResMgr()
         {
                 mUSAFonts[i] = NULL;
         }
-        mUSAFonts[ LLFONT_OCRA ]                        = LLFontGL::sMonospace;
-        mUSAFonts[ LLFONT_SANSSERIF ]           = LLFontGL::sSansSerif;
-        mUSAFonts[ LLFONT_SANSSERIF_SMALL ]     = LLFontGL::sSansSerifSmall;
-        mUSAFonts[ LLFONT_SANSSERIF_BIG ]       = LLFontGL::sSansSerifBig;
-        mUSAFonts[ LLFONT_SMALL ]                       = LLFontGL::sMonospace;
+        mUSAFonts[ LLFONT_OCRA ]                        = LLFontGL::getFontMonospace();
+        mUSAFonts[ LLFONT_SANSSERIF ]           = LLFontGL::getFontSansSerif();
+        mUSAFonts[ LLFONT_SANSSERIF_SMALL ]     = LLFontGL::getFontSansSerifSmall();
+        mUSAFonts[ LLFONT_SANSSERIF_BIG ]       = LLFontGL::getFontSansSerifBig();
+        mUSAFonts[ LLFONT_SMALL ]                       = LLFontGL::getFontMonospace();
 /*
         // USA Strings
         for( i=0; i<LLSTR_COUNT; i++ )
diff --git a/linden/indra/llui/llresmgr.h b/linden/indra/llui/llresmgr.h
index 86bb6dd..d54505c 100644
--- a/linden/indra/llui/llresmgr.h
+++ b/linden/indra/llui/llresmgr.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llrootview.cpp b/linden/indra/llui/llrootview.cpp
index de1f90b..e4f178b 100644
--- a/linden/indra/llui/llrootview.cpp
+++ b/linden/indra/llui/llrootview.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llrootview.h b/linden/indra/llui/llrootview.h
index 4aa4467..33ebf8d 100644
--- a/linden/indra/llui/llrootview.h
+++ b/linden/indra/llui/llrootview.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llscrollbar.cpp b/linden/indra/llui/llscrollbar.cpp
index 1b87c69..65086d8 100644
--- a/linden/indra/llui/llscrollbar.cpp
+++ b/linden/indra/llui/llscrollbar.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -113,7 +114,7 @@ LLScrollbar::LLScrollbar(
 
         LLButton* line_up_btn = new LLButton(std::string("Line Up"), line_up_rect,
                                                                                  line_up_img, line_up_selected_img, LLStringUtil::null,
-                                                                                 &LLScrollbar::onLineUpBtnPressed, this, LLFontGL::sSansSerif );
+                                                                                 &LLScrollbar::onLineUpBtnPressed, this, LLFontGL::getFontSansSerif() );
         if( LLScrollbar::VERTICAL == mOrientation )
         {
                 line_up_btn->setFollowsRight();
@@ -127,15 +128,18 @@ LLScrollbar::LLScrollbar(
         }
         line_up_btn->setHeldDownCallback( &LLScrollbar::onLineUpBtnPressed );
         line_up_btn->setTabStop(FALSE);
+        line_up_btn->setScaleImage(TRUE);
+
         addChild(line_up_btn);
 
         LLButton* line_down_btn = new LLButton(std::string("Line Down"), line_down_rect,
                                                                                    line_down_img, line_down_selected_img, LLStringUtil::null,
-                                                                                   &LLScrollbar::onLineDownBtnPressed, this, LLFontGL::sSansSerif );
+                                                                                   &LLScrollbar::onLineDownBtnPressed, this, LLFontGL::getFontSansSerif() );
         line_down_btn->setFollowsRight();
         line_down_btn->setFollowsBottom();
         line_down_btn->setHeldDownCallback( &LLScrollbar::onLineDownBtnPressed );
         line_down_btn->setTabStop(FALSE);
+        line_down_btn->setScaleImage(TRUE);
         addChild(line_down_btn);
 }
 
@@ -148,20 +152,29 @@ LLScrollbar::~LLScrollbar()
 void LLScrollbar::setDocParams( S32 size, S32 pos )
 {
         mDocSize = size;
-        mDocPos = llclamp( pos, 0, getDocPosMax() );
+        setDocPos(pos);
         mDocChanged = TRUE;
 
         updateThumbRect();
 }
 
-void LLScrollbar::setDocPos(S32 pos)
+void LLScrollbar::setDocPos(S32 pos, BOOL update_thumb)
 {
+        pos = llclamp(pos, 0, getDocPosMax());
         if (pos != mDocPos)
         {
-                mDocPos = llclamp( pos, 0, getDocPosMax() );
+                mDocPos = pos;
                 mDocChanged = TRUE;
 
-                updateThumbRect();
+                if( mChangeCallback )
+                {
+                        mChangeCallback( mDocPos, this, mCallbackUserData );
+                }
+
+                if( update_thumb )
+                {
+                        updateThumbRect();
+                }
         }
 }
 
@@ -170,7 +183,7 @@ void LLScrollbar::setDocSize(S32 size)
         if (size != mDocSize)
         {
                 mDocSize = size;
-                mDocPos = llclamp( mDocPos, 0, getDocPosMax() );
+                setDocPos(mDocPos);
                 mDocChanged = TRUE;
 
                 updateThumbRect();
@@ -182,7 +195,7 @@ void LLScrollbar::setPageSize( S32 page_size )
         if (page_size != mPageSize)
         {
                 mPageSize = page_size;
-                mDocPos = llclamp( mDocPos, 0, getDocPosMax() );
+                setDocPos(mDocPos);
                 mDocChanged = TRUE;
 
                 updateThumbRect();
@@ -208,9 +221,9 @@ void LLScrollbar::updateThumbRect()
         const S32 THUMB_MIN_LENGTH = 16;
 
         S32 window_length = (mOrientation == LLScrollbar::HORIZONTAL) ? getRect().getWidth() : getRect().getHeight();
-        S32 thumb_bg_length = window_length - 2 * SCROLLBAR_SIZE;
+        S32 thumb_bg_length = llmax(0, window_length - 2 * SCROLLBAR_SIZE);
         S32 visible_lines = llmin( mDocSize, mPageSize );
-        S32 thumb_length = mDocSize ? llmax( visible_lines * thumb_bg_length / mDocSize, THUMB_MIN_LENGTH ) : thumb_bg_length;
+        S32 thumb_length = mDocSize ? llmin(llmax( visible_lines * thumb_bg_length / mDocSize, THUMB_MIN_LENGTH), thumb_bg_length) : thumb_bg_length;
 
         S32 variable_lines = mDocSize - visible_lines;
 
@@ -218,7 +231,7 @@ void LLScrollbar::updateThumbRect()
         { 
                 S32 thumb_start_max = thumb_bg_length + SCROLLBAR_SIZE;
                 S32 thumb_start_min = SCROLLBAR_SIZE + THUMB_MIN_LENGTH;
-                S32 thumb_start = variable_lines ? llclamp( thumb_start_max - (mDocPos * (thumb_bg_length - thumb_length)) / variable_lines, thumb_start_min, thumb_start_max ) : thumb_start_max;
+                S32 thumb_start = variable_lines ? llmin( llmax(thumb_start_max - (mDocPos * (thumb_bg_length - thumb_length)) / variable_lines, thumb_start_min), thumb_start_max ) : thumb_start_max;
 
                 mThumbRect.mLeft =  0;
                 mThumbRect.mTop = thumb_start;
@@ -230,7 +243,7 @@ void LLScrollbar::updateThumbRect()
                 // Horizontal
                 S32 thumb_start_max = thumb_bg_length + SCROLLBAR_SIZE - thumb_length;
                 S32 thumb_start_min = SCROLLBAR_SIZE;
-                S32 thumb_start = variable_lines ? llclamp( thumb_start_min + (mDocPos * (thumb_bg_length - thumb_length)) / variable_lines, thumb_start_min, thumb_start_max ) : thumb_start_min;
+                S32 thumb_start = variable_lines ? llmin(llmax( thumb_start_min + (mDocPos * (thumb_bg_length - thumb_length)) / variable_lines, thumb_start_min), thumb_start_max ) : thumb_start_min;
         
                 mThumbRect.mLeft = thumb_start;
                 mThumbRect.mTop = SCROLLBAR_SIZE;
@@ -446,7 +459,7 @@ BOOL LLScrollbar::handleMouseUp(S32 x, S32 y, MASK mask)
         }
         else
         {
-                // Opaque, so don't just check children
+                // Opaque, so don't just check children 
                 handled = LLView::handleMouseUp( x, y, mask );
         }
 
@@ -455,21 +468,34 @@ BOOL LLScrollbar::handleMouseUp(S32 x, S32 y, MASK mask)
 
 void LLScrollbar::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
+        if (width == getRect().getWidth() && height == getRect().getHeight()) return;
         LLView::reshape( width, height, called_from_parent );
+        LLButton* up_button = getChild<LLButton>("Line Up");
+        LLButton* down_button = getChild<LLButton>("Line Down");
+
+        if (mOrientation == VERTICAL)
+        {
+                up_button->reshape(up_button->getRect().getWidth(), llmin(getRect().getHeight() / 2, SCROLLBAR_SIZE));
+                down_button->reshape(down_button->getRect().getWidth(), llmin(getRect().getHeight() / 2, SCROLLBAR_SIZE));
+                up_button->setOrigin(up_button->getRect().mLeft, getRect().getHeight() - up_button->getRect().getHeight());
+        }
+        else
+        {
+                up_button->reshape(llmin(getRect().getWidth() / 2, SCROLLBAR_SIZE), up_button->getRect().getHeight());
+                down_button->reshape(llmin(getRect().getWidth() / 2, SCROLLBAR_SIZE), down_button->getRect().getHeight());
+                down_button->setOrigin(getRect().getWidth() - down_button->getRect().getWidth(), down_button->getRect().mBottom);
+        }
         updateThumbRect();
 }
 
 
 void LLScrollbar::draw()
 {
+        if (!getRect().isValid()) return;
+
         S32 local_mouse_x;
         S32 local_mouse_y;
-        LLCoordWindow cursor_pos_window;
-        getWindow()->getCursorPosition(&cursor_pos_window);
-        LLCoordGL cursor_pos_gl;
-        getWindow()->convertCoords(cursor_pos_window, &cursor_pos_gl);
-
-        screenPointToLocal(cursor_pos_gl.mX, cursor_pos_gl.mY, &local_mouse_x, &local_mouse_y);
+        LLUI::getCursorPositionLocal(this, &local_mouse_x, &local_mouse_y);
         BOOL other_captor = gFocusMgr.getMouseCapture() && gFocusMgr.getMouseCapture() != this;
         BOOL hovered = getEnabled() && !other_captor && (hasMouseCapture() || mThumbRect.pointInRect(local_mouse_x, local_mouse_y));
         if (hovered)
@@ -536,21 +562,7 @@ void LLScrollbar::draw()
 
 void LLScrollbar::changeLine( S32 delta, BOOL update_thumb )
 {
-        S32 new_pos = llclamp( mDocPos + delta, 0, getDocPosMax() );
-        if( new_pos != mDocPos )
-        {
-                mDocPos = new_pos;
-        }
-
-        if( mChangeCallback )
-        {
-                mChangeCallback( mDocPos, this, mCallbackUserData );
-        }
-
-        if( update_thumb )
-        {
-                updateThumbRect();
-        }
+        setDocPos(mDocPos + delta, update_thumb);
 }
 
 void LLScrollbar::setValue(const LLSD& value) 
@@ -566,22 +578,22 @@ BOOL LLScrollbar::handleKeyHere(KEY key, MASK mask)
         switch( key )
         {
         case KEY_HOME:
-                changeLine( -mDocPos, TRUE );
+                setDocPos( 0 );
                 handled = TRUE;
                 break;
         
         case KEY_END:
-                changeLine( getDocPosMax() - mDocPos, TRUE );
+                setDocPos( getDocPosMax() );
                 handled = TRUE;
                 break;
         
         case KEY_DOWN:
-                changeLine( mStepSize, TRUE );
+                setDocPos( getDocPos() + mStepSize );
                 handled = TRUE;
                 break;
         
         case KEY_UP:
-                changeLine( - mStepSize, TRUE );
+                setDocPos( getDocPos() - mStepSize );
                 handled = TRUE;
                 break;
 
diff --git a/linden/indra/llui/llscrollbar.h b/linden/indra/llui/llscrollbar.h
index 0703263..0bbf866 100644
--- a/linden/indra/llui/llscrollbar.h
+++ b/linden/indra/llui/llscrollbar.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -81,7 +82,7 @@ public:
 
         // How many "lines" the "document" has scrolled.
         // 0 <= DocPos <= DocSize - DocVisibile
-        void                            setDocPos( S32 pos );
+        void                            setDocPos( S32 pos, BOOL update_thumb = TRUE );
         S32                                     getDocPos() const               { return mDocPos; }
 
         BOOL                            isAtBeginning();
diff --git a/linden/indra/llui/llscrollcontainer.cpp b/linden/indra/llui/llscrollcontainer.cpp
index f7c4200..cf03259 100644
--- a/linden/indra/llui/llscrollcontainer.cpp
+++ b/linden/indra/llui/llscrollcontainer.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llscrollcontainer.h b/linden/indra/llui/llscrollcontainer.h
index 80e67d2..70fc908 100644
--- a/linden/indra/llui/llscrollcontainer.h
+++ b/linden/indra/llui/llscrollcontainer.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llscrollingpanellist.cpp b/linden/indra/llui/llscrollingpanellist.cpp
index 0cd501c..05d0c6f 100644
--- a/linden/indra/llui/llscrollingpanellist.cpp
+++ b/linden/indra/llui/llscrollingpanellist.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llscrollingpanellist.h b/linden/indra/llui/llscrollingpanellist.h
index c96f12c..b9d7309 100644
--- a/linden/indra/llui/llscrollingpanellist.h
+++ b/linden/indra/llui/llscrollingpanellist.h
@@ -16,7 +16,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 7dba55f..7b6c125 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -378,6 +379,22 @@ void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_col
                                                 TRUE);
 }
 
+LLScrollListDate::LLScrollListDate( const LLDate& date, const LLFontGL* font, S32 width, U8 font_style, LLFontGL::HAlign font_alignment, LLColor4& color, BOOL use_color, BOOL visible)
+:       LLScrollListText(date.asRFC1123(), font, width, font_style, font_alignment, color, use_color, visible),
+        mDate(date)
+{
+}
+
+void LLScrollListDate::setValue(const LLSD& value)
+{
+        mDate = value.asDate();
+        LLScrollListText::setValue(mDate.asRFC1123());
+}
+
+const LLSD LLScrollListDate::getValue() const
+{
+        return mDate;
+}
 
 LLScrollListItem::~LLScrollListItem()
 {
@@ -578,6 +595,7 @@ LLScrollListCtrl::LLScrollListCtrl(const std::string& name, const LLRect& rect,
         mSearchColumn(0),
         mNumDynamicWidthColumns(0),
         mTotalStaticColumnWidth(0),
+        mTotalColumnPadding(0),
         mSorted(TRUE),
         mDirty(FALSE),
         mOriginalSelection(-1),
@@ -627,6 +645,28 @@ LLScrollListCtrl::LLScrollListCtrl(const std::string& name, const LLRect& rect,
         mLastSelected = NULL;
 }
 
+S32 LLScrollListCtrl::getSearchColumn()
+{
+        // search for proper search column
+        if (mSearchColumn < 0)
+        {
+                LLScrollListItem* itemp = getFirstData();
+                if (itemp)
+                {
+                        for(S32 column = 0; column < getNumColumns(); column++)
+                        {
+                                LLScrollListCell* cell = itemp->getColumn(column);
+                                if (cell && cell->isText())
+                                {
+                                        mSearchColumn = column;
+                                        break;
+                                }
+                        }
+                }
+        }
+        return llclamp(mSearchColumn, 0, getNumColumns());
+}
+
 LLScrollListCtrl::~LLScrollListCtrl()
 {
         std::for_each(mItemList.begin(), mItemList.end(), DeletePointer());
@@ -890,8 +930,8 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL r
 // *TODO: Use bookkeeping to make this an incramental cost with item additions
 void LLScrollListCtrl::calcColumnWidths()
 {
-        const S32 HEADING_TEXT_PADDING = 30;
-        const S32 COLUMN_TEXT_PADDING = 20;
+        const S32 HEADING_TEXT_PADDING = 25;
+        const S32 COLUMN_TEXT_PADDING = 10;
 
         mMaxContentWidth = 0;
 
@@ -904,30 +944,27 @@ void LLScrollListCtrl::calcColumnWidths()
                 if (!column) continue;
 
                 // update column width
-                S32 new_width = column->mWidth;
+                S32 new_width = column->getWidth();
                 if (column->mRelWidth >= 0)
                 {
                         new_width = (S32)llround(column->mRelWidth*mItemListRect.getWidth());
                 }
                 else if (column->mDynamicWidth)
                 {
-                        new_width = (mItemListRect.getWidth() - mTotalStaticColumnWidth) / mNumDynamicWidthColumns;
+                        new_width = (mItemListRect.getWidth() - mTotalStaticColumnWidth - mTotalColumnPadding) / mNumDynamicWidthColumns;
                 }
 
-                if (new_width != column->mWidth)
-                {
-                        column->mWidth = new_width;
-                }
+                column->setWidth(new_width);
 
                 // update max content width for this column, by looking at all items
-                column->mMaxContentWidth = column->mHeader ? LLFontGL::sSansSerifSmall->getWidth(column->mLabel) + mColumnPadding + HEADING_TEXT_PADDING : 0;
+                column->mMaxContentWidth = column->mHeader ? LLFontGL::getFontSansSerifSmall()->getWidth(column->mLabel) + mColumnPadding + HEADING_TEXT_PADDING : 0;
                 item_list::iterator iter;
                 for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
                 {
                         LLScrollListCell* cellp = (*iter)->getColumn(column->mIndex);
                         if (!cellp) continue;
 
-                        column->mMaxContentWidth = llmax(LLFontGL::sSansSerifSmall->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
+                        column->mMaxContentWidth = llmax(LLFontGL::getFontSansSerifSmall()->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
                 }
 
                 max_item_width += column->mMaxContentWidth;
@@ -971,28 +1008,13 @@ void LLScrollListCtrl::updateColumns()
 {
         calcColumnWidths();
 
-        // propagate column widths to individual cells
-        item_list::iterator iter;
-        for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
-        {
-                LLScrollListItem *itemp = *iter;
-                S32 num_cols = itemp->getNumColumns();
-                S32 i = 0;
-                for (LLScrollListCell* cell = itemp->getColumn(i); i < num_cols; cell = itemp->getColumn(++i))
-                {
-                        if (i >= (S32)mColumnsIndexed.size()) break;
-
-                        cell->setWidth(mColumnsIndexed[i]->mWidth);
-                }
-        }
-
         // update column headers
         std::vector<LLScrollListColumn*>::iterator column_ordered_it;
         S32 left = mItemListRect.mLeft;
         LLColumnHeader* last_header = NULL;
         for (column_ordered_it = mColumnsIndexed.begin(); column_ordered_it != mColumnsIndexed.end(); ++column_ordered_it)
         {
-                if ((*column_ordered_it)->mWidth < 0)
+                if ((*column_ordered_it)->getWidth() < 0)
                 {
                         // skip hidden columns
                         continue;
@@ -1001,9 +1023,11 @@ void LLScrollListCtrl::updateColumns()
                 
                 if (column->mHeader)
                 {
+                        column->mHeader->updateResizeBars();
+
                         last_header = column->mHeader;
                         S32 top = mItemListRect.mTop;
-                        S32 right = left + column->mWidth;
+                        S32 right = left + column->getWidth();
 
                         if (column->mIndex != (S32)mColumnsIndexed.size()-1)
                         {
@@ -1021,14 +1045,30 @@ void LLScrollListCtrl::updateColumns()
                 }
         }
 
-        //FIXME: stretch the entire last column if it is resizable (gestures windows shows truncated text in last column)
         // expand last column header we encountered to full list width
-        if (last_header)
+        if (last_header && last_header->canResize())
         {
                 S32 new_width = llmax(0, mItemListRect.mRight - last_header->getRect().mLeft);
                 last_header->reshape(new_width, last_header->getRect().getHeight());
                 last_header->setVisible(mDisplayColumnHeaders && new_width > 0);
+                last_header->getColumn()->setWidth(new_width);
+        }
+
+        // propagate column widths to individual cells
+        item_list::iterator iter;
+        for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
+        {
+                LLScrollListItem *itemp = *iter;
+                S32 num_cols = itemp->getNumColumns();
+                S32 i = 0;
+                for (LLScrollListCell* cell = itemp->getColumn(i); i < num_cols; cell = itemp->getColumn(++i))
+                {
+                        if (i >= (S32)mColumnsIndexed.size()) break;
+
+                        cell->setWidth(mColumnsIndexed[i]->getWidth());
+                }
         }
+
 }
 
 void LLScrollListCtrl::setDisplayHeading(BOOL display)
@@ -1490,7 +1530,7 @@ BOOL LLScrollListCtrl::selectItemByPrefix(const LLWString& target, BOOL case_sen
                 {
                         LLScrollListItem* item = *iter;
                         // Only select enabled items with matching names
-                        LLScrollListCell* cellp = item->getColumn(mSearchColumn);
+                        LLScrollListCell* cellp = item->getColumn(getSearchColumn());
                         BOOL select = cellp ? item->getEnabled() && ('\0' == cellp->getValue().asString()[0]) : FALSE;
                         if (select)
                         {
@@ -1513,7 +1553,7 @@ BOOL LLScrollListCtrl::selectItemByPrefix(const LLWString& target, BOOL case_sen
                         LLScrollListItem* item = *iter;
 
                         // Only select enabled items with matching names
-                        LLScrollListCell* cellp = item->getColumn(mSearchColumn);
+                        LLScrollListCell* cellp = item->getColumn(getSearchColumn());
                         if (!cellp)
                         {
                                 continue;
@@ -1743,6 +1783,8 @@ void LLScrollListCtrl::drawItems()
 
 void LLScrollListCtrl::draw()
 {
+        LLLocalClipRect clip(getLocalRect());
+
         // if user specifies sort, make sure it is maintained
         if (needsSorting() && !isSorted())
         {
@@ -1816,7 +1858,7 @@ BOOL LLScrollListCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sti
                         S32 rect_left = getColumnOffsetFromIndex(column_index) + mItemListRect.mLeft;
                         S32 rect_bottom = getRowOffsetFromIndex(getItemIndex(hit_item));
                         LLRect cell_rect;
-                        cell_rect.setOriginAndSize(rect_left, rect_bottom, rect_left + columnp->mWidth, mLineHeight);
+                        cell_rect.setOriginAndSize(rect_left, rect_bottom, rect_left + columnp->getWidth(), mLineHeight);
                         // Convert rect local to screen coordinates
                         localPointToScreen( 
                                 cell_rect.mLeft, cell_rect.mBottom, 
@@ -2113,7 +2155,7 @@ S32 LLScrollListCtrl::getColumnIndexFromOffset(S32 x)
         ordered_columns_t::const_iterator end = mColumnsIndexed.end();
         for ( ; iter != end; ++iter)
         {
-                width = (*iter)->mWidth + mColumnPadding;
+                width = (*iter)->getWidth() + mColumnPadding;
                 right += width;
                 if (left <= x && x < right )
                 {
@@ -2140,7 +2182,7 @@ S32 LLScrollListCtrl::getColumnOffsetFromIndex(S32 index)
                 {
                         return column_offset;
                 }
-                column_offset += (*iter)->mWidth + mColumnPadding;
+                column_offset += (*iter)->getWidth() + mColumnPadding;
         }
 
         // when running off the end, return the rightmost pixel
@@ -2292,7 +2334,7 @@ BOOL LLScrollListCtrl::handleKeyHere(KEY key,MASK mask )
                                 {
                                         if (getFirstSelected())
                                         {
-                                                LLScrollListCell* cellp = getFirstSelected()->getColumn(mSearchColumn);
+                                                LLScrollListCell* cellp = getFirstSelected()->getColumn(getSearchColumn());
                                                 if (cellp)
                                                 {
                                                         cellp->highlightText(0, 0);
@@ -2379,7 +2421,7 @@ BOOL LLScrollListCtrl::handleUnicodeCharHere(llwchar uni_char)
                 {
                         LLScrollListItem* item = *iter;
 
-                        LLScrollListCell* cellp = item->getColumn(mSearchColumn);
+                        LLScrollListCell* cellp = item->getColumn(getSearchColumn());
                         if (cellp)
                         {
                                 // Only select enabled items with matching first characters
@@ -2446,7 +2488,7 @@ void LLScrollListCtrl::selectItem(LLScrollListItem* itemp, BOOL select_single_it
         {
                 if (mLastSelected)
                 {
-                        LLScrollListCell* cellp = mLastSelected->getColumn(mSearchColumn);
+                        LLScrollListCell* cellp = mLastSelected->getColumn(getSearchColumn());
                         if (cellp)
                         {
                                 cellp->highlightText(0, 0);
@@ -2474,7 +2516,7 @@ void LLScrollListCtrl::deselectItem(LLScrollListItem* itemp)
                 }
 
                 itemp->setSelected(FALSE);
-                LLScrollListCell* cellp = itemp->getColumn(mSearchColumn);
+                LLScrollListCell* cellp = itemp->getColumn(getSearchColumn());
                 if (cellp)
                 {
                         cellp->highlightText(0, 0);     
@@ -2501,9 +2543,14 @@ struct SameSortColumn
         bool operator()(std::pair<S32, BOOL> sort_column) { return sort_column.first == mColumn; }
 };
 
-BOOL LLScrollListCtrl::setSort(S32 column, BOOL ascending)
+BOOL LLScrollListCtrl::setSort(S32 column_idx, BOOL ascending)
 {
-        sort_column_t new_sort_column(column, ascending);
+        LLScrollListColumn* sort_column = getColumn(column_idx);
+        if (!sort_column) return FALSE;
+
+        sort_column->mSortAscending = ascending;
+
+        sort_column_t new_sort_column(column_idx, ascending);
 
         if (mSortColumns.empty())
         {
@@ -2517,7 +2564,7 @@ BOOL LLScrollListCtrl::setSort(S32 column, BOOL ascending)
                 
                 // remove any existing sort criterion referencing this column
                 // and add the new one
-                mSortColumns.erase(remove_if(mSortColumns.begin(), mSortColumns.end(), SameSortColumn(column)), mSortColumns.end()); 
+                mSortColumns.erase(remove_if(mSortColumns.begin(), mSortColumns.end(), SameSortColumn(column_idx)), mSortColumns.end()); 
                 mSortColumns.push_back(new_sort_column);
 
                 // did the sort criteria change?
@@ -2643,6 +2690,12 @@ void LLScrollListCtrl::scrollToShowSelected()
         }
 }
 
+void LLScrollListCtrl::updateStaticColumnWidth(LLScrollListColumn* col, S32 new_width)
+{
+        mTotalStaticColumnWidth += llmax(0, new_width) - llmax(0, col->getWidth());
+}
+
+
 // virtual
 LLXMLNodePtr LLScrollListCtrl::getXML(bool save_children) const
 {
@@ -2689,7 +2742,7 @@ LLXMLNodePtr LLScrollListCtrl::getXML(bool save_children) const
 
                 child_node->createChild("name", TRUE)->setStringValue(column->mName);
                 child_node->createChild("label", TRUE)->setStringValue(column->mLabel);
-                child_node->createChild("width", TRUE)->setIntValue(column->mWidth);
+                child_node->createChild("width", TRUE)->setIntValue(column->getWidth());
         }
 
         return node;
@@ -2813,15 +2866,9 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 
         scroll_list->setSearchColumn(search_column);
 
-        if (sort_column >= 0)
-        {
-                scroll_list->sortByColumnIndex(sort_column, sort_ascending);
-        }
-
         LLSD columns;
         S32 index = 0;
         LLXMLNodePtr child;
-        S32 total_static = 0;
         for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
         {
                 if (child->hasName("column"))
@@ -2850,8 +2897,6 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
                         std::string tooltip;
                         child->getAttributeString("tool_tip", tooltip);
 
-                        if(!columndynamicwidth) total_static += llmax(0, columnwidth);
-
                         F32 columnrelwidth = 0.f;
                         child->getAttributeF32("relwidth", columnrelwidth);
 
@@ -2872,9 +2917,13 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
                         index++;
                 }
         }
-        scroll_list->setTotalStaticColumnWidth(total_static);
         scroll_list->setColumnHeadings(columns);
 
+        if (sort_column >= 0)
+        {
+                scroll_list->sortByColumnIndex(sort_column, sort_ascending);
+        }
+
         for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
         {
                 if (child->hasName("row"))
@@ -3019,22 +3068,26 @@ void LLScrollListCtrl::addColumn(const LLSD& column, EAddPosition pos)
         if (mColumns.find(name) == mColumns.end())
         {
                 // Add column
-                mColumns[name] = LLScrollListColumn(column);
+                mColumns[name] = LLScrollListColumn(column, this);
                 LLScrollListColumn* new_column = &mColumns[name];
                 new_column->mParentCtrl = this;
                 new_column->mIndex = mColumns.size()-1;
 
                 // Add button
-                if (new_column->mWidth > 0 || new_column->mRelWidth > 0 || new_column->mDynamicWidth)
+                if (new_column->getWidth() > 0 || new_column->mRelWidth > 0 || new_column->mDynamicWidth)
                 {
+                        if (getNumColumns() > 0)
+                        {
+                                mTotalColumnPadding += mColumnPadding;
+                        }
                         if (new_column->mRelWidth >= 0)
                         {
-                                new_column->mWidth = (S32)llround(new_column->mRelWidth*mItemListRect.getWidth());
+                                new_column->setWidth((S32)llround(new_column->mRelWidth*mItemListRect.getWidth()));
                         }
                         else if(new_column->mDynamicWidth)
                         {
                                 mNumDynamicWidthColumns++;
-                                new_column->mWidth = (mItemListRect.getWidth() - mTotalStaticColumnWidth) / mNumDynamicWidthColumns;
+                                new_column->setWidth((mItemListRect.getWidth() - mTotalStaticColumnWidth - mTotalColumnPadding) / mNumDynamicWidthColumns);
                         }
                         S32 top = mItemListRect.mTop;
                         S32 left = mItemListRect.mLeft;
@@ -3043,14 +3096,14 @@ void LLScrollListCtrl::addColumn(const LLSD& column, EAddPosition pos)
                                 for (itor = mColumns.begin(); itor != mColumns.end(); ++itor)
                                 {
                                         if (itor->second.mIndex < new_column->mIndex &&
-                                                itor->second.mWidth > 0)
+                                                itor->second.getWidth() > 0)
                                         {
-                                                left += itor->second.mWidth + mColumnPadding;
+                                                left += itor->second.getWidth() + mColumnPadding;
                                         }
                                 }
                         }
                         std::string button_name = "btn_" + name;
-                        S32 right = left+new_column->mWidth;
+                        S32 right = left+new_column->getWidth();
                         if (new_column->mIndex != (S32)mColumns.size()-1)
                         {
                                 right += mColumnPadding;
@@ -3145,6 +3198,8 @@ void LLScrollListCtrl::clearColumns()
         }
         mColumns.clear();
         mSortColumns.clear();
+        mTotalStaticColumnWidth = 0;
+        mTotalColumnPadding = 0;
 }
 
 void LLScrollListCtrl::setColumnLabel(const std::string& column, const std::string& label)
@@ -3244,7 +3299,7 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                 }
 
                 S32 index = columnp->mIndex;
-                S32 width = columnp->mWidth;
+                S32 width = columnp->getWidth();
                 LLFontGL::HAlign font_alignment = columnp->mFontAlignment;
                 LLColor4 fcolor = LLColor4::black;
                 
@@ -3301,6 +3356,19 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                         }
                         new_item->setColumn(index, cell);
                 }
+                else if (type == "date")
+                {
+                        LLScrollListDate* cell = new LLScrollListDate(value.asDate(), font, width, font_style, font_alignment);
+                        if (has_color)
+                        {
+                                cell->setColor(color);
+                        }
+                        new_item->setColumn(index, cell);
+                        if (columnp->mHeader && !value.asString().empty())
+                        {
+                                columnp->mHeader->setHasResizableElement(TRUE);
+                        }
+                }
                 else
                 {
                         LLScrollListText* cell = new LLScrollListText(value.asString(), font, width, font_style, font_alignment, fcolor, TRUE);
@@ -3325,7 +3393,7 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                 if (new_item->getColumn(column_idx) == NULL)
                 {
                         LLScrollListColumn* column_ptr = &column_it->second;
-                        new_item->setColumn(column_idx, new LLScrollListText(LLStringUtil::null, LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL ), column_ptr->mWidth, LLFontGL::NORMAL));
+                        new_item->setColumn(column_idx, new LLScrollListText(LLStringUtil::null, LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL ), column_ptr->getWidth(), LLFontGL::NORMAL));
                 }
         }
 
@@ -3469,6 +3537,7 @@ LLColumnHeader::LLColumnHeader(const std::string& label, const LLRect &rect, LLS
         mButton->setMouseDownCallback(onMouseDown);
 
         mButton->setCallbackUserData(this);
+        mButton->setToolTip(label);
 
         mAscendingText = std::string("[LOW]...[HIGH](Ascending)"); // *TODO: Translate
         mDescendingText = std::string("[HIGH]...[LOW](Descending)"); // *TODO: Translate
@@ -3556,7 +3625,7 @@ void LLColumnHeader::onClick(void* user_data)
 
         LLScrollListCtrl::onClickColumn(column);
 
-        // propage new sort order to sort order list
+        // propagate new sort order to sort order list
         headerp->mList->selectNthItem(column->mParentCtrl->getSortAscending() ? 0 : 1);
 }
 
@@ -3642,11 +3711,11 @@ void LLColumnHeader::showList()
                         descending_string = mDescendingText.getString();
                 }
 
-                S32 text_width = LLFontGL::sSansSerifSmall->getWidth(ascending_string);
-                text_width = llmax(text_width, LLFontGL::sSansSerifSmall->getWidth(descending_string)) + 10;
+                S32 text_width = LLFontGL::getFontSansSerifSmall()->getWidth(ascending_string);
+                text_width = llmax(text_width, LLFontGL::getFontSansSerifSmall()->getWidth(descending_string)) + 10;
                 text_width = llmax(text_width, getRect().getWidth() - 30);
 
-                mList->getColumn(0)->mWidth = text_width;
+                mList->getColumn(0)->setWidth(text_width);
                 ((LLScrollListText*)mList->getFirstData()->getColumn(0))->setText(ascending_string);
                 ((LLScrollListText*)mList->getLastData()->getColumn(0))->setText(descending_string);
 
@@ -3688,7 +3757,7 @@ LLView*	LLColumnHeader::findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_d
         llassert(snap_edge == SNAP_RIGHT);
 
         // use higher snap threshold for column headers
-        threshold = llmin(threshold, 15);
+        threshold = llmin(threshold, 10);
 
         LLRect snap_rect = getSnapRect();
 
@@ -3727,47 +3796,48 @@ void LLColumnHeader::userSetShape(const LLRect& new_rect)
 
         if (delta_width != 0)
         {
-                S32 remaining_width = delta_width;
+                S32 remaining_width = -delta_width;
                 S32 col;
                 for (col = mColumn->mIndex + 1; col < mColumn->mParentCtrl->getNumColumns(); col++)
                 {
                         LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
-                        if (!columnp) break;
+                        if (!columnp) continue;
 
                         if (columnp->mHeader && columnp->mHeader->canResize())
                         {
                                 // how many pixels in width can this column afford to give up?
-                                S32 resize_buffer_amt = llmax(0, columnp->mWidth - MIN_COLUMN_WIDTH);
+                                S32 resize_buffer_amt = llmax(0, columnp->getWidth() - MIN_COLUMN_WIDTH);
                                 
                                 // user shrinking column, need to add width to other columns
                                 if (delta_width < 0)
                                 {
-                                        if (!columnp->mDynamicWidth && columnp->mWidth > 0)
+                                        if (/*!columnp->mDynamicWidth && */columnp->getWidth() > 0)
                                         {
                                                 // statically sized column, give all remaining width to this column
-                                                columnp->mWidth -= remaining_width;
+                                                columnp->setWidth(columnp->getWidth() + remaining_width);
                                                 if (columnp->mRelWidth > 0.f)
                                                 {
-                                                        columnp->mRelWidth = (F32)columnp->mWidth / (F32)mColumn->mParentCtrl->getItemListRect().getWidth();
+                                                        columnp->mRelWidth = (F32)columnp->getWidth() / (F32)mColumn->mParentCtrl->getItemListRect().getWidth();
                                                 }
+                                                // all padding went to this widget, we're done
+                                                break;
                                         }
-                                        break;
                                 }
                                 else
                                 {
                                         // user growing column, need to take width from other columns
-                                        remaining_width -= resize_buffer_amt;
+                                        remaining_width += resize_buffer_amt;
 
-                                        if (!columnp->mDynamicWidth && columnp->mWidth > 0)
+                                        if (/*!columnp->mDynamicWidth && */columnp->getWidth() > 0)
                                         {
-                                                columnp->mWidth -= llmin(columnp->mWidth - MIN_COLUMN_WIDTH, delta_width);
+                                                columnp->setWidth(columnp->getWidth() - llmin(columnp->getWidth() - MIN_COLUMN_WIDTH, delta_width));
                                                 if (columnp->mRelWidth > 0.f)
                                                 {
-                                                        columnp->mRelWidth = (F32)columnp->mWidth / (F32)mColumn->mParentCtrl->getItemListRect().getWidth();
+                                                        columnp->mRelWidth = (F32)columnp->getWidth() / (F32)mColumn->mParentCtrl->getItemListRect().getWidth();
                                                 }
                                         }
 
-                                        if (remaining_width <= 0)
+                                        if (remaining_width >= 0)
                                         {
                                                 // width sucked up from neighboring columns, done
                                                 break;
@@ -3779,14 +3849,14 @@ void LLColumnHeader::userSetShape(const LLRect& new_rect)
                 // clamp resize amount to maximum that can be absorbed by other columns
                 if (delta_width > 0)
                 {
-                        delta_width -= llmax(remaining_width, 0);
+                        delta_width += llmin(remaining_width, 0);
                 }
 
                 // propagate constrained delta_width to new width for this column
                 new_width = getRect().getWidth() + delta_width - mColumn->mParentCtrl->getColumnPadding();
 
                 // use requested width
-                mColumn->mWidth = new_width;
+                mColumn->setWidth(new_width);
 
                 // update proportional spacing
                 if (mColumn->mRelWidth > 0.f)
@@ -3804,36 +3874,40 @@ void LLColumnHeader::userSetShape(const LLRect& new_rect)
 void LLColumnHeader::setHasResizableElement(BOOL resizable)
 {
         // for now, dynamically spaced columns can't be resized
-        if (mColumn->mDynamicWidth) return;
+//      if (mColumn->mDynamicWidth) return;
 
-        if (resizable != mHasResizableElement)
+        if (mHasResizableElement != resizable)
         {
+                mColumn->mParentCtrl->dirtyColumns();
                 mHasResizableElement = resizable;
+        }
+}
 
-                S32 num_resizable_columns = 0;
-                S32 col;
-                for (col = 0; col < mColumn->mParentCtrl->getNumColumns(); col++)
+void LLColumnHeader::updateResizeBars()
+{
+        S32 num_resizable_columns = 0;
+        S32 col;
+        for (col = 0; col < mColumn->mParentCtrl->getNumColumns(); col++)
+        {
+                LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
+                if (columnp->mHeader && columnp->mHeader->canResize())
                 {
-                        LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
-                        if (columnp->mHeader && columnp->mHeader->canResize())
-                        {
-                                num_resizable_columns++;
-                        }
+                        num_resizable_columns++;
                 }
+        }
 
-                S32 num_resizers_enabled = 0;
+        S32 num_resizers_enabled = 0;
 
-                // now enable/disable resize handles on resizable columns if we have at least two
-                for (col = 0; col < mColumn->mParentCtrl->getNumColumns(); col++)
+        // now enable/disable resize handles on resizable columns if we have at least two
+        for (col = 0; col < mColumn->mParentCtrl->getNumColumns(); col++)
+        {
+                LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
+                if (!columnp->mHeader) continue;
+                BOOL enable = num_resizable_columns >= 2 && num_resizers_enabled < (num_resizable_columns - 1) && columnp->mHeader->canResize();
+                columnp->mHeader->enableResizeBar(enable);
+                if (enable)
                 {
-                        LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
-                        if (!columnp->mHeader) continue;
-                        BOOL enable = num_resizable_columns >= 2 && num_resizers_enabled < (num_resizable_columns - 1) && columnp->mHeader->canResize();
-                        columnp->mHeader->enableResizeBar(enable);
-                        if (enable)
-                        {
-                                num_resizers_enabled++;
-                        }
+                        num_resizers_enabled++;
                 }
         }
 }
@@ -3841,7 +3915,7 @@ void LLColumnHeader::setHasResizableElement(BOOL resizable)
 void LLColumnHeader::enableResizeBar(BOOL enable)
 {
         // for now, dynamically spaced columns can't be resized
-        if (!mColumn->mDynamicWidth)
+        //if (!mColumn->mDynamicWidth)
         {
                 mResizeBar->setEnabled(enable);
         }
@@ -3851,3 +3925,78 @@ BOOL LLColumnHeader::canResize()
 {
         return getVisible() && (mHasResizableElement || mColumn->mDynamicWidth);
 }
+
+void LLScrollListColumn::setWidth(S32 width) 
+{ 
+        if (!mDynamicWidth && mRelWidth <= 0.f) 
+        {
+                mParentCtrl->updateStaticColumnWidth(this, width);
+        }
+        mWidth = width;
+}
+
+// Default constructor
+LLScrollListColumn::LLScrollListColumn() : 
+        mName(), 
+        mSortingColumn(), 
+        mSortAscending(TRUE), 
+        mLabel(), 
+        mWidth(-1), 
+        mRelWidth(-1.0), 
+        mDynamicWidth(FALSE), 
+        mMaxContentWidth(0),
+        mIndex(-1), 
+        mParentCtrl(NULL), 
+        mHeader(NULL), 
+        mFontAlignment(LLFontGL::LEFT)
+{ }
+
+LLScrollListColumn::LLScrollListColumn(const LLSD &sd, LLScrollListCtrl* parent) :
+        mWidth(0),
+        mIndex (-1),
+        mParentCtrl(parent),
+        mHeader(NULL),
+        mMaxContentWidth(0),
+        mDynamicWidth(FALSE),
+        mRelWidth(-1.f)
+{
+        mName = sd.get("name").asString();
+        mSortingColumn = mName;
+        if (sd.has("sort"))
+        {
+                mSortingColumn = sd.get("sort").asString();
+        }
+        mSortAscending = TRUE;
+        if (sd.has("sort_ascending"))
+        {
+                mSortAscending = sd.get("sort_ascending").asBoolean();
+        }
+        mLabel = sd.get("label").asString();
+        if (sd.has("relwidth") && (F32)sd.get("relwidth").asReal() > 0)
+        {
+                mRelWidth = (F32)sd.get("relwidth").asReal();
+                if (mRelWidth < 0) mRelWidth = 0;
+                if (mRelWidth > 1) mRelWidth = 1;
+                mDynamicWidth = FALSE;
+        }
+        else if(sd.has("dynamicwidth") && (BOOL)sd.get("dynamicwidth").asBoolean() == TRUE)
+        {
+                mDynamicWidth = TRUE;
+                mRelWidth = -1;
+        }
+        else
+        {
+
+                setWidth(sd.get("width").asInteger());
+        }
+
+        if (sd.has("halign"))
+        {
+                mFontAlignment = (LLFontGL::HAlign)llclamp(sd.get("halign").asInteger(), (S32)LLFontGL::LEFT, (S32)LLFontGL::HCENTER);
+        }
+        else
+        {
+                mFontAlignment = LLFontGL::LEFT;
+        }
+
+}
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index f276562..72d8894 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -16,7 +16,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -47,6 +48,7 @@
 #include "llcombobox.h"
 #include "llscrollbar.h"
 #include "llresizebar.h"
+#include "lldate.h"
 
 /*
  * Represents a cell in a scrollable table.
@@ -133,6 +135,18 @@ private:
         static U32 sCount;
 };
 
+
+class LLScrollListDate : public LLScrollListText
+{
+public:
+        LLScrollListDate( const LLDate& date, const LLFontGL* font, S32 width=0, U8 font_style = LLFontGL::NORMAL, LLFontGL::HAlign font_alignment = LLFontGL::LEFT, LLColor4& color = LLColor4::black, BOOL use_color = FALSE, BOOL visible = TRUE);
+        virtual void    setValue(const LLSD& value);
+        virtual const LLSD getValue() const;
+
+private:
+        LLDate          mDate;
+};
+
 /*
  * Cell displaying an image.
  */
@@ -185,88 +199,11 @@ private:
 class LLScrollListColumn
 {
 public:
-        // Default constructor
-        LLScrollListColumn() : 
-                mName(), 
-                mSortingColumn(), 
-                mSortAscending(TRUE), 
-                mLabel(), 
-                mWidth(-1), 
-                mRelWidth(-1.0), 
-                mDynamicWidth(FALSE), 
-                mMaxContentWidth(0),
-                mIndex(-1), 
-                mParentCtrl(NULL), 
-                mHeader(NULL), 
-                mFontAlignment(LLFontGL::LEFT)
-        { }
-
-        LLScrollListColumn(std::string name, std::string label, S32 width, F32 relwidth) : 
-                mName(name), 
-                mSortingColumn(name), 
-                mSortAscending(TRUE), 
-                mLabel(label), 
-                mWidth(width), 
-                mRelWidth(relwidth), 
-                mDynamicWidth(FALSE), 
-                mMaxContentWidth(0),
-                mIndex(-1), 
-                mParentCtrl(NULL), 
-                mHeader(NULL),
-                mFontAlignment(LLFontGL::LEFT)
-        { }
-
-        LLScrollListColumn(const LLSD &sd)
-        {
-                mMaxContentWidth = 0;
-
-                mName = sd.get("name").asString();
-                mSortingColumn = mName;
-                if (sd.has("sort"))
-                {
-                        mSortingColumn = sd.get("sort").asString();
-                }
-                mSortAscending = TRUE;
-                if (sd.has("sort_ascending"))
-                {
-                        mSortAscending = sd.get("sort_ascending").asBoolean();
-                }
-                mLabel = sd.get("label").asString();
-                if (sd.has("relwidth") && (F32)sd.get("relwidth").asReal() > 0)
-                {
-                        mRelWidth = (F32)sd.get("relwidth").asReal();
-                        if (mRelWidth < 0) mRelWidth = 0;
-                        if (mRelWidth > 1) mRelWidth = 1;
-                        mDynamicWidth = FALSE;
-                        mWidth = 0;
-                }
-                else if(sd.has("dynamicwidth") && (BOOL)sd.get("dynamicwidth").asBoolean() == TRUE)
-                {
-                        mDynamicWidth = TRUE;
-                        mRelWidth = -1;
-                        mWidth = 0;
-                }
-                else
-                {
-                        mWidth = sd.get("width").asInteger();
-                        mDynamicWidth = FALSE;
-                        mRelWidth = -1;
-                }
-
-                if (sd.has("halign"))
-                {
-                        mFontAlignment = (LLFontGL::HAlign)llclamp(sd.get("halign").asInteger(), (S32)LLFontGL::LEFT, (S32)LLFontGL::HCENTER);
-                }
-                else
-                {
-                        mFontAlignment = LLFontGL::LEFT;
-                }
-
-                mIndex = -1;
-                mParentCtrl = NULL;
-                mHeader = NULL;
-                mFontAlignment = LLFontGL::LEFT;
-        }
+        LLScrollListColumn();
+        LLScrollListColumn(const LLSD &sd, LLScrollListCtrl* parent);
+
+        void setWidth(S32 width);
+        S32 getWidth() const { return mWidth; }
 
         // Public data is fine so long as this remains a simple struct-like data class.
         // If it ever gets any smarter than that, these should all become private
@@ -275,7 +212,6 @@ public:
         std::string                     mSortingColumn;
         BOOL                            mSortAscending;
         std::string                     mLabel;
-        S32                                     mWidth;
         F32                                     mRelWidth;
         BOOL                            mDynamicWidth;
         S32                                     mMaxContentWidth;
@@ -283,6 +219,10 @@ public:
         LLScrollListCtrl*       mParentCtrl;
         class LLColumnHeader*           mHeader;
         LLFontGL::HAlign        mFontAlignment;
+
+private:
+        S32                                     mWidth;
+
 };
 
 class LLColumnHeader : public LLComboBox
@@ -301,6 +241,7 @@ public:
         void setImage(const std::string &image_name);
         LLScrollListColumn* getColumn() { return mColumn; }
         void setHasResizableElement(BOOL resizable);
+        void updateResizeBars();
         BOOL canResize();
         void enableResizeBar(BOOL enable);
         std::string getLabel() { return mOrigLabel; }
@@ -551,8 +492,7 @@ public:
 
         virtual S32             getScrollPos() const;
         virtual void    setScrollPos( S32 pos );
-
-        S32                             getSearchColumn() { return mSearchColumn; }
+        S32 getSearchColumn();
         void                    setSearchColumn(S32 column) { mSearchColumn = column; }
         S32                             getColumnIndexFromOffset(S32 x);
         S32                             getColumnOffsetFromIndex(S32 index);
@@ -613,8 +553,9 @@ public:
         virtual void    deselect();
         virtual BOOL    canDeselect() const;
 
-        void setNumDynamicColumns(int num) { mNumDynamicWidthColumns = num; }
-        void setTotalStaticColumnWidth(int width) { mTotalStaticColumnWidth = width; }
+        void setNumDynamicColumns(S32 num) { mNumDynamicWidthColumns = num; }
+        void updateStaticColumnWidth(LLScrollListColumn* col, S32 new_width);
+        S32 getTotalStaticColumnWidth() { return mTotalStaticColumnWidth; }
 
         std::string     getSortColumnName();
         BOOL                    getSortAscending() { return mSortColumns.empty() ? TRUE : mSortColumns.back().second; }
@@ -719,6 +660,7 @@ private:
         S32                             mSearchColumn;
         S32                             mNumDynamicWidthColumns;
         S32                             mTotalStaticColumnWidth;
+        S32                             mTotalColumnPadding;
 
         BOOL                    mSorted;
         
diff --git a/linden/indra/llui/llslider.cpp b/linden/indra/llui/llslider.cpp
index 51b96c1..4dfc904 100644
--- a/linden/indra/llui/llslider.cpp
+++ b/linden/indra/llui/llslider.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llslider.h b/linden/indra/llui/llslider.h
index 94f5992..154685f 100644
--- a/linden/indra/llui/llslider.h
+++ b/linden/indra/llui/llslider.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llsliderctrl.cpp b/linden/indra/llui/llsliderctrl.cpp
index 477003b..31baddd 100644
--- a/linden/indra/llui/llsliderctrl.cpp
+++ b/linden/indra/llui/llsliderctrl.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -463,7 +464,7 @@ LLView* LLSliderCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
         // HACK: Font might not be specified.
         if (!font)
         {
-                font = LLFontGL::sSansSerifSmall;
+                font = LLFontGL::getFontSansSerifSmall();
         }
 
         S32 label_width = 0;
diff --git a/linden/indra/llui/llsliderctrl.h b/linden/indra/llui/llsliderctrl.h
index 56f4661..272dd7f 100644
--- a/linden/indra/llui/llsliderctrl.h
+++ b/linden/indra/llui/llsliderctrl.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index e1b47eb..c54a2cd 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -98,7 +99,7 @@ LLSpinCtrl::LLSpinCtrl(	const std::string& name, const LLRect& rect, const std::
                                                                    out_id,
                                                                    in_id,
                                                                    LLStringUtil::null,
-                                                                   &LLSpinCtrl::onUpBtn, this, LLFontGL::sSansSerif );
+                                                                   &LLSpinCtrl::onUpBtn, this, LLFontGL::getFontSansSerif() );
         mUpBtn->setFollowsLeft();
         mUpBtn->setFollowsBottom();
         mUpBtn->setHeldDownCallback( &LLSpinCtrl::onUpBtn );
@@ -112,7 +113,7 @@ LLSpinCtrl::LLSpinCtrl(	const std::string& name, const LLRect& rect, const std::
                                                         out_id,
                                                         in_id,
                                                         LLStringUtil::null,
-                                                        &LLSpinCtrl::onDownBtn, this, LLFontGL::sSansSerif );
+                                                        &LLSpinCtrl::onDownBtn, this, LLFontGL::getFontSansSerif() );
         mDownBtn->setFollowsLeft();
         mDownBtn->setFollowsBottom();
         mDownBtn->setHeldDownCallback( &LLSpinCtrl::onDownBtn );
diff --git a/linden/indra/llui/llspinctrl.h b/linden/indra/llui/llspinctrl.h
index 1a96767..dfd0eb3 100644
--- a/linden/indra/llui/llspinctrl.h
+++ b/linden/indra/llui/llspinctrl.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -81,6 +82,7 @@ public:
         virtual void    setFocus( BOOL b );
         virtual void    clear();
         virtual BOOL    isDirty() const { return( mValue != mInitialValue ); }
+        virtual void    resetDirty() { mInitialValue = mValue; }
 
         virtual void    setPrecision(S32 precision);
         virtual void    setMinValue(F32 min)                    { mMinValue = min; }
diff --git a/linden/indra/llui/llstyle.cpp b/linden/indra/llui/llstyle.cpp
index fc6c14e..a716cbb 100644
--- a/linden/indra/llui/llstyle.cpp
+++ b/linden/indra/llui/llstyle.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llstyle.h b/linden/indra/llui/llstyle.h
index 8dc1a40..3ad379c 100644
--- a/linden/indra/llui/llstyle.h
+++ b/linden/indra/llui/llstyle.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lltabcontainer.cpp b/linden/indra/llui/lltabcontainer.cpp
index 6b028d4..f416948 100644
--- a/linden/indra/llui/lltabcontainer.cpp
+++ b/linden/indra/llui/lltabcontainer.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -70,6 +71,7 @@ LLTabContainer::LLTabContainer(const std::string& name, const LLRect& rect, TabP
         : 
         LLPanel(name, rect, bordered),
         mCurrentTabIdx(-1),
+        mNextTabIdx(-1),
         mTabsHidden(FALSE),
         mScrolled(FALSE),
         mScrollPos(0),
@@ -1149,9 +1151,37 @@ BOOL LLTabContainer::selectTab(S32 which)
         {
                 return FALSE;
         }
-        
+
+        if (!selected_tuple->mPrecommitChangeCallback)
+        {
+                return setTab(which);
+        }
+
+        mNextTabIdx = which;
+        selected_tuple->mPrecommitChangeCallback(selected_tuple->mUserData, false);
+        return TRUE;
+}
+
+BOOL LLTabContainer::setTab(S32 which)
+{
+        if (which == -1)
+        {
+                if (mNextTabIdx == -1)
+                {
+                        return FALSE;
+                }
+                which = mNextTabIdx;
+                mNextTabIdx = -1;
+        }
+
+        LLTabTuple* selected_tuple = getTab(which);
+        if (!selected_tuple)
+        {
+                return FALSE;
+        }
+
         BOOL is_visible = FALSE;
-        if (getTab(which)->mButton->getEnabled())
+        if (selected_tuple->mButton->getEnabled())
         {
                 setCurrentPanelIndex(which);
 
@@ -1331,6 +1361,15 @@ void LLTabContainer::setTabChangeCallback(LLPanel* tab, void (*on_tab_clicked)(v
         }
 }
 
+void LLTabContainer::setTabPrecommitChangeCallback(LLPanel* tab, void (*on_precommit)(void*, bool))
+{
+        LLTabTuple* tuplep = getTabByPanel(tab);
+        if (tuplep)
+        {
+                tuplep->mPrecommitChangeCallback = on_precommit;
+        }
+}
+
 void LLTabContainer::setTabUserData(LLPanel* tab, void* userdata)
 {
         LLTabTuple* tuplep = getTabByPanel(tab);
@@ -1370,11 +1409,6 @@ void LLTabContainer::onTabBtn( void* userdata )
         LLTabTuple* tuple = (LLTabTuple*) userdata;
         LLTabContainer* self = tuple->mTabContainer;
         self->selectTabPanel( tuple->mTabPanel );
-        
-        if( tuple->mOnChangeCallback )
-        {
-                tuple->mOnChangeCallback( tuple->mUserData, true );
-        }
 
         tuple->mTabPanel->setFocus(TRUE);
 }
@@ -1624,14 +1658,14 @@ void LLTabContainer::initButtons()
                 in_id = "UIImgBtnJumpLeftInUUID";
                 mJumpPrevArrowBtn = new LLButton(std::string("Jump Left Arrow"), jump_left_arrow_btn_rect,
                                                                                  out_id, in_id, LLStringUtil::null,
-                                                                                 &LLTabContainer::onJumpFirstBtn, this, LLFontGL::sSansSerif );
+                                                                                 &LLTabContainer::onJumpFirstBtn, this, LLFontGL::getFontSansSerif() );
                 mJumpPrevArrowBtn->setFollowsLeft();
 
                 out_id = "UIImgBtnScrollLeftOutUUID";
                 in_id = "UIImgBtnScrollLeftInUUID";
                 mPrevArrowBtn = new LLButton(std::string("Left Arrow"), left_arrow_btn_rect,
                                                                          out_id, in_id, LLStringUtil::null,
-                                                                         &LLTabContainer::onPrevBtn, this, LLFontGL::sSansSerif );
+                                                                         &LLTabContainer::onPrevBtn, this, LLFontGL::getFontSansSerif() );
                 mPrevArrowBtn->setHeldDownCallback(onPrevBtnHeld);
                 mPrevArrowBtn->setFollowsLeft();
         
@@ -1640,7 +1674,7 @@ void LLTabContainer::initButtons()
                 mJumpNextArrowBtn = new LLButton(std::string("Jump Right Arrow"), jump_right_arrow_btn_rect,
                                                                                  out_id, in_id, LLStringUtil::null,
                                                                                  &LLTabContainer::onJumpLastBtn, this,
-                                                                                 LLFontGL::sSansSerif);
+                                                                                 LLFontGL::getFontSansSerif());
                 mJumpNextArrowBtn->setFollowsRight();
 
                 out_id = "UIImgBtnScrollRightOutUUID";
@@ -1648,7 +1682,7 @@ void LLTabContainer::initButtons()
                 mNextArrowBtn = new LLButton(std::string("Right Arrow"), right_arrow_btn_rect,
                                                                          out_id, in_id, LLStringUtil::null,
                                                                          &LLTabContainer::onNextBtn, this,
-                                                                         LLFontGL::sSansSerif);
+                                                                         LLFontGL::getFontSansSerif());
                 mNextArrowBtn->setFollowsRight();
 
                 if( getTabPosition() == TOP )
diff --git a/linden/indra/llui/lltabcontainer.h b/linden/indra/llui/lltabcontainer.h
index 96400f0..8117cde 100644
--- a/linden/indra/llui/lltabcontainer.h
+++ b/linden/indra/llui/lltabcontainer.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -107,6 +108,7 @@ public:
         BOOL            selectTabPanel( LLPanel* child );
         BOOL            selectTab(S32 which);
         BOOL            selectTabByName(const std::string& title);
+        BOOL            setTab(S32 which);
 
         BOOL        getTabPanelFlashing(LLPanel* child);
         void            setTabPanelFlashing(LLPanel* child, BOOL state);
@@ -118,6 +120,7 @@ public:
         S32                     getTopBorderHeight() const;
         
         void            setTabChangeCallback(LLPanel* tab, void (*on_tab_clicked)(void*,bool));
+        void            setTabPrecommitChangeCallback(LLPanel* tab, void (*on_precommit)(void*, bool));
         void            setTabUserData(LLPanel* tab, void* userdata);
 
         void            setRightTabBtnOffset( S32 offset );
@@ -147,12 +150,14 @@ private:
         struct LLTabTuple
         {
                 LLTabTuple( LLTabContainer* c, LLPanel* p, LLButton* b,
-                                        void (*cb)(void*,bool), void* userdata, LLTextBox* placeholder = NULL )
+                                        void (*cb)(void*,bool), void* userdata, LLTextBox* placeholder = NULL, 
+                                        void (*pcb)(void*,bool) = NULL)
                         :
                         mTabContainer(c),
                         mTabPanel(p),
                         mButton(b),
                         mOnChangeCallback( cb ),
+                        mPrecommitChangeCallback( pcb ),
                         mUserData( userdata ),
                         mOldState(FALSE),
                         mPlaceholderText(placeholder),
@@ -163,6 +168,9 @@ private:
                 LLPanel*                 mTabPanel;
                 LLButton*                mButton;
                 void                     (*mOnChangeCallback)(void*, bool);
+                void                     (*mPrecommitChangeCallback)(void*,bool);               // Precommit callback gets called before tab is changed and 
+                                                                                                                                                // can prevent it from being changed. onChangeCallback is called
+                                                                                                                                                // immediately after tab is actually changed - Nyx
                 void*                    mUserData;
                 BOOL                     mOldState;
                 LLTextBox*               mPlaceholderText;
@@ -199,6 +207,7 @@ private:
         tuple_list_t                                    mTabList;
         
         S32                                                             mCurrentTabIdx;
+        S32                                                             mNextTabIdx;
         BOOL                                                    mTabsHidden;
 
         BOOL                                                    mScrolled;
diff --git a/linden/indra/llui/lltabcontainervertical.cpp b/linden/indra/llui/lltabcontainervertical.cpp
index fa24ed1..a729c95 100644
--- a/linden/indra/llui/lltabcontainervertical.cpp
+++ b/linden/indra/llui/lltabcontainervertical.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lltabcontainervertical.h b/linden/indra/llui/lltabcontainervertical.h
index d01d20a..ce42367 100644
--- a/linden/indra/llui/lltabcontainervertical.h
+++ b/linden/indra/llui/lltabcontainervertical.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lltextbox.cpp b/linden/indra/llui/lltextbox.cpp
index f43b7d2..89893bc 100644
--- a/linden/indra/llui/lltextbox.cpp
+++ b/linden/indra/llui/lltextbox.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -33,32 +34,16 @@
 #include "lltextbox.h"
 #include "lluictrlfactory.h"
 #include "llfocusmgr.h"
+#include "llwindow.h"
 
 static LLRegisterWidget<LLTextBox> r("text");
 
 LLTextBox::LLTextBox(const std::string& name, const LLRect& rect, const std::string& text,
                                          const LLFontGL* font, BOOL mouse_opaque)
 :       LLUICtrl(name, rect, mouse_opaque, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_TOP ),
-        mFontGL(font ? font : LLFontGL::sSansSerifSmall),
-        mTextColor(                     LLUI::sColorsGroup->getColor( "LabelTextColor" ) ),
-        mDisabledColor(         LLUI::sColorsGroup->getColor( "LabelDisabledColor" ) ),
-        mBackgroundColor(       LLUI::sColorsGroup->getColor( "DefaultBackgroundColor" ) ),
-        mBorderColor(           LLUI::sColorsGroup->getColor( "DefaultHighlightLight" ) ),
-        mHoverColor(            LLUI::sColorsGroup->getColor( "LabelSelectedColor" ) ),
-        mHoverActive( FALSE ),
-        mHasHover( FALSE ),
-        mBackgroundVisible( FALSE ),
-        mBorderVisible( FALSE ),
-        mFontStyle(LLFontGL::DROP_SHADOW_SOFT),
-        mBorderDropShadowVisible( FALSE ),
-        mUseEllipses( FALSE ),
-        mHPad(0),
-        mVPad(0),
-        mHAlign( LLFontGL::LEFT ),
-        mVAlign( LLFontGL::TOP ),
-        mClickedCallback(NULL),
-        mCallbackUserData(NULL)
+        mFontGL(font ? font : LLFontGL::getFontSansSerifSmall())
 {
+        initDefaults();
         setText( text );
         setTabStop(FALSE);
 }
@@ -66,26 +51,9 @@ LLTextBox::LLTextBox(const std::string& name, const LLRect& rect, const std::str
 LLTextBox::LLTextBox(const std::string& name, const std::string& text, F32 max_width,
                                          const LLFontGL* font, BOOL mouse_opaque) :
         LLUICtrl(name, LLRect(0, 0, 1, 1), mouse_opaque, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_TOP),       
-        mFontGL(font ? font : LLFontGL::sSansSerifSmall),
-        mTextColor(LLUI::sColorsGroup->getColor("LabelTextColor")),
-        mDisabledColor(LLUI::sColorsGroup->getColor("LabelDisabledColor")),
-        mBackgroundColor(LLUI::sColorsGroup->getColor("DefaultBackgroundColor")),
-        mBorderColor(LLUI::sColorsGroup->getColor("DefaultHighlightLight")),
-        mHoverColor( LLUI::sColorsGroup->getColor( "LabelSelectedColor" ) ),
-        mHoverActive( FALSE ),
-        mHasHover( FALSE ),
-        mBackgroundVisible(FALSE),
-        mBorderVisible(FALSE),
-        mFontStyle(LLFontGL::DROP_SHADOW_SOFT),
-        mBorderDropShadowVisible(FALSE),
-        mUseEllipses( FALSE ),
-        mHPad(0),
-        mVPad(0),
-        mHAlign(LLFontGL::LEFT),
-        mVAlign( LLFontGL::TOP ),
-        mClickedCallback(NULL),
-        mCallbackUserData(NULL)
+        mFontGL(font ? font : LLFontGL::getFontSansSerifSmall())
 {
+        initDefaults();
         setWrappedText(text, max_width);
         reshapeToFitText();
         setTabStop(FALSE);
@@ -93,47 +61,34 @@ LLTextBox::LLTextBox(const std::string& name, const std::string& text, F32 max_w
 
 LLTextBox::LLTextBox(const std::string& name_and_label, const LLRect& rect) :
         LLUICtrl(name_and_label, rect, TRUE, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_TOP),   
-        mFontGL(LLFontGL::sSansSerifSmall),
-        mTextColor(LLUI::sColorsGroup->getColor("LabelTextColor")),
-        mDisabledColor(LLUI::sColorsGroup->getColor("LabelDisabledColor")),
-        mBackgroundColor(LLUI::sColorsGroup->getColor("DefaultBackgroundColor")),
-        mBorderColor(LLUI::sColorsGroup->getColor("DefaultHighlightLight")),
-        mBackgroundVisible(FALSE),
-        mBorderVisible(FALSE),
-        mFontStyle(LLFontGL::DROP_SHADOW_SOFT),
-        mBorderDropShadowVisible(FALSE),
-        mHPad(0),
-        mVPad(0),
-        mHAlign(LLFontGL::LEFT),
-        mVAlign( LLFontGL::TOP ),
-        mClickedCallback(NULL),
-        mCallbackUserData(NULL)
+        mFontGL(LLFontGL::getFontSansSerifSmall())
 {
+        initDefaults();
         setText( name_and_label );
         setTabStop(FALSE);
 }
 
-LLTextBox::LLTextBox(const std::string& name_and_label) :
-        LLUICtrl(name_and_label, LLRect(0, 0, 1, 1), TRUE, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_TOP),     
-        mFontGL(LLFontGL::sSansSerifSmall),
-        mTextColor(LLUI::sColorsGroup->getColor("LabelTextColor")),
-        mDisabledColor(LLUI::sColorsGroup->getColor("LabelDisabledColor")),
-        mBackgroundColor(LLUI::sColorsGroup->getColor("DefaultBackgroundColor")),
-        mBorderColor(LLUI::sColorsGroup->getColor("DefaultHighlightLight")),
-        mBackgroundVisible(FALSE),
-        mBorderVisible(FALSE),
-        mFontStyle(LLFontGL::DROP_SHADOW_SOFT),
-        mBorderDropShadowVisible(FALSE),
-        mHPad(0),
-        mVPad(0),
-        mHAlign(LLFontGL::LEFT),
-        mVAlign( LLFontGL::TOP ),
-        mClickedCallback(NULL),
-        mCallbackUserData(NULL)
+void LLTextBox::initDefaults()
 {
-        setWrappedText(name_and_label);
-        reshapeToFitText();
-        setTabStop(FALSE);
+        mTextColor = LLUI::sColorsGroup->getColor("LabelTextColor");
+        mDisabledColor = LLUI::sColorsGroup->getColor("LabelDisabledColor");
+        mBackgroundColor = LLUI::sColorsGroup->getColor("DefaultBackgroundColor");
+        mBorderColor = LLUI::sColorsGroup->getColor("DefaultHighlightLight");
+        mHoverColor = LLUI::sColorsGroup->getColor( "LabelSelectedColor" );
+        mHoverActive = FALSE;
+        mHasHover = FALSE;
+        mBackgroundVisible = FALSE;
+        mBorderVisible = FALSE;
+        mFontStyle = LLFontGL::DROP_SHADOW_SOFT;
+        mBorderDropShadowVisible = FALSE;
+        mUseEllipses = FALSE;
+        mLineSpacing = 0;
+        mHPad = 0;
+        mVPad = 0;
+        mHAlign = LLFontGL::LEFT;
+        mVAlign = LLFontGL::TOP;
+        mClickedCallback = NULL;
+        mCallbackUserData = NULL;
 }
 
 BOOL LLTextBox::handleMouseDown(S32 x, S32 y, MASK mask)
@@ -193,12 +148,14 @@ BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask)
 
 BOOL LLTextBox::handleHover(S32 x, S32 y, MASK mask)
 {
+        BOOL handled = LLView::handleHover(x,y,mask);
         if(mHoverActive)
         {
                 mHasHover = TRUE; // This should be set every frame during a hover.
-                return TRUE;
+                getWindow()->setCursor(UI_CURSOR_ARROW);
         }
-        return LLView::handleHover(x,y,mask);
+
+        return (handled || mHasHover);
 }
 
 void LLTextBox::setText(const LLStringExplicit& text)
@@ -412,7 +369,7 @@ void LLTextBox::drawText( S32 x, S32 y, const LLColor4& color )
                                                         mFontStyle,
                                                         line_length, getRect().getWidth(), NULL, TRUE, mUseEllipses );
                         cur_pos += line_length + 1;
-                        y -= llfloor(mFontGL->getLineHeight());
+                        y -= llfloor(mFontGL->getLineHeight()) + mLineSpacing;
                 }
         }
 }
@@ -469,6 +426,8 @@ LLView* LLTextBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
 
         text_box->initFromXML(node, parent);
 
+        node->getAttributeS32("line_spacing", text_box->mLineSpacing);
+
         std::string font_style;
         if (node->getAttributeString("font-style", font_style))
         {
diff --git a/linden/indra/llui/lltextbox.h b/linden/indra/llui/lltextbox.h
index 83e4a9b..07a6aa3 100644
--- a/linden/indra/llui/lltextbox.h
+++ b/linden/indra/llui/lltextbox.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -54,7 +55,10 @@ public:
 
         // "Simple" constructors for text boxes that have the same name and label *TO BE DEPRECATED*
         LLTextBox(const std::string& name_and_label, const LLRect& rect);
-        LLTextBox(const std::string& name_and_label);
+
+        // Consolidate common member initialization
+        // 20+ initializers times 3+ constructors is unmaintainable.
+        void initDefaults(); 
 
         virtual ~LLTextBox() {}
 
@@ -88,8 +92,7 @@ public:
         void                    setVPad(S32 pixels)                                             { mVPad = pixels; }
         void                    setRightAlign()                                                 { mHAlign = LLFontGL::RIGHT; }
         void                    setHAlign( LLFontGL::HAlign align )             { mHAlign = align; }
-        void                    setClickedCallback( void (*cb)(void *data) ){ mClickedCallback = cb; }          // mouse down and up within button
-        void                    setCallbackUserData( void* data )               { mCallbackUserData = data; }
+        void                    setClickedCallback( void (*cb)(void *data), void* data = NULL ){ mClickedCallback = cb; mCallbackUserData = data; }             // mouse down and up within button
 
         const LLFontGL* getFont() const                                                 { return mFontGL; }
 
@@ -124,6 +127,8 @@ private:
         BOOL                    mBorderDropShadowVisible;
         BOOL                    mUseEllipses;
 
+        S32                             mLineSpacing;
+
         S32                             mHPad;
         S32                             mVPad;
         LLFontGL::HAlign mHAlign;
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 62064d9..7928887 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -56,6 +57,7 @@
 #include "llcontrol.h"
 #include "llimagegl.h"
 #include "llwindow.h"
+#include "lltextparser.h"
 #include <queue>
 
 // 
@@ -299,7 +301,7 @@ LLTextEditor::LLTextEditor(
         }
         else
         {
-                mGLFont = LLFontGL::sSansSerif;
+                mGLFont = LLFontGL::getFontSansSerif();
         }
 
         updateTextRect();
@@ -382,7 +384,7 @@ void LLTextEditor::updateLineStartList(S32 startpos)
 {
         updateSegments();
         
-        bindEmbeddedChars( const_cast<LLFontGL*>(mGLFont) );
+        bindEmbeddedChars(mGLFont);
 
         S32 seg_num = mSegments.size();
         S32 seg_idx = 0;
@@ -460,7 +462,7 @@ void LLTextEditor::updateLineStartList(S32 startpos)
                 }
         }
         
-        unbindEmbeddedChars(const_cast<LLFontGL*>(mGLFont));
+        unbindEmbeddedChars(mGLFont);
 
         mScrollbar->setDocSize( getLineCount() );
 
@@ -851,13 +853,13 @@ S32 LLTextEditor::getCursorPosFromLocalCoord( S32 local_x, S32 local_y, BOOL rou
                 if (mAllowEmbeddedItems)
                 {
                         // Figure out which character we're nearest to.
-                        bindEmbeddedChars(const_cast<LLFontGL*>(mGLFont));
+                        bindEmbeddedChars(mGLFont);
                         pos = mGLFont->charFromPixelOffset(mWText.c_str(), line_start,
                                                                                            (F32)(local_x - mTextRect.mLeft),
                                                                                            (F32)(mTextRect.getWidth()),
                                                                                            line_len,
                                                                                            round, TRUE);
-                        unbindEmbeddedChars(const_cast<LLFontGL*>(mGLFont));
+                        unbindEmbeddedChars(mGLFont);
                 }
                 else
                 {
@@ -1009,7 +1011,7 @@ void LLTextEditor::indentSelectedLines( S32 spaces )
                 }
                 else
                 {
-                        while( right < getLength() && (text[right] != '\n') )
+                        while( (text[right] != '\n') && (right <= getLength() ) )
                         {
                                 right++;
                         }
@@ -1321,6 +1323,8 @@ BOOL LLTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
                         
                         setCursorAtLocalPos( x, y, TRUE );
                         endSelection();
+
+                        updateScrollFromCursor();
                 }
                 
                 if( !hasSelection() )
@@ -2928,7 +2932,7 @@ void LLTextEditor::drawText()
                 // draw the line numbers
                 if( mShowLineNumbers && !cur_line_is_continuation) 
                 {
-                        const LLFontGL *num_font = LLFontGL::sMonospace;
+                        const LLFontGL *num_font = LLFontGL::getFontMonospace();
                         F32 y_top = text_y + ((F32)llround(num_font->getLineHeight()) / 2);
                         const LLWString ltext = utf8str_to_wstring(llformat("%*d", UI_TEXTEDITOR_LINE_NUMBER_DIGITS, cur_line_num ));
                         BOOL is_cur_line = getCurrentLine() == cur_line_num;
@@ -3113,7 +3117,7 @@ void LLTextEditor::draw()
         {
                 LLLocalClipRect clip(LLRect(0, getRect().getHeight(), getRect().getWidth() - (mScrollbar->getVisible() ? SCROLLBAR_SIZE : 0), 0));
 
-                        bindEmbeddedChars( const_cast<LLFontGL*>(mGLFont) );
+                        bindEmbeddedChars(mGLFont);
 
                         drawBackground();
                         drawSelectionBackground();
@@ -3121,7 +3125,7 @@ void LLTextEditor::draw()
                         drawText();
                         drawCursor();
 
-                        unbindEmbeddedChars( const_cast<LLFontGL*>(mGLFont) );
+                        unbindEmbeddedChars(mGLFont);
 
                 //RN: the decision was made to always show the orange border for keyboard focus but do not put an insertion caret
                 // when in readonly mode
@@ -3242,7 +3246,7 @@ void LLTextEditor::changePage( S32 delta )
 
 void LLTextEditor::changeLine( S32 delta )
 {
-        bindEmbeddedChars( const_cast<LLFontGL*>(mGLFont) );
+        bindEmbeddedChars(mGLFont);
 
         S32 line, offset;
         getLineAndOffset( mCursorPos, &line, &offset );
@@ -3269,7 +3273,7 @@ void LLTextEditor::changeLine( S32 delta )
         }
         else
         {
-                unbindEmbeddedChars( const_cast<LLFontGL*>(mGLFont) );
+                unbindEmbeddedChars(mGLFont);
                 return;
         }
 
@@ -3294,7 +3298,7 @@ void LLTextEditor::changeLine( S32 delta )
 
         // put desired position into remember-buffer after setCursorPos()
         mDesiredXPixel = desired_x_pixel;
-        unbindEmbeddedChars( const_cast<LLFontGL*>(mGLFont) );
+        unbindEmbeddedChars(mGLFont);
 }
 
 BOOL LLTextEditor::isScrolledToTop() 
@@ -3384,7 +3388,9 @@ void LLTextEditor::endOfLine()
 
 void LLTextEditor::endOfDoc()
 {
-        mScrollbar->setDocPos( mScrollbar->getDocPosMax() );
+        mScrollbar->setDocPos(mScrollbar->getDocPosMax());
+        mScrolledToBottom = true;
+
         S32 len = getLength();
         if( len )
         {
@@ -3514,18 +3520,26 @@ void LLTextEditor::appendColoredText(const std::string &new_text,
                                                                          const LLColor4 &color,
                                                                          const std::string& font_name)
 {
+        LLColor4 lcolor=color;
+        if (mParseHighlights)
+        {
+                LLTextParser* highlight = LLTextParser::getInstance();
+                highlight->parseFullLineHighlights(new_text, &lcolor);
+        }
+        
         LLStyleSP style(new LLStyle);
         style->setVisible(true);
-        style->setColor(color);
+        style->setColor(lcolor);
         style->setFontName(font_name);
-        appendStyledText(new_text, allow_undo, prepend_newline, &style);
+        appendStyledText(new_text, allow_undo, prepend_newline, style);
 }
 
 void LLTextEditor::appendStyledText(const std::string &new_text, 
                                                                          bool allow_undo, 
                                                                          bool prepend_newline,
-                                                                         const LLStyleSP *stylep)
+                                                                         LLStyleSP stylep)
 {
+        S32 part = (S32)LLTextParser::WHOLE;
         if(mParseHTML)
         {
 
@@ -3538,34 +3552,80 @@ void LLTextEditor::appendStyledText(const std::string &new_text,
                         html->setColor(mLinkColor);
                         if (stylep)
                         {
-                                html->setFontName((*stylep)->getFontString());
+                                html->setFontName(stylep->getFontString());
                         }
                         html->mUnderline = TRUE;
 
-                        if (start > 0) appendText(text.substr(0,start),allow_undo, prepend_newline, stylep);
+                        if (start > 0)
+                        {
+                                if (part == (S32)LLTextParser::WHOLE ||
+                                        part == (S32)LLTextParser::START)
+                                {
+                                        part = (S32)LLTextParser::START;
+                                }
+                                else
+                                {
+                                        part = (S32)LLTextParser::MIDDLE;
+                                }
+                                std::string subtext=text.substr(0,start);
+                                appendHighlightedText(subtext,allow_undo, prepend_newline, part, stylep); 
+                        }
+                        
                         html->setLinkHREF(text.substr(start,end-start));
-                        appendText(text.substr(start, end-start),allow_undo, prepend_newline, &html);
+                        appendText(text.substr(start, end-start),allow_undo, prepend_newline, html);
                         if (end < (S32)text.length()) 
                         {
                                 text = text.substr(end,text.length() - end);
                                 end=0;
+                                part=(S32)LLTextParser::END;
                         }
                         else
                         {
                                 break;
                         }
                 }
-                if (end < (S32)text.length()) appendText(text,allow_undo, prepend_newline, stylep);
+                if (part != (S32)LLTextParser::WHOLE) part=(S32)LLTextParser::END;
+                if (end < (S32)text.length()) appendHighlightedText(text,allow_undo, prepend_newline, part, stylep);            
         }
         else
         {
-                appendText(new_text, allow_undo, prepend_newline, stylep);
+                appendHighlightedText(new_text, allow_undo, prepend_newline, part, stylep);
         }
 }
 
+void LLTextEditor::appendHighlightedText(const std::string &new_text, 
+                                                                                 bool allow_undo, 
+                                                                                 bool prepend_newline,
+                                                                                 S32  highlight_part,
+                                                                                 LLStyleSP stylep)
+{
+        if (mParseHighlights) 
+        {
+                LLTextParser* highlight = LLTextParser::getInstance();
+                
+                if (highlight && stylep)
+                {
+                        LLSD pieces = highlight->parsePartialLineHighlights(new_text, stylep->getColor(), highlight_part);
+                        bool lprepend=prepend_newline;
+                        for (S32 i=0;i<pieces.size();i++)
+                        {
+                                LLSD color_llsd = pieces[i]["color"];
+                                LLColor4 lcolor;
+                                lcolor.setValue(color_llsd);
+                                LLStyleSP lstylep(new LLStyle(*stylep));
+                                lstylep->setColor(lcolor);
+                                if (i != 0 && (pieces.size() > 1) ) lprepend=FALSE;
+                                appendText((std::string)pieces[i]["text"], allow_undo, lprepend, lstylep);
+                        }
+                        return;
+                }
+        }
+        appendText(new_text, allow_undo, prepend_newline, stylep);
+}
+
 // Appends new text to end of document
 void LLTextEditor::appendText(const std::string &new_text, bool allow_undo, bool prepend_newline,
-                                                          const LLStyleSP *stylep)
+                                                          const LLStyleSP stylep)
 {
         // Save old state
         BOOL was_scrolled_to_bottom = (mScrollbar->getDocPos() == mScrollbar->getDocPosMax());
@@ -3597,7 +3657,7 @@ void LLTextEditor::appendText(const std::string &new_text, bool allow_undo, bool
         {
                 S32 segment_start = old_length;
                 S32 segment_end = getLength();
-                LLTextSegment* segment = new LLTextSegment(*stylep, segment_start, segment_end );
+                LLTextSegment* segment = new LLTextSegment(stylep, segment_start, segment_end );
                 mSegments.push_back(segment);
         }
         
@@ -4270,7 +4330,6 @@ S32 LLTextEditor::findHTMLToken(const std::string &line, S32 pos, BOOL reverse)
         } 
         else
         {
-                
                 for (int index=pos; index<(S32)line.length(); index++)
                 {
                         char c = line[index];
diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index 61341e2..56825e7 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -75,6 +76,7 @@ public:
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
         void    setTextEditorParameters(LLXMLNodePtr node);
         void    setParseHTML(BOOL parsing) {mParseHTML=parsing;}
+        void    setParseHighlights(BOOL parsing) {mParseHighlights=parsing;}
 
         // mousehandler overrides
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
@@ -139,7 +141,7 @@ public:
         void                    insertText(const std::string &text);
         // appends text at end
         void                    appendText(const std::string &wtext, bool allow_undo, bool prepend_newline,
-                                                           const LLStyleSP *stylep = NULL);
+                                                           const LLStyleSP stylep = NULL);
 
         void                    appendColoredText(const std::string &wtext, bool allow_undo, 
                                                                           bool prepend_newline,
@@ -148,8 +150,11 @@ public:
         // if styled text starts a line, you need to prepend a newline.
         void                    appendStyledText(const std::string &new_text, bool allow_undo, 
                                                                          bool prepend_newline,
-                                                                         const LLStyleSP *stylep = NULL);
-
+                                                                         LLStyleSP stylep = NULL);
+        void                    appendHighlightedText(const std::string &new_text,  bool allow_undo, 
+                                                                                  bool prepend_newline,  S32  highlight_part,
+                                                                                  LLStyleSP stylep);
+        
         // Removes text from the end of document
         // Does not change highlight or cursor position.
         void                    removeTextFromEnd(S32 num_chars);
@@ -312,8 +317,8 @@ protected:
         virtual BOOL    handleMouseUpOverSegment(S32 x, S32 y, MASK mask);
 
         virtual llwchar pasteEmbeddedItem(llwchar ext_char) { return ext_char; }
-        virtual void    bindEmbeddedChars(LLFontGL* font) const {}
-        virtual void    unbindEmbeddedChars(LLFontGL* font) const {}
+        virtual void    bindEmbeddedChars(const LLFontGL* font) const {}
+        virtual void    unbindEmbeddedChars(const LLFontGL* font) const {}
         
         S32                             findHTMLToken(const std::string &line, S32 pos, BOOL reverse) const;
         BOOL                    findHTML(const std::string &line, S32 *begin, S32 *end) const;
@@ -401,6 +406,7 @@ protected:
         S32                             mLastSelectionY;
 
         BOOL                    mParseHTML;
+        BOOL                    mParseHighlights;
         std::string             mHTML;
 
         typedef std::vector<LLTextSegment *> segment_list_t;
diff --git a/linden/indra/llui/lltextparser.cpp b/linden/indra/llui/lltextparser.cpp
new file mode 100644
index 0000000..925b118
--- /dev/null
+++ b/linden/indra/llui/lltextparser.cpp
@@ -0,0 +1,299 @@
+/** 
+ * @file lltexteditor.cpp
+ * @brief LLTextEditor base class
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llsd.h"
+#include "llsdserialize.h"
+#include "llerror.h"
+#include "lluuid.h"
+#include "llstring.h"
+#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
+//
+
+LLTextParser::~LLTextParser()
+{
+        sInstance=NULL;
+}
+
+// static
+LLTextParser* LLTextParser::getInstance()
+{
+        if (!sInstance)
+        {
+                sInstance = new LLTextParser();
+                sInstance->loadFromDisk();
+        }
+        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);
+                                }
+                        }
+                }
+        }
+}
+
+S32 LLTextParser::findPattern(const std::string &text, LLSD highlight)
+{
+        if (!highlight.has("pattern")) return -1;
+        
+        std::string pattern=std::string(highlight["pattern"]);
+        std::string ltext=text;
+        
+        if (!(bool)highlight["case_sensitive"])
+        {
+                ltext   = utf8str_tolower(text);
+                pattern= utf8str_tolower(pattern);
+        }
+
+        size_t found=std::string::npos;
+        
+        switch ((S32)highlight["condition"])
+        {
+                case CONTAINS:
+                        found = ltext.find(pattern); 
+                        break;
+                case MATCHES:
+                    found = (! ltext.compare(pattern) ? 0 : std::string::npos);
+                        break;
+                case STARTS_WITH:
+                        found = (! ltext.find(pattern) ? 0 : std::string::npos);
+                        break;
+                case ENDS_WITH:
+                        S32 pos = ltext.rfind(pattern); 
+                        if (pos >= 0 && (ltext.length()-pattern.length()==pos)) found = pos;
+                        break;
+        }
+        return found;
+}
+
+LLSD LLTextParser::parsePartialLineHighlights(const std::string &text, const LLColor4 &color, S32 part, S32 index)
+{
+        //evil recursive string atomizer.
+        LLSD ret_llsd, start_llsd, middle_llsd, end_llsd;
+
+        for (S32 i=index;i<mHighlights.size();i++)
+        {
+                S32 condition = mHighlights[i]["condition"];
+                if ((S32)mHighlights[i]["highlight"]==PART && condition!=MATCHES)
+                {
+                        if ( (condition==STARTS_WITH && part==START) ||
+                             (condition==ENDS_WITH   && part==END)   ||
+                                  condition==CONTAINS    || part==WHOLE )
+                        {
+                                S32 start = findPattern(text,mHighlights[i]);
+                                if (start >= 0 )
+                                {
+                                        S32 end =  std::string(mHighlights[i]["pattern"]).length();
+                                        S32 len = text.length();
+                                        S32 newpart;
+                                        if (start==0)
+                                        {
+                                                start_llsd[0]["text"] =text.substr(0,end);
+                                                start_llsd[0]["color"]=mHighlights[i]["color"];
+                                                
+                                                if (end < len)
+                                                {
+                                                        if (part==END   || part==WHOLE) newpart=END; else newpart=MIDDLE;
+                                                        end_llsd=parsePartialLineHighlights(text.substr( end ),color,newpart,i);
+                                                }
+                                        }
+                                        else
+                                        {
+                                                if (part==START || part==WHOLE) newpart=START; else newpart=MIDDLE;
+
+                                                start_llsd=parsePartialLineHighlights(text.substr(0,start),color,newpart,i+1);
+                                                
+                                                if (end < len)
+                                                {
+                                                        middle_llsd[0]["text"] =text.substr(start,end);
+                                                        middle_llsd[0]["color"]=mHighlights[i]["color"];
+                                                
+                                                        if (part==END   || part==WHOLE) newpart=END; else newpart=MIDDLE;
+
+                                                        end_llsd=parsePartialLineHighlights(text.substr( (start+end) ),color,newpart,i);
+                                                }
+                                                else
+                                                {
+                                                        end_llsd[0]["text"] =text.substr(start,end);
+                                                        end_llsd[0]["color"]=mHighlights[i]["color"];
+                                                }
+                                        }
+                                                
+                                        S32 retcount=0;
+                                        
+                                        //FIXME These loops should be wrapped into a subroutine.
+                                        for (LLSD::array_iterator iter = start_llsd.beginArray();
+                                                 iter != start_llsd.endArray();++iter)
+                                        {
+                                                LLSD highlight = *iter;
+                                                ret_llsd[retcount++]=highlight;
+                                        }
+                                                   
+                                        for (LLSD::array_iterator iter = middle_llsd.beginArray();
+                                                 iter != middle_llsd.endArray();++iter)
+                                        {
+                                                LLSD highlight = *iter;
+                                                ret_llsd[retcount++]=highlight;
+                                        }
+                                                   
+                                        for (LLSD::array_iterator iter = end_llsd.beginArray();
+                                                 iter != end_llsd.endArray();++iter)
+                                        {
+                                                LLSD highlight = *iter;
+                                                ret_llsd[retcount++]=highlight;
+                                        }
+                                                   
+                                        return ret_llsd;
+                                }
+                        }
+                }
+        }
+        
+        //No patterns found.  Just send back what was passed in.
+        ret_llsd[0]["text"] =text;
+        LLSD color_sd = color.getValue();
+        ret_llsd[0]["color"]=color_sd;
+        return ret_llsd;
+}
+
+bool LLTextParser::parseFullLineHighlights(const std::string &text, LLColor4 *color)
+{
+        for (S32 i=0;i<mHighlights.size();i++)
+        {
+                if ((S32)mHighlights[i]["highlight"]==ALL || (S32)mHighlights[i]["condition"]==MATCHES)
+                {
+                        if (findPattern(text,mHighlights[i]) >= 0 )
+                        {
+                                LLSD color_llsd = mHighlights[i]["color"];
+                                color->setValue(color_llsd);
+                                return TRUE;
+                        }
+                }
+        }
+        return FALSE;   //No matches found.
+}
+
+std::string LLTextParser::getFileName()
+{
+        std::string path=gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "");
+        
+        if (!path.empty())
+        {
+                path = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "highlights.xml");
+        }
+        return path;  
+}
+
+LLSD LLTextParser::loadFromDisk()
+{
+        std::string filename=getFileName();
+        if (filename.empty())
+        {
+                llwarns << "LLTextParser::loadFromDisk() no valid user directory." << llendl; 
+        }
+        else
+        {
+                llifstream file;
+                file.open(filename.c_str());
+                if (file.is_open())
+                {
+                        LLSDSerialize::fromXML(mHighlights, file);
+                }
+                file.close();
+        }
+
+        return mHighlights;
+}
+
+bool LLTextParser::saveToDisk(LLSD highlights)
+{
+        mHighlights=highlights;
+        std::string filename=getFileName();
+        if (filename.empty())
+        {
+                llwarns << "LLTextParser::saveToDisk() no valid user directory." << llendl; 
+                return FALSE;
+        }       
+        llofstream file;
+        file.open(filename.c_str());
+        LLSDSerialize::toPrettyXML(mHighlights, file);
+        file.close();
+        return TRUE;
+}
diff --git a/linden/indra/llui/lltextparser.h b/linden/indra/llui/lltextparser.h
new file mode 100644
index 0000000..d69e3a2
--- /dev/null
+++ b/linden/indra/llui/lltextparser.h
@@ -0,0 +1,73 @@
+/** 
+ * @file llTextParser.h
+ * @brief GUI for user-defined highlights
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ *
+ */
+
+#ifndef LL_LLTEXTPARSER_H
+#define LL_LLTEXTPARSER_H
+
+#include <vector>
+#include "linden_common.h"
+
+#include "lltextparser.h"
+
+class LLSD;
+class LLUUID;
+class LLVector3d;
+class LLColor4;
+
+class LLTextParser
+{
+public:
+        enum ConditionType { CONTAINS, MATCHES, STARTS_WITH, ENDS_WITH };
+        enum HighlightType { PART, ALL };
+        enum HighlightPosition { WHOLE, START, MIDDLE, END };
+        enum DialogAction  { ACTION_NONE, ACTION_CLOSE, ACTION_ADD, ACTION_COPY, ACTION_UPDATE };
+
+        static LLTextParser* getInstance();
+        LLTextParser(){};
+        ~LLTextParser();
+
+        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();
+        bool saveToDisk(LLSD highlights);
+public:
+                LLSD    mHighlights;
+private:
+        static LLTextParser* sInstance;
+};
+
+#endif
diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index f3e73fd..57ce13c 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -30,6 +31,7 @@
  */
 
 // Utilities functions the user interface needs
+
 #include "linden_common.h"
 
 #include <string>
@@ -65,6 +67,7 @@ std::map<std::string, std::string> gTranslation;
 std::list<std::string> gUntranslated;
 
 LLControlGroup* LLUI::sConfigGroup = NULL;
+LLControlGroup* LLUI::sIgnoresGroup = NULL;
 LLControlGroup* LLUI::sColorsGroup = NULL;
 LLImageProviderInterface* LLUI::sImageProvider = NULL;
 LLUIAudioCallback LLUI::sAudioCallback = NULL;
@@ -90,7 +93,7 @@ void make_ui_sound(const char* namep)
                 LLUUID uuid(LLUI::sConfigGroup->getString(name));               
                 if (uuid.isNull())
                 {
-                        if ("00000000-0000-0000-0000-000000000000" == LLUI::sConfigGroup->getString(name))
+                        if (LLUI::sConfigGroup->getString(name) == LLUUID::null.asString())
                         {
                                 if (LLUI::sConfigGroup->getBOOL("UISndDebugSpamToggle"))
                                 {
@@ -1552,6 +1555,7 @@ bool handleShowXUINamesChanged(const LLSD& newvalue)
 }
 
 void LLUI::initClass(LLControlGroup* config, 
+                                         LLControlGroup* ignores, 
                                          LLControlGroup* colors, 
                                          LLImageProviderInterface* image_provider,
                                          LLUIAudioCallback audio_callback,
@@ -1559,7 +1563,16 @@ void LLUI::initClass(LLControlGroup* config,
                                          const std::string& language)
 {
         sConfigGroup = config;
+        sIgnoresGroup = ignores;
         sColorsGroup = colors;
+
+        if (sConfigGroup == NULL
+                || sIgnoresGroup == NULL
+                || sColorsGroup == NULL)
+        {
+                llerrs << "Failure to initialize configuration groups" << llendl;
+        }
+
         sImageProvider = image_provider;
         sAudioCallback = audio_callback;
         sGLScaleFactor = (scale_factor == NULL) ? LLVector2(1.f, 1.f) : *scale_factor;
@@ -1567,7 +1580,7 @@ void LLUI::initClass(LLControlGroup* config,
         LLFontGL::sShadowColor = colors->getColor("ColorDropShadow");
 
         LLUI::sShowXUINames = LLUI::sConfigGroup->getBOOL("ShowXUINames");
-        LLUI::sConfigGroup->getControl("ShowXUINames")->getSignal()->connect(boost::bind(&handleShowXUINamesChanged, _1));
+        LLUI::sConfigGroup->getControl("ShowXUINames")->getSignal()->connect(&handleShowXUINamesChanged);
 }
 
 void LLUI::cleanupClass()
@@ -1645,6 +1658,18 @@ void LLUI::setCursorPositionLocal(const LLView* viewp, S32 x, S32 y)
         setCursorPositionScreen(screen_x, screen_y);
 }
 
+//static 
+void LLUI::getCursorPositionLocal(const LLView* viewp, S32 *x, S32 *y)
+{
+        LLCoordWindow cursor_pos_window;
+        LLView::getWindow()->getCursorPosition(&cursor_pos_window);
+        LLCoordGL cursor_pos_gl;
+        LLView::getWindow()->convertCoords(cursor_pos_window, &cursor_pos_gl);
+        cursor_pos_gl.mX = llround((F32)cursor_pos_gl.mX / LLUI::sGLScaleFactor.mV[VX]);
+        cursor_pos_gl.mY = llround((F32)cursor_pos_gl.mY / LLUI::sGLScaleFactor.mV[VY]);
+        viewp->screenPointToLocal(cursor_pos_gl.mX, cursor_pos_gl.mY, x, y);
+}
+
 // On Windows, the user typically sets the language when they install the
 // app (by running it with a shortcut that sets InstallLanguage).  On Mac,
 // or on Windows if the SecondLife.exe executable is run directly, the 
diff --git a/linden/indra/llui/llui.h b/linden/indra/llui/llui.h
index 1e731f1..ebcc730 100644
--- a/linden/indra/llui/llui.h
+++ b/linden/indra/llui/llui.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -42,6 +43,7 @@
 #include "llgl.h"                       // *TODO: break this dependency
 #include <stack>
 //#include "llimagegl.h"
+#include <boost/signal.hpp>
 
 // LLUIFactory
 #include "llsd.h"
@@ -150,11 +152,13 @@ typedef	void (*LLUIAudioCallback)(const LLUUID& uuid);
 
 class LLUI
 {
+        LOG_CLASS(LLUI);
 public:
         //
         // Methods
         //
         static void initClass(LLControlGroup* config, 
+                                                  LLControlGroup* ignores,
                                                   LLControlGroup* colors, 
                                                   LLImageProviderInterface* image_provider,
                                                   LLUIAudioCallback audio_callback = NULL,
@@ -175,6 +179,7 @@ public:
         static std::string locateSkin(const std::string& filename);
         static void setCursorPositionScreen(S32 x, S32 y);
         static void setCursorPositionLocal(const LLView* viewp, S32 x, S32 y);
+        static void getCursorPositionLocal(const LLView* viewp, S32 *x, S32 *y);
         static void setScaleFactor(const LLVector2& scale_factor);
         static void setLineWidth(F32 width);
         static LLUIImage* getUIImage(const std::string& name);
@@ -189,6 +194,7 @@ public:
         // Data
         //
         static LLControlGroup* sConfigGroup;
+        static LLControlGroup* sIgnoresGroup;
         static LLControlGroup* sColorsGroup;
         static LLImageProviderInterface* sImageProvider;
         static LLUIAudioCallback sAudioCallback;
@@ -596,4 +602,237 @@ public:
         virtual void cleanUp() = 0;
 };
 
+// This mix-in class adds support for tracking all instances of the specificed class parameter T
+// The (optional) key associates a value of type KEY with a given instance of T, for quick lookup
+// If KEY is not provided, then instances are stored in a simple list
+template<typename T, typename KEY = T*>
+class LLInstanceTracker : boost::noncopyable
+{
+public:
+        typedef typename std::map<KEY, T*>::iterator instance_iter;
+        typedef typename std::map<KEY, T*>::const_iterator instance_const_iter;
+
+        static T* getInstance(KEY k) { instance_iter found = sInstances.find(k); return (found == sInstances.end()) ? NULL : found->second; }
+
+        static instance_iter beginInstances() { return sInstances.begin(); }
+        static instance_iter endInstances() { return sInstances.end(); }
+        static S32 instanceCount() { return sInstances.size(); }
+protected:
+        LLInstanceTracker(KEY key) { add(key); }
+        virtual ~LLInstanceTracker() { remove(); }
+        virtual void setKey(KEY key) { remove(); add(key); }
+        virtual const KEY& getKey() const { return mKey; }
+
+private:
+        void add(KEY key) 
+        { 
+                mKey = key; 
+                sInstances[key] = static_cast<T*>(this); 
+        }
+        void remove() { sInstances.erase(mKey); }
+
+private:
+
+        KEY mKey;
+        static std::map<KEY, T*> sInstances;
+};
+
+template<typename T>
+class LLInstanceTracker<T, T*> : boost::noncopyable
+{
+public:
+        typedef typename std::set<T*>::iterator instance_iter;
+        typedef typename std::set<T*>::const_iterator instance_const_iter;
+
+        static instance_iter instancesBegin() { return sInstances.begin(); }
+        static instance_iter instancesEnd() { return sInstances.end(); }
+        static S32 instanceCount() { return sInstances.size(); }
+
+protected:
+        LLInstanceTracker() { sInstances.insert(static_cast<T*>(this)); }
+        virtual ~LLInstanceTracker() { sInstances.erase(static_cast<T*>(this)); }
+
+        static std::set<T*> sInstances;
+};
+
+template <typename T, typename KEY> std::map<KEY, T*> LLInstanceTracker<T, KEY>::sInstances;
+template <typename T> std::set<T*> LLInstanceTracker<T, T*>::sInstances;
+
+class LLCallbackRegistry
+{
+public:
+        typedef boost::signal<void()> callback_signal_t;
+        
+        void registerCallback(const callback_signal_t::slot_type& slot)
+        {
+                mCallbacks.connect(slot);
+        }
+
+        void fireCallbacks()
+        {
+                mCallbacks();
+        }
+
+private:
+        callback_signal_t mCallbacks;
+};
+
+class LLInitClassList : 
+        public LLCallbackRegistry, 
+        public LLSingleton<LLInitClassList>
+{
+        friend class LLSingleton<LLInitClassList>;
+private:
+        LLInitClassList() {}
+};
+
+class LLDestroyClassList : 
+        public LLCallbackRegistry, 
+        public LLSingleton<LLDestroyClassList>
+{
+        friend class LLSingleton<LLDestroyClassList>;
+private:
+        LLDestroyClassList() {}
+};
+
+template<typename T>
+class LLRegisterWith
+{
+public:
+        LLRegisterWith(boost::function<void ()> func)
+        {
+                T::instance().registerCallback(func);
+        }
+
+        // this avoids a MSVC bug where non-referenced static members are "optimized" away
+        // even if their constructors have side effects
+        void reference()
+        {
+                S32 dummy;
+                dummy = 0;
+        }
+};
+
+template<typename T>
+class LLInitClass
+{
+public:
+        LLInitClass() { sRegister.reference(); }
+
+        static LLRegisterWith<LLInitClassList> sRegister;
+private:
+
+        static void initClass()
+        {
+                llerrs << "No static initClass() method defined for " << typeid(T).name() << llendl;
+        }
+};
+
+template<typename T>
+class LLDestroyClass
+{
+public:
+        LLDestroyClass() { sRegister.reference(); }
+
+        static LLRegisterWith<LLDestroyClassList> sRegister;
+private:
+
+        static void destroyClass()
+        {
+                llerrs << "No static destroyClass() method defined for " << typeid(T).name() << llendl;
+        }
+};
+
+template <typename T> LLRegisterWith<LLInitClassList> LLInitClass<T>::sRegister(&T::initClass);
+template <typename T> LLRegisterWith<LLDestroyClassList> LLDestroyClass<T>::sRegister(&T::destroyClass);
+
+
+template <typename DERIVED>
+class LLParamBlock
+{
+protected:
+        LLParamBlock() { sBlock = (DERIVED*)this; }
+
+        typedef typename boost::add_const<DERIVED>::type Tconst;
+
+        template <typename T>
+        class LLMandatoryParam
+        {
+        public:
+                typedef typename boost::add_const<T>::type T_const;
+
+                LLMandatoryParam(T_const initial_val) : mVal(initial_val), mBlock(sBlock) {}
+                LLMandatoryParam(const LLMandatoryParam<T>& other) : mVal(other.mVal) {}
+
+                DERIVED& operator ()(T_const set_value) { mVal = set_value; return *mBlock; }
+                operator T() const { return mVal; } 
+                T operator=(T_const set_value) { mVal = set_value; return mVal; }
+
+        private: 
+                T       mVal;
+                DERIVED* mBlock;
+        };
+
+        template <typename T>
+        class LLOptionalParam
+        {
+        public:
+                typedef typename boost::add_const<T>::type T_const;
+
+                LLOptionalParam(T_const initial_val) : mVal(initial_val), mBlock(sBlock) {}
+                LLOptionalParam() : mBlock(sBlock) {}
+                LLOptionalParam(const LLOptionalParam<T>& other) : mVal(other.mVal) {}
+
+                DERIVED& operator ()(T_const set_value) { mVal = set_value; return *mBlock; }
+                operator T() const { return mVal; } 
+                T operator=(T_const set_value) { mVal = set_value; return mVal; }
+
+        private:
+                T       mVal;
+                DERIVED* mBlock;
+        };
+
+        // specialization that requires initialization for reference types 
+        template <typename T>
+        class LLOptionalParam <T&>
+        {
+        public:
+                typedef typename boost::add_const<T&>::type T_const;
+
+                LLOptionalParam(T_const initial_val) : mVal(initial_val), mBlock(sBlock) {}
+                LLOptionalParam(const LLOptionalParam<T&>& other) : mVal(other.mVal) {}
+
+                DERIVED& operator ()(T_const set_value) { mVal = set_value; return *mBlock; }
+                operator T&() const { return mVal; } 
+                T& operator=(T_const set_value) { mVal = set_value; return mVal; }
+
+        private:
+                T&      mVal;
+                DERIVED* mBlock;
+        };
+
+        // specialization that initializes pointer params to NULL
+        template<typename T> 
+        class LLOptionalParam<T*>
+        {
+        public:
+                typedef typename boost::add_const<T*>::type T_const;
+
+                LLOptionalParam(T_const initial_val) : mVal(initial_val), mBlock(sBlock) {}
+                LLOptionalParam() : mVal((T*)NULL), mBlock(sBlock)  {}
+                LLOptionalParam(const LLOptionalParam<T*>& other) : mVal(other.mVal) {}
+
+                DERIVED& operator ()(T_const set_value) { mVal = set_value; return *mBlock; }
+                operator T*() const { return mVal; } 
+                T* operator=(T_const set_value) { mVal = set_value; return mVal; }
+        private:
+                T*      mVal;
+                DERIVED* mBlock;
+        };
+
+        static DERIVED* sBlock;
+};
+
+template <typename T> T* LLParamBlock<T>::sBlock = NULL;
+
 #endif
diff --git a/linden/indra/llui/lluiconstants.h b/linden/indra/llui/lluiconstants.h
index 14e7a81..f04062a 100644
--- a/linden/indra/llui/lluiconstants.h
+++ b/linden/indra/llui/lluiconstants.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lluictrl.cpp b/linden/indra/llui/lluictrl.cpp
index b2c14df..9d97312 100644
--- a/linden/indra/llui/lluictrl.cpp
+++ b/linden/indra/llui/lluictrl.cpp
@@ -18,7 +18,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -475,10 +476,10 @@ BOOL LLUICtrl::focusPrevItem(BOOL text_fields_only)
         return focusPrev(result);
 }
 
-LLUICtrl* LLUICtrl::findRootMostFocusRoot() const
+LLUICtrl* LLUICtrl::findRootMostFocusRoot()
 {
-        const LLUICtrl* focus_root = NULL;
-        const LLUICtrl* next_view = this;
+        LLUICtrl* focus_root = NULL;
+        LLUICtrl* next_view = this;
         while(next_view)
         {
                 if (next_view->isFocusRoot())
@@ -487,9 +488,8 @@ LLUICtrl* LLUICtrl::findRootMostFocusRoot() const
                 }
                 next_view = next_view->getParentUICtrl();
         }
-        // since focus_root could be this, need to cast away const to return
-        // a non-const result
-        return const_cast<LLUICtrl*>(focus_root);
+
+        return focus_root;
 }
 
 
@@ -551,19 +551,6 @@ LLView* LLUICtrl::fromXML(LLXMLNodePtr node, LLView* parent, class LLUICtrlFacto
 }
 
 
-// *NOTE: If other classes derive from LLPanel, they will need to be
-// added to this function.
-LLPanel* LLUICtrl::getParentPanel() const
-{
-        LLView* parent = getParent();
-        LLPanel* parent_panel = dynamic_cast<LLPanel*>(parent);
-        while (!parent_panel)
-        {
-                parent = parent->getParent();
-        }
-        return (LLPanel*)(parent);
-}
-
 // Skip over any parents that are not LLUICtrl's
 //  Used in focus logic since only LLUICtrl elements can have focus
 LLUICtrl* LLUICtrl::getParentUICtrl() const
diff --git a/linden/indra/llui/lluictrl.h b/linden/indra/llui/lluictrl.h
index f11ece7..db41af8 100644
--- a/linden/indra/llui/lluictrl.h
+++ b/linden/indra/llui/lluictrl.h
@@ -18,7 +18,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -130,9 +131,7 @@ public:
         void                    setTabStop( BOOL b );
         BOOL                    hasTabStop() const;
 
-        // Returns containing panel/floater or NULL if none found.
-        class LLPanel*  getParentPanel() const;
-        class LLUICtrl* getParentUICtrl() const;
+        LLUICtrl*               getParentUICtrl() const;
 
         void*                   getCallbackUserData() const                                                             { return mCallbackUserData; }
         void                    setCallbackUserData( void* data )                                               { mCallbackUserData = data; }
@@ -143,7 +142,7 @@ public:
         
         static LLView* fromXML(LLXMLNodePtr node, LLView* parent, class LLUICtrlFactory* factory);
 
-        LLUICtrl*               findRootMostFocusRoot() const;
+        LLUICtrl*               findRootMostFocusRoot();
 
         class LLTextInputFilter : public LLQueryFilter, public LLSingleton<LLTextInputFilter>
         {
diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index 07de717..983cc53 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -148,7 +149,11 @@ void LLUICtrlFactory::setupPaths()
         }
 }
 
-
+// static
+const std::vector<std::string>& LLUICtrlFactory::getXUIPaths()
+{
+        return sXUIPaths;
+}
 
 //-----------------------------------------------------------------------------
 // getLayeredXMLNode()
diff --git a/linden/indra/llui/lluictrlfactory.h b/linden/indra/llui/lluictrlfactory.h
index b5b2853..5e7c24e 100644
--- a/linden/indra/llui/lluictrlfactory.h
+++ b/linden/indra/llui/lluictrlfactory.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -77,7 +78,10 @@ public:
 
         static bool getLayeredXMLNode(const std::string &filename, LLXMLNodePtr& root);
 
+        static const std::vector<std::string>& getXUIPaths();
+
 private:
+        bool getLayeredXMLNodeImpl(const std::string &filename, LLXMLNodePtr& root);
 
         typedef std::map<LLHandle<LLPanel>, std::string> built_panel_t;
         built_panel_t mBuiltPanels;
diff --git a/linden/indra/llui/lluifwd.h b/linden/indra/llui/lluifwd.h
index ab8eb63..32d5c9b 100644
--- a/linden/indra/llui/lluifwd.h
+++ b/linden/indra/llui/lluifwd.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lluistring.cpp b/linden/indra/llui/lluistring.cpp
index 974047f..0b76b8e 100644
--- a/linden/indra/llui/lluistring.cpp
+++ b/linden/indra/llui/lluistring.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -31,6 +32,7 @@
 
 #include "linden_common.h"
 #include "lluistring.h"
+#include "llsd.h"
 
 const LLStringUtil::format_map_t LLUIString::sNullArgs;
 
@@ -54,6 +56,18 @@ void LLUIString::setArgList(const LLStringUtil::format_map_t& args)
         format();
 }
 
+void LLUIString::setArgs(const LLSD& sd)
+{
+        if (!sd.isMap()) return;
+        for(LLSD::map_const_iterator sd_it = sd.beginMap();
+                sd_it != sd.endMap();
+                ++sd_it)
+        {
+                setArg(sd_it->first, sd_it->second.asString());
+        }
+        format();
+}
+
 void LLUIString::setArg(const std::string& key, const std::string& replacement)
 {
         mArgs[key] = replacement;
diff --git a/linden/indra/llui/lluistring.h b/linden/indra/llui/lluistring.h
index 5983e1d..aedeca2 100644
--- a/linden/indra/llui/lluistring.h
+++ b/linden/indra/llui/lluistring.h
@@ -18,7 +18,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -50,9 +51,9 @@
 // llinfos << mMessage.getString() << llendl; // outputs "Welcome Steve to Second Life"
 // mMessage.setArg("[USERNAME]", "Joe");
 // llinfos << mMessage.getString() << llendl; // outputs "Welcome Joe to Second Life"
-// mMessage = "Recepción a la [SECONDLIFE] [USERNAME]"
+// mMessage = "Recepci￳n a la [SECONDLIFE] [USERNAME]"
 // mMessage.setArg("[SECONDLIFE]", "Segunda Vida");
-// llinfos << mMessage.getString() << llendl; // outputs "Recepción a la Segunda Vida Joe"
+// llinfos << mMessage.getString() << llendl; // outputs "Recepci￳n a la Segunda Vida Joe"
 
 // Implementation Notes:
 // Attempting to have operator[](const std::string& s) return mArgs[s] fails because we have
@@ -71,6 +72,8 @@ public:
         LLUIString& operator=(const std::string& s) { assign(s); return *this; }
 
         void setArgList(const LLStringUtil::format_map_t& args);
+        void setArgs(const LLStringUtil::format_map_t& args) { setArgList(args); }
+        void setArgs(const class LLSD& sd);
         void setArg(const std::string& key, const std::string& replacement);
 
         const std::string& getString() const { return mResult; }
diff --git a/linden/indra/llui/lluitrans.cpp b/linden/indra/llui/lluitrans.cpp
new file mode 100644
index 0000000..920fe6a
--- /dev/null
+++ b/linden/indra/llui/lluitrans.cpp
@@ -0,0 +1,101 @@
+/**
+ * @file lluitrans.cpp
+ * @brief LLUITrans implementation
+ *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
+ * Copyright (c) 2000-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+
+#include "linden_common.h"
+#include "lluitrans.h"
+#include "llxmlnode.h"
+#include "lluictrlfactory.h"
+#include "llalertdialog.h"
+
+#include <map>
+
+LLUITrans::template_map_t LLUITrans::sStringTemplates;
+
+//static 
+bool LLUITrans::parseStrings(const std::string& xml_filename)
+{
+        LLXMLNodePtr root;
+        BOOL success  = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);
+
+        if (!success || root.isNull() || !root->hasName( "strings" ))
+        {
+                llerrs << "Problem reading strings: " << xml_filename << llendl;
+                return false;
+        }
+        
+        for (LLXMLNode* string = root->getFirstChild();
+                 string != NULL; string = string->getNextSibling())
+        {
+                if (!string->hasName("string"))
+                {
+                        continue;
+                }
+                
+                std::string string_name;
+
+                if (! string->getAttributeString("name", string_name))
+                {
+                        llwarns << "Unable to parse string with no name" << llendl;
+                        continue;
+                }
+        
+                LLUITransTemplate xml_template(string_name, string->getTextContents());
+                sStringTemplates[xml_template.mName] = xml_template;
+        }
+
+        return true;
+}
+
+//static 
+std::string LLUITrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args)
+{
+        template_map_t::iterator iter = sStringTemplates.find(xml_desc);
+
+        if (iter != sStringTemplates.end())
+        {
+                std::string text = iter->second.mText;
+                LLStringUtil::format(text, args);
+                
+                return text;
+        }
+        else
+        {
+                LLSD args;
+                args["STRING_NAME"] = xml_desc;
+                LL_WARNS_ONCE("configuration") << "Missing String in strings.xml: [" << xml_desc << "]" << LL_ENDL;
+                LLNotifications::instance().add("MissingString", args);
+                
+                return xml_desc;
+        }
+}
+
diff --git a/linden/indra/llui/lluitrans.h b/linden/indra/llui/lluitrans.h
new file mode 100644
index 0000000..32fb468
--- /dev/null
+++ b/linden/indra/llui/lluitrans.h
@@ -0,0 +1,87 @@
+/**
+ * @file lluitrans.h
+ * @brief LLUITrans definition
+ *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
+ * Copyright (c) 2000-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_UI_TRANS_H
+#define LL_UI_TRANS_H
+
+#include <map>
+
+/**
+ * @brief String template loaded from strings.xml
+ */
+class LLUITransTemplate
+{
+public:
+        LLUITransTemplate(const std::string& name = LLStringUtil::null, const std::string& text = LLStringUtil::null) : mName(name), mText(text) {}
+
+        std::string mName;
+        std::string mText;
+};
+
+class LLUITrans
+{
+public:
+        LLUITrans();
+
+        /**
+         * @brief Parses the xml file that holds the strings. Used once on startup
+         * @param xml_filename Filename to parse
+         * @returns true if the file was parsed successfully, true if something went wrong
+         */
+        static bool parseStrings(const std::string& xml_filename);
+
+        /**
+         * @brief Returns a translated string
+         * @param xml_desc String's description
+         * @param args A list of substrings to replace in the string
+         * @returns Translated string
+         */
+        static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args);
+
+        /**
+         * @brief Returns a translated string
+         * @param xml_desc String's description
+         * @returns Translated string
+         */
+        static std::string getString(const std::string &xml_desc)
+        {
+                LLStringUtil::format_map_t empty;
+                return getString(xml_desc, empty);
+        }
+        
+
+private:
+        typedef std::map<std::string, LLUITransTemplate > template_map_t;
+        static template_map_t sStringTemplates;
+};
+
+#endif
diff --git a/linden/indra/llui/lluixmltags.h b/linden/indra/llui/lluixmltags.h
index da31136..0456666 100644
--- a/linden/indra/llui/lluixmltags.h
+++ b/linden/indra/llui/lluixmltags.h
@@ -16,7 +16,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llundo.cpp b/linden/indra/llui/llundo.cpp
index 05c8c11..8f57636 100644
--- a/linden/indra/llui/llundo.cpp
+++ b/linden/indra/llui/llundo.cpp
@@ -16,7 +16,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llundo.h b/linden/indra/llui/llundo.h
index 55d164e..b2edb57 100644
--- a/linden/indra/llui/llundo.h
+++ b/linden/indra/llui/llundo.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 9cdf481..444922a 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -18,7 +18,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -85,7 +86,8 @@ LLView::LLView() :
         mLastVisible(TRUE),
         mUseBoundingRect(FALSE),
         mVisible(TRUE),
-        mNextInsertionOrdinal(0)
+        mNextInsertionOrdinal(0),
+        mHoverCursor(UI_CURSOR_ARROW)
 {
 }
 
@@ -102,7 +104,8 @@ LLView::LLView(const std::string& name, BOOL mouse_opaque) :
         mLastVisible(TRUE),
         mUseBoundingRect(FALSE),
         mVisible(TRUE),
-        mNextInsertionOrdinal(0)
+        mNextInsertionOrdinal(0),
+        mHoverCursor(UI_CURSOR_ARROW)
 {
 }
 
@@ -123,7 +126,8 @@ LLView::LLView(
         mLastVisible(TRUE),
         mUseBoundingRect(FALSE),
         mVisible(TRUE),
-        mNextInsertionOrdinal(0)
+        mNextInsertionOrdinal(0),
+        mHoverCursor(UI_CURSOR_ARROW)
 {
 }
 
@@ -657,7 +661,7 @@ BOOL LLView::handleHover(S32 x, S32 y, MASK mask)
         if( !handled 
                 && blockMouseEvent(x, y) )
         {
-                LLUI::sWindow->setCursor(UI_CURSOR_ARROW);
+                LLUI::sWindow->setCursor(mHoverCursor);
                 lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;
                 handled = TRUE;
         }
@@ -705,9 +709,11 @@ BOOL LLView::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_s
                 LLView* viewp = *child_it;
                 S32 local_x = x - viewp->mRect.mLeft;
                 S32 local_y = y - viewp->mRect.mBottom;
+                // Allow tooltips for disabled views so we can explain to the user why
+                // the view is disabled. JC
                 if( viewp->pointInView(local_x, local_y) 
                         && viewp->getVisible() 
-                        && viewp->getEnabled()
+                        // && viewp->getEnabled()
                         && viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ))
                 {
                         // child provided a tooltip, just return
@@ -1257,7 +1263,7 @@ void LLView::draw()
         {
                 LLView *viewp = *child_iter;
 
-                if (viewp->getVisible() && viewp != focus_view)
+                if (viewp->getVisible() && viewp != focus_view && viewp->getRect().isValid())
                 {
                         // Only draw views that are within the root view
                         localRectToScreen(viewp->getRect(),&screenRect);
@@ -1340,7 +1346,7 @@ void LLView::drawDebugRect()
                         y = debug_rect.getHeight()/2;
                         std::string debug_text = llformat("%s (%d x %d)", getName().c_str(),
                                                                                 debug_rect.getWidth(), debug_rect.getHeight());
-                        LLFontGL::sSansSerifSmall->renderUTF8(debug_text, 0, (F32)x, (F32)y, border_color,
+                        LLFontGL::getFontSansSerifSmall()->renderUTF8(debug_text, 0, (F32)x, (F32)y, border_color,
                                                                                                 LLFontGL::HCENTER, LLFontGL::BASELINE, LLFontGL::NORMAL,
                                                                                                 S32_MAX, S32_MAX, NULL, FALSE);
                 }
@@ -1354,7 +1360,8 @@ void LLView::drawChild(LLView* childp, S32 x_offset, S32 y_offset, BOOL force_dr
         {
                 ++sDepth;
 
-                if (childp->getVisible() || force_draw)
+                if ((childp->getVisible() && childp->getRect().isValid()) 
+                        || force_draw)
                 {
                         glMatrixMode(GL_MODELVIEW);
                         LLUI::pushMatrix();
@@ -2544,6 +2551,13 @@ void LLView::initFromXML(LLXMLNodePtr node, LLView* parent)
                 node->getAttributeBOOL("visible", visible);
                 setVisible(visible);
         }
+
+        if (node->hasAttribute("hover_cursor"))
+        {
+                std::string cursor_string;
+                node->getAttributeString("hover_cursor", cursor_string);
+                mHoverCursor = getCursorFromString(cursor_string);
+        }
         
         node->getAttributeBOOL("use_bounding_rect", mUseBoundingRect);
         node->getAttributeBOOL("mouse_opaque", mMouseOpaque);
@@ -2595,19 +2609,40 @@ void LLView::parseFollowsFlags(LLXMLNodePtr node)
         }
 }
 
-
 // static
 LLFontGL* LLView::selectFont(LLXMLNodePtr node)
 {
-        LLFontGL* gl_font = NULL;
-
+        std::string font_name, font_size, font_style;
+        U8 style = 0;
+        
         if (node->hasAttribute("font"))
         {
-                std::string font_name;
                 node->getAttributeString("font", font_name);
+        }
+        
+        if (node->hasAttribute("font_size"))
+        {
+                node->getAttributeString("font_size", font_size);
+        }
 
-                gl_font = LLFontGL::fontFromName(font_name);
+        if (node->hasAttribute("font_style"))
+        {
+                node->getAttributeString("font_style", font_style);
+                style = LLFontGL::getStyleFromString(font_style);
+        }
+
+        if (node->hasAttribute("font-style"))
+        {
+                node->getAttributeString("font-style", font_style);
+                style = LLFontGL::getStyleFromString(font_style);
         }
+
+        if (font_name.empty())
+                return NULL;
+
+        LLFontDescriptor desc(font_name, font_size, style);
+        LLFontGL* gl_font = LLFontGL::getFont(desc);
+
         return gl_font;
 }
 
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index 80dd348..b5a34bd 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -51,6 +52,7 @@
 #include "llxmlnode.h"
 #include "stdenums.h"
 #include "lluistring.h"
+#include "llcursortypes.h"
 
 const U32       FOLLOWS_NONE    = 0x00;
 const U32       FOLLOWS_LEFT    = 0x01;
@@ -484,7 +486,7 @@ public:
                         // did we find *something* with that name?
                         if (child)
                         {
-                                llwarns << "Found child named " << name << " but of wrong type" << llendl;
+                                llwarns << "Found child named " << name << " but of wrong type " << typeid(child).name() << ", expecting " << typeid(T).name() << llendl;
                         }
                         if (create_if_missing)
                         {
@@ -495,6 +497,11 @@ public:
                 return result;
         }
 
+        template <class T> T& getChildRef(const std::string& name, BOOL recurse = TRUE) const
+        {
+                return *getChild<T>(name, recurse, TRUE);
+        }
+
         virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
 
         template <class T> T* createDummyWidget(const std::string& name) const
@@ -649,6 +656,8 @@ private:
         mutable dummy_widget_map_t mDummyWidgets;
 
         boost::signals::connection mControlConnection;
+
+        ECursorType mHoverCursor;
         
 public:
         static BOOL     sDebugRects;    // Draw debug rects behind everything.
diff --git a/linden/indra/llui/llviewborder.cpp b/linden/indra/llui/llviewborder.cpp
index ae24694..d4a9e9d 100644
--- a/linden/indra/llui/llviewborder.cpp
+++ b/linden/indra/llui/llviewborder.cpp
@@ -16,7 +16,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -231,8 +232,7 @@ void LLViewBorder::drawTextures()
         //gGL.color4fv(UI_VERTEX_COLOR.mV);
 
         //gGL.getTexUnit(0)->bind(mTexture);
-        //glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
-        //glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
+        //gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_WRAP);
 
         //drawTextureTrapezoid(   0.f, mBorderWidth, getRect().getWidth(),  0,                                  0 );
         //drawTextureTrapezoid(  90.f, mBorderWidth, getRect().getHeight(), (F32)getRect().getWidth(),0 );
diff --git a/linden/indra/llui/llviewborder.h b/linden/indra/llui/llviewborder.h
index 7f72d54..a40e653 100644
--- a/linden/indra/llui/llviewborder.h
+++ b/linden/indra/llui/llviewborder.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llviewquery.cpp b/linden/indra/llui/llviewquery.cpp
index fe3c308..bdb3d22 100644
--- a/linden/indra/llui/llviewquery.cpp
+++ b/linden/indra/llui/llviewquery.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llviewquery.h b/linden/indra/llui/llviewquery.h
index a8cec09..e87795f 100644
--- a/linden/indra/llui/llviewquery.h
+++ b/linden/indra/llui/llviewquery.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,