Second Life viewer sources 1.19.0.2

63 files changed, 905 insertions, 656 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 03a76a9..3bbdb92 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -38,6 +38,8 @@ Angus Boyd
         VWR-592
 Argent Stonecutter
         VWR-68
+Balp Allen
+    VWR-4157
 Benja Kepler
         VWR-746
 Blakar Ogre
@@ -124,6 +126,7 @@ Hamncheese Omlet
         VWR-333
 Henri Beauchamp
         VWR-1406
+        VWR-4157
 Hikkoshi Sakai
         VWR-429
 Hiro Sommambulist
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index 6cb2e29..16e471d 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -336,7 +336,7 @@ const U32 MAP_ITEM_CLASSIFIED = 0x08;
 
 // Crash reporter behavior
 const char* const CRASH_SETTINGS_FILE = "crash_settings.xml";
-const char* const CRASH_BEHAVIOR_SETTING = "CrashLogBehavior";
+const char* const CRASH_BEHAVIOR_SETTING = "CrashSubmitBehavior";
 const S32 CRASH_BEHAVIOR_ASK = 0;
 const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1;
 const S32 CRASH_BEHAVIOR_NEVER_SEND = 2;
diff --git a/linden/indra/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp
index a577cc7..2a81e5e 100644
--- a/linden/indra/llcommon/llapr.cpp
+++ b/linden/indra/llcommon/llapr.cpp
@@ -293,6 +293,7 @@ bool ll_apr_file_remove(const LLString& filename, apr_pool_t* pool)
         if (s != APR_SUCCESS)
         {
                 llwarns << "ll_apr_file_remove failed on file: " << filename << llendl;
+                ll_apr_warn_status(s);
                 return false;
         }
         return true;
@@ -306,6 +307,7 @@ bool ll_apr_file_rename(const LLString& filename, const LLString& newname, apr_p
         if (s != APR_SUCCESS)
         {
                 llwarns << "ll_apr_file_rename failed on file: " << filename << llendl;
+                ll_apr_warn_status(s);
                 return false;
         }
         return true;
@@ -362,6 +364,7 @@ bool ll_apr_dir_make(const LLString& dirname, apr_pool_t* pool)
         if (s != APR_SUCCESS)
         {
                 llwarns << "ll_apr_file_remove failed on file: " << dirname << llendl;
+                ll_apr_warn_status(s);
                 return false;
         }
         return true;
@@ -375,6 +378,7 @@ bool ll_apr_dir_remove(const LLString& dirname, apr_pool_t* pool)
         if (s != APR_SUCCESS)
         {
                 llwarns << "ll_apr_file_remove failed on file: " << dirname << llendl;
+                ll_apr_warn_status(s);
                 return false;
         }
         return true;
diff --git a/linden/indra/llcommon/llfasttimer.h b/linden/indra/llcommon/llfasttimer.h
index b953960..3ecf176 100644
--- a/linden/indra/llcommon/llfasttimer.h
+++ b/linden/indra/llcommon/llfasttimer.h
@@ -92,6 +92,8 @@ public:
                 
                 // newview specific
                 FTM_MESSAGES,
+                FTM_MOUSEHANDLER,
+                FTM_KEYHANDLER,
                 FTM_REBUILD,
                 FTM_STATESORT,
                 FTM_STATESORT_DRAWABLE,
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 6c5a1ce..e85fa5d 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 19;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 2;
 
 const char * const LL_CHANNEL = "Second Life Release";
 
diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp
index 3823abf..8b1fffa 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -204,8 +204,7 @@ S32 LLCrashLogger::loadCrashBehaviorSetting()
 
 bool LLCrashLogger::saveCrashBehaviorSetting(S32 crash_behavior)
 {
-        if (crash_behavior < CRASH_BEHAVIOR_ASK) return false;
-        if (crash_behavior > CRASH_BEHAVIOR_NEVER_SEND) return false;
+        if (crash_behavior != CRASH_BEHAVIOR_ASK && crash_behavior != CRASH_BEHAVIOR_ALWAYS_SEND) return false;
 
         mCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior);
         std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
@@ -288,18 +287,7 @@ bool LLCrashLogger::init()
                 llinfos << "Show the user dialog" << llendl;
                 mCrashBehavior = CRASH_BEHAVIOR_ASK;
         }
-
-        LLSD server = getOption("user");
-        if(server.isDefined())
-        {
-                mGridName = server.asString();
-                llinfos << "Got userserver " << mGridName << llendl;
-        }
-        else
-        {
-                mGridName = "agni";
-        }
-
+        
         LLSD name = getOption("name");
         if(name.isDefined())
         {       
diff --git a/linden/indra/llmedia/llmediaengine.h b/linden/indra/llmedia/llmediaengine.h
index 264060a..4cae070 100644
--- a/linden/indra/llmedia/llmediaengine.h
+++ b/linden/indra/llmedia/llmediaengine.h
@@ -43,8 +43,10 @@
 #include "message.h"
 
 // older: after a 7.3.1 update version is 120684544 (dec) and 7318000 (hex)
-// current version on my Windows system after a 7.4 update version is 121667584 (dec) and 7408000 (hex)
-#define LL_MIN_QUICKTIME_VERSION   ( 121667584 )        // QT 7.4
+// older: current version on my Windows system after a 7.4 update version is 121667584 (dec) and 7408000 (hex)
+// current version on my Windows system after a 7.4.1 update version is 121733120 (dec) and 7418000 (hex)
+
+#define LL_MIN_QUICKTIME_VERSION   ( 0x7418000 )        // QT 7.4.1
 
 //////////////////////////////////////////////////////////////////////////////
 // media engine singleton
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index 22b5033..96092b4 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -648,12 +648,16 @@ void LLComboBox::showList()
         }
         mList->setFocus(TRUE);
 
+        // register ourselves as a "top" control
+        // effectively putting us into a special draw layer
+        // and not affecting the bounding rectangle calculation
+        gFocusMgr.setTopCtrl(this);
+
         // Show the list and push the button down
         mButton->setToggleState(TRUE);
         mList->setVisible(TRUE);
         
         setUseBoundingRect(TRUE);
-        gFocusMgr.setTopCtrl(this);
 }
 
 void LLComboBox::hideList()
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index 2a70db2..7511449 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -156,6 +156,7 @@ public:
         virtual BOOL    getCanSelect() const                            { return TRUE; }
         virtual BOOL    selectFirstItem()                                       { return setCurrentByIndex(0); }
         virtual BOOL    selectNthItem( S32 index )                      { return setCurrentByIndex(index); }
+        virtual BOOL    selectItemRange( S32 first, S32 last ) { return setCurrentByIndex(first); }
         virtual S32             getFirstSelectedIndex() const           { return getCurrentIndex(); }
         virtual BOOL    setCurrentByID( const LLUUID& id );
         virtual LLUUID  getCurrentID();                         // LLUUID::null if no items in menu
diff --git a/linden/indra/llui/llctrlselectioninterface.h b/linden/indra/llui/llctrlselectioninterface.h
index 121d971..b4d3fc0 100644
--- a/linden/indra/llui/llctrlselectioninterface.h
+++ b/linden/indra/llui/llctrlselectioninterface.h
@@ -58,6 +58,7 @@ public:
 
         virtual BOOL    selectFirstItem() = 0;
         virtual BOOL    selectNthItem( S32 index ) = 0;
+        virtual BOOL    selectItemRange( S32 first, S32 last ) = 0;
 
         virtual S32             getFirstSelectedIndex() const = 0;
 
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 1500f9f..496b67f 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -2735,6 +2735,11 @@ void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater,
         {
                 mTabContainer->selectTabPanel(floaterp);
         }
+        else
+        {
+                // reassert visible tab (hiding new floater if necessary)
+                mTabContainer->selectTab(mTabContainer->getCurrentPanelIndex());
+        }
 
         floaterp->setHost(this);
         if (mMinimized)
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index af8aa21..7430e50 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -356,6 +356,13 @@ BOOL LLPanel::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
         if( getVisible() && getEnabled() && 
                 gFocusMgr.childHasKeyboardFocus(this) && !called_from_parent )
         {
+                // handle user hitting ESC to defocus
+                if (key == KEY_ESCAPE)
+                {
+                        gFocusMgr.setKeyboardFocus(NULL);
+                        return TRUE;
+                }
+
                 LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
                 // If we have a default button, click it when
                 // return is pressed, unless current focus is a return-capturing button
@@ -1322,6 +1329,7 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactor
                         }
                 }
         }
+        layout_stackp->updateLayout();
 
         return layout_stackp;
 }
@@ -1442,10 +1450,14 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
         {
                 // panels that are not fully visible do not count towards shrink headroom
                 if ((*panel_it)->mVisibleAmt < 1.f) 
+                {
                         continue;
+                }
                 // if currently resizing a panel or the panel is flagged as not automatically resizing
                 // only track total available headroom, but don't use it for automatic resize logic
-                if ((*panel_it)->mResizeBar->hasMouseCapture() || (!(*panel_it)->mAutoResize && !force_resize))
+                if ((*panel_it)->mResizeBar->hasMouseCapture() 
+                        || (!(*panel_it)->mAutoResize 
+                                && !force_resize))
                 {
                         if (mOrientation == HORIZONTAL)
                         {
@@ -1498,7 +1510,9 @@ 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 && (force_resize || (*panel_it)->mAutoResize) && !(*panel_it)->mResizeBar->hasMouseCapture()) 
+                if ((*panel_it)->mVisibleAmt == 1.f 
+                        && (force_resize || (*panel_it)->mAutoResize) 
+                        && !(*panel_it)->mResizeBar->hasMouseCapture()) 
                 {
                         if (mOrientation == HORIZONTAL)
                         {
@@ -1506,7 +1520,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                                 if (pixels_to_distribute < 0)
                                 {
                                         // shrink proportionally to amount over minimum
-                                        delta_size = llround((F32)pixels_to_distribute * (F32)(cur_width - (*panel_it)->mMinWidth) / (F32)shrink_headroom_available);
+                                        delta_size = (shrink_headroom_available > 0) ? llround((F32)pixels_to_distribute * (F32)(cur_width - (*panel_it)->mMinWidth) / (F32)shrink_headroom_available) : 0;
                                 }
                                 else
                                 {
@@ -1525,7 +1539,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                                 if (pixels_to_distribute < 0)
                                 {
                                         // shrink proportionally to amount over minimum
-                                        delta_size = llround((F32)pixels_to_distribute * (F32)(cur_height - (*panel_it)->mMinHeight) / (F32)shrink_headroom_available);
+                                        delta_size = (shrink_headroom_available > 0) ? llround((F32)pixels_to_distribute * (F32)(cur_height - (*panel_it)->mMinHeight) / (F32)shrink_headroom_available) : 0;
                                 }
                                 else
                                 {
@@ -1617,9 +1631,10 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
         }
 
         // not enough room to fit existing contents
-        if (!force_resize 
-                && ((cur_y != -mPanelSpacing) 
-                        || (cur_x != mRect.getWidth() + mPanelSpacing)))
+        if (force_resize == FALSE
+                // layout did not complete by reaching target position
+                && ((mOrientation == VERTICAL && cur_y != -mPanelSpacing)
+                        || (mOrientation == HORIZONTAL && cur_x != mRect.getWidth() + mPanelSpacing)))
         {
                 // do another layout pass with all stacked elements contributing
                 // even those that don't usually resize
diff --git a/linden/indra/llui/llradiogroup.h b/linden/indra/llui/llradiogroup.h
index e0a4168..aed8de2 100644
--- a/linden/indra/llui/llradiogroup.h
+++ b/linden/indra/llui/llradiogroup.h
@@ -118,6 +118,7 @@ public:
         /*virtual*/ BOOL        getCanSelect() const                            { return TRUE; }
         /*virtual*/ BOOL        selectFirstItem()                                       { return setSelectedIndex(0); }
         /*virtual*/ BOOL        selectNthItem( S32 index )                      { return setSelectedIndex(index); }
+        /*virtual*/ BOOL        selectItemRange( S32 first, S32 last ) { return setSelectedIndex(first); }
         /*virtual*/ S32         getFirstSelectedIndex() const           { return getSelectedIndex(); }
         /*virtual*/ BOOL        setCurrentByID( const LLUUID& id );
         /*virtual*/ LLUUID      getCurrentID();                         // LLUUID::null if no items in menu
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index d65ebd2..36a7b00 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -518,6 +518,7 @@ LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect,
         mNeedsScroll(FALSE),
         mCanSelect(TRUE),
         mDisplayColumnHeaders(FALSE),
+        mColumnsDirty(FALSE),
         mMaxItemCount(INT_MAX), 
         mMaxContentWidth(0),
         mBackgroundVisible( TRUE ),
@@ -630,7 +631,6 @@ void LLScrollListCtrl::clearRows()
 
         mScrollLines = 0;
         mLastSelected = NULL;
-        calcMaxContentWidth(NULL);
         updateLayout();
         mDirty = FALSE; 
 }
@@ -762,7 +762,7 @@ void LLScrollListCtrl::updateLayout()
         mScrollbar->setDocSize( getItemCount() );
         mScrollbar->setVisible(scrollbar_visible);
 
-        updateColumns();
+        dirtyColumns();
 }
 
 // Attempt to size the control to show all items.
@@ -840,7 +840,6 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL r
                 }
 
                 updateLineHeightInsert(item);
-                calcMaxContentWidth(item);
 
                 updateLayout();
         }
@@ -848,17 +847,14 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL r
         return not_too_big;
 }
 
-void LLScrollListCtrl::calcMaxContentWidth(LLScrollListItem* added_item)
+void LLScrollListCtrl::calcColumnWidths()
 {
         const S32 HEADING_TEXT_PADDING = 30;
         const S32 COLUMN_TEXT_PADDING = 20;
 
-        if (added_item == NULL)
-        {
-                mMaxContentWidth = 0;
-        }
+        mMaxContentWidth = 0;
 
-        S32 item_content_width = 0;
+        S32 max_item_width = 0;
 
         ordered_columns_t::iterator column_itor;
         for (column_itor = mColumnsIndexed.begin(); column_itor != mColumnsIndexed.end(); ++column_itor)
@@ -866,31 +862,37 @@ void LLScrollListCtrl::calcMaxContentWidth(LLScrollListItem* added_item)
                 LLScrollListColumn* column = *column_itor;
                 if (!column) continue;
 
-                if (!added_item)
+                // update column width
+                S32 new_width = column->mWidth;
+                if (column->mRelWidth >= 0)
                 {
-                        // update on all items
-                        column->mMaxContentWidth = column->mHeader ? LLFontGL::sSansSerifSmall->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;
+                        new_width = (S32)llround(column->mRelWidth*mItemListRect.getWidth());
+                }
+                else if (column->mDynamicWidth)
+                {
+                        new_width = (mItemListRect.getWidth() - mTotalStaticColumnWidth) / mNumDynamicWidthColumns;
+                }
 
-                                column->mMaxContentWidth = llmax(LLFontGL::sSansSerifSmall->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
-                        }
+                if (new_width != column->mWidth)
+                {
+                        column->mWidth = new_width;
                 }
-                else
+
+                // 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;
+                item_list::iterator iter;
+                for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
                 {
-                        LLScrollListCell* cellp = added_item->getColumn(column->mIndex);
+                        LLScrollListCell* cellp = (*iter)->getColumn(column->mIndex);
                         if (!cellp) continue;
 
                         column->mMaxContentWidth = llmax(LLFontGL::sSansSerifSmall->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
                 }
 
-                item_content_width += column->mMaxContentWidth;
+                max_item_width += column->mMaxContentWidth;
         }
 
-        mMaxContentWidth = llmax(mMaxContentWidth, item_content_width);
+        mMaxContentWidth = max_item_width;
 }
 
 const S32 SCROLL_LIST_ROW_PAD = 2;
@@ -926,29 +928,9 @@ void LLScrollListCtrl::updateLineHeightInsert(LLScrollListItem* itemp)
 
 void LLScrollListCtrl::updateColumns()
 {
-        mColumnsIndexed.resize(mColumns.size());
-
-        std::map<LLString, LLScrollListColumn>::iterator column_itor;
-        for (column_itor = mColumns.begin(); column_itor != mColumns.end(); ++column_itor)
-        {
-                LLScrollListColumn *column = &column_itor->second;
-                S32 new_width = column->mWidth;
-                if (column->mRelWidth >= 0)
-                {
-                        new_width = (S32)llround(column->mRelWidth*mItemListRect.getWidth());
-                }
-                else if (column->mDynamicWidth)
-                {
-                        new_width = (mItemListRect.getWidth() - mTotalStaticColumnWidth) / mNumDynamicWidthColumns;
-                }
-
-                if (new_width != column->mWidth)
-                {
-                        column->mWidth = new_width;
-                }
-                mColumnsIndexed[column_itor->second.mIndex] = column;
-        }
+        calcColumnWidths();
 
+        // propagate column widths to individual cells
         item_list::iterator iter;
         for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
         {
@@ -963,7 +945,7 @@ void LLScrollListCtrl::updateColumns()
                 }
         }
 
-        // update headers
+        // update column headers
         std::vector<LLScrollListColumn*>::iterator column_ordered_it;
         S32 left = mItemListRect.mLeft;
         LLColumnHeader* last_header = NULL;
@@ -998,6 +980,7 @@ 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)
         {
@@ -1055,28 +1038,42 @@ BOOL LLScrollListCtrl::selectFirstItem()
         return success;
 }
 
-
+// Deselects all other items
+// virtual
 BOOL LLScrollListCtrl::selectNthItem( S32 target_index )
 {
-        if (mItemList.empty()) return FALSE;
+        return selectItemRange(target_index, target_index);
+}
 
-        // Deselects all other items
-        BOOL success = FALSE;
-        S32 index = 0;
+// virtual
+BOOL LLScrollListCtrl::selectItemRange( S32 first_index, S32 last_index )
+{
+        if (mItemList.empty())
+        {
+                return FALSE;
+        }
 
-        target_index = llclamp(target_index, 0, (S32)mItemList.size() - 1);
+        S32 listlen = (S32)mItemList.size();
+        first_index = llclamp(first_index, 0, listlen-1);
+        
+        if (last_index < 0)
+                last_index = listlen-1;
+        else
+                last_index = llclamp(last_index, first_index, listlen-1);
 
-        item_list::iterator iter;
-        for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
+        BOOL success = FALSE;
+        S32 index = 0;
+        for (item_list::iterator iter = mItemList.begin(); iter != mItemList.end(); iter++)
         {
                 LLScrollListItem *itemp = *iter;
-                if( target_index == index )
+                if( index >= first_index && index <= last_index )
                 {
                         if( itemp->getEnabled() )
                         {
                                 selectItem(itemp);
                                 success = TRUE;
-                                mOriginalSelection = target_index;
+                                if (!success)
+                                        mOriginalSelection = first_index;
                         }
                 }
                 else
@@ -1125,7 +1122,7 @@ void LLScrollListCtrl::swapWithPrevious(S32 index)
 
 void LLScrollListCtrl::deleteSingleItem(S32 target_index)
 {
-        if (target_index >= (S32)mItemList.size())
+        if (target_index < 0 || target_index >= (S32)mItemList.size())
         {
                 return;
         }
@@ -1138,7 +1135,7 @@ void LLScrollListCtrl::deleteSingleItem(S32 target_index)
         }
         delete itemp;
         mItemList.erase(mItemList.begin() + target_index);
-        calcMaxContentWidth(NULL);
+        dirtyColumns();
 }
 
 //FIXME: refactor item deletion
@@ -1163,7 +1160,7 @@ void LLScrollListCtrl::deleteItems(const LLSD& sd)
                 }
         }
 
-        calcMaxContentWidth(NULL);
+        dirtyColumns();
 }
 
 void LLScrollListCtrl::deleteSelectedItems()
@@ -1183,7 +1180,7 @@ void LLScrollListCtrl::deleteSelectedItems()
                 }
         }
         mLastSelected = NULL;
-        calcMaxContentWidth(NULL);
+        dirtyColumns();
 }
 
 void LLScrollListCtrl::highlightNthItem(S32 target_index)
@@ -1237,7 +1234,7 @@ S32 LLScrollListCtrl::getItemIndex( LLScrollListItem* target_item )
         return -1;
 }
 
-S32 LLScrollListCtrl::getItemIndex( LLUUID& target_id )
+S32 LLScrollListCtrl::getItemIndex( const LLUUID& target_id )
 {
         S32 index = 0;
         item_list::iterator iter;
@@ -1722,6 +1719,12 @@ void LLScrollListCtrl::draw()
                         gl_rect_2d(background);
                 }
 
+                if (mColumnsDirty)
+                {
+                        updateColumns();
+                        mColumnsDirty = FALSE;
+                }
+
                 drawItems();
 
                 if (mBorder)
@@ -1989,9 +1992,8 @@ BOOL LLScrollListCtrl::handleClick(S32 x, S32 y, MASK mask)
                         gFocusMgr.setMouseCapture(this);
                         mNeedsScroll = TRUE;
                 }
-                // otherwise we already have this item selected
-                // so propagate state of cell to rest of selected column
-                else
+                
+                // propagate state of cell to rest of selected column
                 {
                         // propagate value of this cell to other selected items
                         // and commit the respective widgets
@@ -2537,6 +2539,23 @@ void LLScrollListCtrl::sortItems()
         setSorted(TRUE);
 }
 
+void LLScrollListCtrl::dirtyColumns() 
+{ 
+        mColumnsDirty = TRUE; 
+
+        // need to keep mColumnsIndexed up to date
+        // just in case someone indexes into it immediately
+        mColumnsIndexed.resize(mColumns.size());
+
+        std::map<LLString, LLScrollListColumn>::iterator column_itor;
+        for (column_itor = mColumns.begin(); column_itor != mColumns.end(); ++column_itor)
+        {
+                LLScrollListColumn *column = &column_itor->second;
+                mColumnsIndexed[column_itor->second.mIndex] = column;
+        }
+}
+
+
 S32 LLScrollListCtrl::getScrollPos()
 {
         return mScrollbar->getDocPos();
@@ -2727,6 +2746,12 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
         S32 search_column = 0;
         node->getAttributeS32("search_column", search_column);
 
+        S32 sort_column = -1;
+        node->getAttributeS32("sort_column", sort_column);
+
+        BOOL sort_ascending = TRUE;
+        node->getAttributeBOOL("sort_ascending", sort_ascending);
+
         LLUICtrlCallback callback = NULL;
 
         LLScrollListCtrl* scroll_list = new LLScrollListCtrl(
@@ -2751,6 +2776,11 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 
         scroll_list->setSearchColumn(search_column);
 
+        if (sort_column >= 0)
+        {
+                scroll_list->sortByColumn(sort_column, sort_ascending);
+        }
+
         LLSD columns;
         S32 index = 0;
         LLXMLNodePtr child;
@@ -3026,7 +3056,7 @@ void LLScrollListCtrl::addColumn(const LLSD& column, EAddPosition pos)
                 }
         }
 
-        updateColumns();
+        dirtyColumns();
 }
 
 // static
@@ -3257,13 +3287,14 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                 col_index++;
         }
 
-        S32 num_columns = mColumns.size();
-        for (S32 column = 0; column < num_columns; ++column)
+        // add dummy cells for missing columns
+        for (column_map_t::iterator column_it = mColumns.begin(); column_it != mColumns.end(); ++column_it)
         {
-                if (new_item->getColumn(column) == NULL)
+                S32 column_idx = column_it->second.mIndex;
+                if (new_item->getColumn(column_idx) == NULL)
                 {
-                        LLScrollListColumn* column_ptr = mColumnsIndexed[column];
-                        new_item->setColumn(column, new LLScrollListText("", gResMgr->getRes( LLFONT_SANSSERIF_SMALL ), column_ptr->mWidth, LLFontGL::NORMAL));
+                        LLScrollListColumn* column_ptr = &column_it->second;
+                        new_item->setColumn(column_idx, new LLScrollListText("", gResMgr->getRes( LLFONT_SANSSERIF_SMALL ), column_ptr->mWidth, LLFontGL::NORMAL));
                 }
         }
 
@@ -3665,7 +3696,7 @@ LLView*	LLColumnHeader::findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_d
 void LLColumnHeader::userSetShape(const LLRect& new_rect)
 {
         S32 new_width = new_rect.getWidth();
-        S32 delta_width = new_width - (mRect.getWidth() + mColumn->mParentCtrl->getColumnPadding());
+        S32 delta_width = new_width - (mRect.getWidth() /*+ mColumn->mParentCtrl->getColumnPadding()*/);
 
         if (delta_width != 0)
         {
@@ -3737,6 +3768,8 @@ void LLColumnHeader::userSetShape(const LLRect& new_rect)
                 }
 
                 // tell scroll list to layout columns again
+                // do immediate update to get proper feedback to resize handle
+                // which needs to know how far the resize actually went
                 mColumn->mParentCtrl->updateColumns();
         }
 }
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index ada4f9b..71ba63d 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -97,6 +97,7 @@ public:
         virtual void    draw(const LLColor4& color, const LLColor4& highlight_color) const;
         virtual S32             getContentWidth() const;
         virtual S32             getHeight() const                       { return llround(mFont->getLineHeight()); }
+        virtual void    setValue(LLSD value) { setText(value.asString()); }
         virtual const LLSD              getValue() const                { return LLSD(mText.getString()); }
         virtual BOOL    getVisible() const  { return mVisible; }
         virtual void    highlightText(S32 offset, S32 num_chars) {mHighlightOffset = offset; mHighlightCount = num_chars;}
@@ -440,6 +441,7 @@ public:
         BOOL                    handleClick(S32 x, S32 y, MASK mask);
         BOOL                    selectFirstItem();
         BOOL                    selectNthItem( S32 index );
+        BOOL                    selectItemRange( S32 first, S32 last );
         BOOL                    selectItemAt(S32 x, S32 y, MASK mask);
         
         void                    deleteSingleItem( S32 index );
@@ -459,7 +461,7 @@ public:
         virtual BOOL    getCanSelect() const                            { return mCanSelect; }
 
         S32                             getItemIndex( LLScrollListItem* item );
-        S32                             getItemIndex( LLUUID& item_id );
+        S32                             getItemIndex( const LLUUID& item_id );
 
         LLScrollListItem* addCommentText( const LLString& comment_text, EAddPosition pos = ADD_BOTTOM);
         LLScrollListItem* addSeparator(EAddPosition pos);
@@ -561,7 +563,7 @@ public:
         static void onClickColumn(void *userdata);
 
         void updateColumns();
-        void calcMaxContentWidth(LLScrollListItem* changed_item);
+        void calcColumnWidths();
         S32 getMaxContentWidth() { return mMaxContentWidth; }
 
         void setDisplayHeading(BOOL display);
@@ -596,6 +598,9 @@ public:
 
         S32             selectMultiple( LLDynamicArray<LLUUID> ids );
         void                    sortItems();
+        // manually call this whenever editing list items in place to flag need for resorting
+        void                    setSorted(BOOL sorted);
+        void                    dirtyColumns(); // some operation has potentially affected column layout or ordering
 
 protected:
         // "Full" interface: use this when you're creating a list that has one or more of the following:
@@ -624,7 +629,6 @@ protected:
         void                    selectItem(LLScrollListItem* itemp, BOOL single_select = TRUE);
         void                    deselectItem(LLScrollListItem* itemp);
         void                    commitIfChanged();
-        void                    setSorted(BOOL sorted);
         BOOL                    setSort(S32 column, BOOL ascending);
 
 protected:
@@ -645,6 +649,7 @@ protected:
         BOOL                    mNeedsScroll;
         BOOL                    mCanSelect;
         BOOL                    mDisplayColumnHeaders;
+        BOOL                    mColumnsDirty;
 
         typedef std::deque<LLScrollListItem *> item_list;
         item_list               mItemList;
@@ -686,7 +691,8 @@ protected:
 
         BOOL                    mSorted;
         
-        std::map<LLString, LLScrollListColumn> mColumns;
+        typedef std::map<LLString, LLScrollListColumn> column_map_t;
+        column_map_t mColumns;
 
         BOOL                    mDirty;
         S32                             mOriginalSelection;
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 04d33a6..39398b0 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -973,18 +973,10 @@ BOOL LLView::handleKey(KEY key, MASK mask, BOOL called_from_parent)
                 }
         }
 
-        if( !handled && !called_from_parent)
+        if( !handled && !called_from_parent && mParentView)
         {
-                if (mIsFocusRoot)
-                {
-                        // stop processing at focus root
-                        handled = FALSE;
-                }
-                else if (mParentView)
-                {
-                        // Upward traversal
-                        handled = mParentView->handleKey( key, mask, FALSE );
-                }
+                // Upward traversal
+                handled = mParentView->handleKey( key, mask, FALSE );
         }
         return handled;
 }
@@ -1019,18 +1011,10 @@ BOOL LLView::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
         }
 
 
-        if (!handled && !called_from_parent)
+        if (!handled && !called_from_parent && mParentView)
         {
-                if (mIsFocusRoot)
-                {
-                        // stop processing at focus root
-                        handled = FALSE;
-                }
-                else if(mParentView)
-                {
-                        // Upward traversal
-                        handled = mParentView->handleUnicodeChar(uni_char, FALSE);
-                }
+                // Upward traversal
+                handled = mParentView->handleUnicodeChar(uni_char, FALSE);
         }
 
         return handled;
@@ -1666,7 +1650,12 @@ void LLView::updateBoundingRect()
                 for ( child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
                 {
                         LLView* childp = *child_it;
-                        if (!childp->getVisible()) continue;
+                        // ignore invisible and "top" children when calculating bounding rect
+                        // such as combobox popups
+                        if (!childp->getVisible() || childp == gFocusMgr.getTopCtrl()) 
+                        {
+                                continue;
+                        }
 
                         LLRect child_bounding_rect = childp->getBoundingRect();
 
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 171cc09..e9315c9 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -2198,6 +2198,9 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                 case WM_SYSKEYUP:
                         eat_keystroke = FALSE;
                 case WM_KEYUP:
+                {
+                        LLFastTimer t2(LLFastTimer::FTM_KEYHANDLER);
+
                         if (gDebugWindowProc)
                         {
                                 llinfos << "Debug WindowProc WM_KEYUP "
@@ -2211,7 +2214,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 
                         // pass on to windows
                         break;
-
+                }
                 case WM_IME_SETCONTEXT:
                         if (LLWinImm::isAvailable() && window_imp->mPreeditor)
                         {
@@ -2280,6 +2283,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 
                 case WM_LBUTTONDOWN:
                         {
+                                LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER);
                                 if (LLWinImm::isAvailable() && window_imp->mPreeditor)
                                 {
                                         window_imp->interruptLanguageTextInput();
@@ -2337,6 +2341,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 
                 case WM_LBUTTONUP:
                         {
+                                LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER);
                                 //if (gDebugClicks)
                                 //{
                                 //      llinfos << "WndProc left button up" << llendl;
@@ -2367,6 +2372,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                 case WM_RBUTTONDBLCLK:
                 case WM_RBUTTONDOWN:
                         {
+                                LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER);
                                 if (LLWinImm::isAvailable() && window_imp->mPreeditor)
                                 {
                                         window_imp->interruptLanguageTextInput();
@@ -2397,6 +2403,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 
                 case WM_RBUTTONUP:
                         {
+                                LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER);
                                 // Because we move the cursor position in the app, we need to query
                                 // to find out where the cursor at the time the event is handled.
                                 // If we don't do this, many clicks could get buffered up, and if the
@@ -2423,6 +2430,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                 case WM_MBUTTONDOWN:
 //              case WM_MBUTTONDBLCLK:
                         {
+                                LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER);
                                 if (LLWinImm::isAvailable() && window_imp->mPreeditor)
                                 {
                                         window_imp->interruptLanguageTextInput();
@@ -2453,6 +2461,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 
                 case WM_MBUTTONUP:
                         {
+                                LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER);
                                 // Because we move the cursor position in tllviewerhe app, we need to query
                                 // to find out where the cursor at the time the event is handled.
                                 // If we don't do this, many clicks could get buffered up, and if the
diff --git a/linden/indra/llxml/llcontrol.cpp b/linden/indra/llxml/llcontrol.cpp
index b97498d..b9fa8ff 100644
--- a/linden/indra/llxml/llcontrol.cpp
+++ b/linden/indra/llxml/llcontrol.cpp
@@ -1235,12 +1235,25 @@ void LLControlGroup::resetToDefaults()
 }
 
 //============================================================================
-// FIrst-use
+// First-use
 
+static LLString get_warn_name(const LLString& name)
+{
+        LLString warnname = "Warn" + name;
+        for (LLString::iterator iter = warnname.begin(); iter != warnname.end(); ++iter)
+        {
+                char c = *iter;
+                if (!isalnum(c))
+                {
+                        *iter = '_';
+                }
+        }
+        return warnname;
+}
 
 void LLControlGroup::addWarning(const LLString& name)
 {
-        LLString warnname = "Warn" + name;
+        LLString warnname = get_warn_name(name);
         if(!mNameTable[warnname])
         {
                 LLString comment = LLString("Enables ") + name + LLString(" warning dialog");
@@ -1251,13 +1264,13 @@ void LLControlGroup::addWarning(const LLString& name)
 
 BOOL LLControlGroup::getWarning(const LLString& name)
 {
-        LLString warnname = "Warn" + name;
+        LLString warnname = get_warn_name(name);
         return getBOOL(warnname);
 }
 
 void LLControlGroup::setWarning(const LLString& name, BOOL val)
 {
-        LLString warnname = "Warn" + name;
+        LLString warnname = get_warn_name(name);
         setBOOL(warnname, val);
 }
 
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 8944cb8..76c6915 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.19.0.0";
-CFBundleGetInfoString = "Second Life version 1.19.0.0, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.19.0.2";
+CFBundleGetInfoString = "Second Life version 1.19.0.2, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index 5956f9b..c93fbe0 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
                 </dict>
         </array>
         <key>CFBundleVersion</key>
-        <string>1.19.0.0</string>
+        <string>1.19.0.2</string>
         <key>CSResourcesFileMapped</key>
         <true/>
 </dict>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index c357b8f..2933fe9 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -270,7 +270,7 @@ BOOL gAcceptTOS = FALSE;
 BOOL gAcceptCriticalMessage = FALSE;
 
 LLUUID                          gViewerDigest;  // MD5 digest of the viewer's executable file.
-BOOL gLastExecFroze = FALSE;
+eLastExecEvent gLastExecEvent = LAST_EXEC_NORMAL;
 
 LLSD gDebugInfo;
 
@@ -334,6 +334,7 @@ BOOL gRandomizeFramerate = FALSE;
 BOOL gPeriodicSlowFrame = FALSE;
 
 BOOL gQAMode = FALSE;
+BOOL gLLErrorActivated = FALSE;
 
 ////////////////////////////////////////////////////////////
 // Internal globals... that should be removed.
@@ -355,6 +356,9 @@ static LLString gArgs;
 
 static LLString gOldSettingsFileName;
 static const char* LEGACY_DEFAULT_SETTINGS_FILE = "settings.ini";
+const char* MARKER_FILE_NAME = "SecondLife.exec_marker";
+const char* ERROR_MARKER_FILE_NAME = "SecondLife.error_marker";
+const char* LLERROR_MARKER_FILE_NAME = "SecondLife.llerror_marker";
 static BOOL gDoDisconnect = FALSE;
 static LLString gLaunchFileOnQuit;
 
@@ -957,7 +961,6 @@ LLTextureFetch* LLAppViewer::sTextureFetch = NULL;
 
 LLAppViewer::LLAppViewer() : 
         mMarkerFile(NULL),
-        mLastExecFroze(false),
         mCrashBehavior(CRASH_BEHAVIOR_ASK),
         mReportedCrash(false),
         mNumSessions(0),
@@ -1983,6 +1986,10 @@ void errorCallback(const std::string &error_string)
 #ifndef LL_RELEASE_FOR_DOWNLOAD
         OSMessageBox(error_string.c_str(), "Fatal Error", OSMB_OK);
 #endif
+
+        //Set the ErrorActivated global so we know to create a marker file
+        gLLErrorActivated = true;
+        
         LLError::crashAndLoop(error_string);
 }
 
@@ -2163,7 +2170,7 @@ bool LLAppViewer::initConfiguration()
                 initMarkerFile();
 
 #if LL_SEND_CRASH_REPORTS
-                if (gLastExecFroze)
+                if (gLastExecEvent == LAST_EXEC_FROZE)
                 {
                         llinfos << "Last execution froze, requesting to send crash report." << llendl;
                         //
@@ -2549,6 +2556,27 @@ void LLAppViewer::handleViewerCrash()
         gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath().c_str();
         gDebugInfo["CurrentSimHost"] = gAgent.getRegionHost().getHostName();
 
+        //Write out the crash status file
+        //Use marker file style setup, as that's the simplest, especially since
+        //we're already in a crash situation    
+        if (gDirUtilp)
+        {
+                LLString crash_file_name;
+                if(gLLErrorActivated) crash_file_name = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,LLERROR_MARKER_FILE_NAME);
+                else crash_file_name = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,ERROR_MARKER_FILE_NAME);
+                llinfos << "Creating crash marker file " << crash_file_name << llendl;
+                apr_file_t* crash_file =  ll_apr_file_open(crash_file_name, LL_APR_W);
+                if (crash_file)
+                {
+                        llinfos << "Created crash marker file " << crash_file_name << llendl;
+                }
+                else
+                {
+                        llwarns << "Cannot create error marker file " << crash_file_name << llendl;
+                }
+                apr_file_close(crash_file);
+        }
+        
         if (gMessageSystem && gDirUtilp)
         {
                 std::string filename;
@@ -2575,6 +2603,9 @@ void LLAppViewer::handleViewerCrash()
         pApp->closeDebug();
         LLError::logToFile("");
 
+        // Remove the marker file, since otherwise we'll spawn a process that'll keep it locked
+        pApp->removeMarkerFile();
+        
         // Call to pure virtual, handled by platform specifc llappviewer instance.
         pApp->handleCrashReporting(); 
 
@@ -2592,7 +2623,7 @@ bool LLAppViewer::anotherInstanceRunning()
                 // We create a marker file when the program starts and remove the file when it finishes.
         // If the file is currently locked, that means another process is already running.
 
-        std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.exec_marker");
+        std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, MARKER_FILE_NAME);
         llinfos << "Checking marker file for lock..." << llendl;
 
         // If file doesn't exist, we create it
@@ -2630,71 +2661,69 @@ bool LLAppViewer::anotherInstanceRunning()
 
 void LLAppViewer::initMarkerFile()
 {
-        // *FIX:Mani - an actually cross platform LLFile lib would be nice.
-
-#if LL_SOLARIS
-        struct flock fl;
-        fl.l_whence = SEEK_SET;
-        fl.l_start = 0;
-        fl.l_len = 1;
-#endif
-        // We create a marker file when the program starts and remove the file when it finishes.
-        // If the file is currently locked, that means another process is already running.
-        // If the file exists and isn't locked, we crashed on the last run.
 
-        std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.exec_marker");
+        //First, check for the existence of other files.
+        //There are marker files for two different types of crashes
+        
+        mMarkerFileName = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,MARKER_FILE_NAME);
         llinfos << "Checking marker file for lock..." << llendl;
 
-        FILE* fMarker = LLFile::fopen(marker_file.c_str(), "rb");               // Flawfinder: ignore
+        //We've got 4 things to test for here
+        // - Other Process Running (SecondLife.exec_marker present, locked)
+        // - Freeze (SecondLife.exec_marker present, not locked)
+        // - LLError Crash (SecondLife.llerror_marker present)
+        // - Other Crash (SecondLife.error_marker present)
+        // These checks should also remove these files for the last 2 cases if they currently exist
+
+        //LLError/Error checks. Only one of these should ever happen at a time.
+        LLString llerror_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, LLERROR_MARKER_FILE_NAME);
+        LLString error_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ERROR_MARKER_FILE_NAME);
+        apr_file_t* fMarker = ll_apr_file_open(llerror_marker_file, LL_APR_RB);
+        if(fMarker != NULL)
+        {
+                apr_file_close(fMarker);
+                llinfos << "Last exec LLError crashed, setting LastExecEvent to " << LAST_EXEC_LLERROR_CRASH << llendl;
+                gLastExecEvent = LAST_EXEC_LLERROR_CRASH;
+        }
+
+        fMarker = ll_apr_file_open(error_marker_file, LL_APR_RB);
+        if(fMarker != NULL)
+        {
+                apr_file_close(fMarker);
+                llinfos << "Last exec crashed, setting LastExecEvent to " << LAST_EXEC_OTHER_CRASH << llendl;
+                gLastExecEvent = LAST_EXEC_OTHER_CRASH;
+        }
+
+        ll_apr_file_remove(llerror_marker_file);
+        ll_apr_file_remove(error_marker_file);
+        
+        //Freeze case checks
+        fMarker = ll_apr_file_open(mMarkerFileName, LL_APR_RB);         
         if (fMarker != NULL)
         {
                 // File exists, try opening with write permissions
-                fclose(fMarker);
-                fMarker = LLFile::fopen(marker_file.c_str(), "wb");             // Flawfinder: ignxore
+                apr_file_close(fMarker);
+                fMarker = ll_apr_file_open(mMarkerFileName, LL_APR_WB);
                 if (fMarker == NULL)
                 {
                         // Another instance is running. Skip the rest of these operations.
                         llinfos << "Marker file is locked." << llendl;
                         return;
                 }
-#if LL_DARWIN || LL_LINUX || LL_SOLARIS
-                // Try to lock it. On Mac, this is the only way to test if it's actually locked.
-                if (flock(fileno(fMarker), LOCK_EX | LOCK_NB) == -1)
+                if (apr_file_lock(fMarker, APR_FLOCK_NONBLOCK | APR_FLOCK_EXCLUSIVE) != APR_SUCCESS) //flock(fileno(fMarker), LOCK_EX | LOCK_NB) == -1)
                 {
-                        // Lock failed - somebody else has it.
-                        fclose(fMarker);
+                        apr_file_close(fMarker);
                         llinfos << "Marker file is locked." << llendl;
                         return;
                 }
-#endif
-
                 // No other instances; we'll lock this file now & delete on quit.
-                fclose(fMarker);
-                gLastExecFroze = TRUE;
+                apr_file_close(fMarker);
+                gLastExecEvent = LAST_EXEC_FROZE;
                 llinfos << "Exec marker found: program froze on previous execution" << llendl;
         }
 
         // Create the marker file for this execution & lock it
-//      FILE *fp_executing_marker;
-#if LL_WINDOWS
-        mMarkerFile = LLFile::_fsopen(marker_file.c_str(), "w", _SH_DENYWR);
-#else
-        mMarkerFile = LLFile::fopen(marker_file.c_str(), "w");          // Flawfinder: ignore
-        if (mMarkerFile)
-        {
-                int fd = fileno(mMarkerFile);
-                // Attempt to lock
-#if LL_SOLARIS
-                fl.l_type = F_WRLCK;
-                if (fcntl(fd, F_SETLK, &fl) == -1)
-#else
-                if (flock(fd, LOCK_EX | LOCK_NB) == -1)
-#endif
-                {
-                        llinfos << "Failed to lock file." << llendl;
-                }
-        }
-#endif
+        mMarkerFile =  ll_apr_file_open(mMarkerFileName, LL_APR_W);
         if (mMarkerFile)
         {
                 llinfos << "Marker file created." << llendl;
@@ -2703,20 +2732,14 @@ void LLAppViewer::initMarkerFile()
         {
                 llinfos << "Failed to create marker file." << llendl;
         }
+        if (apr_file_lock(mMarkerFile, APR_FLOCK_NONBLOCK | APR_FLOCK_EXCLUSIVE) != APR_SUCCESS) 
+        {
+                apr_file_close(mMarkerFile);
+                llinfos << "Marker file cannot be locked." << llendl;
+                return;
+        }
 
-#if LL_WINDOWS
-        // Clean up SecondLife.dmp files, to avoid confusion
-        llinfos << "Removing SecondLife.dmp" << llendl;
-        std::string dmp_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "SecondLife.dmp");
-        LLFile::remove(dmp_filename.c_str());
-#endif
-
-        // This is to keep the crash reporter from constantly sending stale message logs
-        // We wipe the message file now.
-        llinfos << "Removing message.log" << llendl;
-        std::string message_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "message.log");
-        LLFile::remove(message_filename.c_str());
-
+        llinfos << "Marker file locked." << llendl;
         llinfos << "Exiting initMarkerFile()." << llendl;
 }
 
@@ -2725,14 +2748,9 @@ void LLAppViewer::removeMarkerFile()
         llinfos << "removeMarkerFile()" << llendl;
         if (mMarkerFile != NULL)
         {
-                fclose(mMarkerFile);
+                ll_apr_file_remove( mMarkerFileName );
                 mMarkerFile = NULL;
         }
-        if( gDirUtilp )
-        {
-                LLString marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.exec_marker");
-                ll_apr_file_remove( marker_file );
-        }
 }
 
 void LLAppViewer::forceQuit()
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 1078d71..ddf51b3 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -115,6 +115,8 @@ public:
 
     bool isInProductionGrid();
 
+        void removeMarkerFile();
+        
     // LLAppViewer testing helpers.
     // *NOTE: These will potentially crash the viewer. Only for debugging.
     virtual void forceErrorLLError();
@@ -148,7 +150,6 @@ private:
 
         bool anotherInstanceRunning(); 
         void initMarkerFile(); 
-        void removeMarkerFile();
     
     void idle(); 
     void idleShutdown();
@@ -163,8 +164,8 @@ private:
 
     bool mSecondInstance; // Is this a second instance of the app?
 
-        FILE *mMarkerFile; // A file created to indicate the app is running.
-        bool mLastExecFroze; // Set on init if the marker file was found.
+        LLString mMarkerFileName;
+        apr_file_t* mMarkerFile; // A file created to indicate the app is running.
 
         LLOSInfo mSysOSInfo; 
         S32 mCrashBehavior;
@@ -224,7 +225,16 @@ extern BOOL gAcceptTOS;
 extern BOOL gAcceptCriticalMessage;
 
 extern LLUUID   gViewerDigest;  // MD5 digest of the viewer's executable file.
-extern BOOL gLastExecFroze; // llstartup
+
+typedef enum 
+{
+        LAST_EXEC_NORMAL = 0,
+        LAST_EXEC_FROZE,
+        LAST_EXEC_LLERROR_CRASH,
+        LAST_EXEC_OTHER_CRASH
+} eLastExecEvent;
+
+extern eLastExecEvent gLastExecEvent; // llstartup
 
 extern U32 gFrameCount;
 extern U32 gForegroundFrameCount;
diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp
index 23a1753..c30c9a6 100644
--- a/linden/indra/newview/llcontroldef.cpp
+++ b/linden/indra/newview/llcontroldef.cpp
@@ -76,9 +76,10 @@
 
 void declare_settings()
 {
-        // Somewhat under 1024 by 768
-        const S32 WINDOW_WIDTH = 800;
-        const S32 WINDOW_HEIGHT = 600;
+        // Somewhat under 1024 by 768, to give space for Windows task bar / Mac menu bar
+        // to emphasize window isn't actually maximized.
+        const S32 WINDOW_WIDTH = 1000;
+        const S32 WINDOW_HEIGHT = 700;
 
         //------------------------------------------------------------------------
         // Color constants
diff --git a/linden/indra/newview/llfasttimerview.cpp b/linden/indra/newview/llfasttimerview.cpp
index 14dc08c..6364fd2 100644
--- a/linden/indra/newview/llfasttimerview.cpp
+++ b/linden/indra/newview/llfasttimerview.cpp
@@ -76,7 +76,9 @@ static LLColor4 green9(0.6f, 1.0f, 0.6f, 1.0f);
 static struct ft_display_info ft_display_table[] =
 {
         { LLFastTimer::FTM_FRAME,                               "Frame",                                &LLColor4::white, 0 },
-        { LLFastTimer::FTM_MESSAGES,                    " Messages",                    &LLColor4::grey1, 0 },
+        { LLFastTimer::FTM_MESSAGES,                    " System Messages",             &LLColor4::grey1, 1 },
+        { LLFastTimer::FTM_MOUSEHANDLER,                "  Mouse",                              &LLColor4::grey1, 0 },
+        { LLFastTimer::FTM_KEYHANDLER,                  "  Keyboard",                   &LLColor4::grey1, 0 },
         { LLFastTimer::FTM_SLEEP,                               " Sleep",                               &LLColor4::grey2, 0 },
         { LLFastTimer::FTM_IDLE,                                " Idle",                                &blue0, 0 },
         { LLFastTimer::FTM_PUMP,                                "  Pump",                               &LLColor4::magenta2, 1 },
@@ -184,14 +186,14 @@ static struct ft_display_info ft_display_table[] =
         { LLFastTimer::FTM_SWAP,                                "  Swap",                       &LLColor4::pink1, 0 },
         { LLFastTimer::FTM_CLIENT_COPY,                 "  Client Copy",        &LLColor4::red1, 1},
         
-//      { LLFastTimer::FTM_TEMP1,                               " Temp1",                       &LLColor4::red1, 0 },
-//      { LLFastTimer::FTM_TEMP2,                               " Temp2",                       &LLColor4::magenta1, 0 },
-//      { LLFastTimer::FTM_TEMP3,                               " Temp3",                       &LLColor4::red2, 0 },
-//      { LLFastTimer::FTM_TEMP4,                               " Temp4",                       &LLColor4::magenta2, 0 },
-//      { LLFastTimer::FTM_TEMP5,                               " Temp5",                       &LLColor4::red3, 0 },
-//      { LLFastTimer::FTM_TEMP6,                               " Temp6",                       &LLColor4::magenta3, 0 },
-//      { LLFastTimer::FTM_TEMP7,                               " Temp7",                       &LLColor4::red4, 0 },
-//      { LLFastTimer::FTM_TEMP8,                               " Temp8",                       &LLColor4::magenta4, 0 },
+        { LLFastTimer::FTM_TEMP1,                               " Temp1",                       &LLColor4::red1, 0 },
+        { LLFastTimer::FTM_TEMP2,                               " Temp2",                       &LLColor4::magenta1, 0 },
+        { LLFastTimer::FTM_TEMP3,                               " Temp3",                       &LLColor4::red2, 0 },
+        { LLFastTimer::FTM_TEMP4,                               " Temp4",                       &LLColor4::magenta2, 0 },
+        { LLFastTimer::FTM_TEMP5,                               " Temp5",                       &LLColor4::red3, 0 },
+        { LLFastTimer::FTM_TEMP6,                               " Temp6",                       &LLColor4::magenta3, 0 },
+        { LLFastTimer::FTM_TEMP7,                               " Temp7",                       &LLColor4::red4, 0 },
+        { LLFastTimer::FTM_TEMP8,                               " Temp8",                       &LLColor4::magenta4, 0 },
 
         { LLFastTimer::FTM_OTHER,                               " Other",                       &red0 }
 };
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 107c271..6233443 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -1034,7 +1034,7 @@ GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder,
                                                    GTK_STOCK_SAVE :
                                                    GTK_STOCK_OPEN),
                                                    GTK_RESPONSE_ACCEPT,
-                                                  NULL);
+                                                  (gchar *)NULL);
                 mStoreFilenames.win = win;
                 mStoreFilenames.contextName = context;
 
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index 877ebca..8432d21 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -135,6 +135,16 @@ LLSD LLSpeakerVoiceModerationEvent::getValue()
         return LLString("voice");
 }
 
+LLSpeakerListChangeEvent::LLSpeakerListChangeEvent(LLSpeakerMgr* source, const LLUUID& speaker_id)
+: LLEvent(source, "Speaker added/removed from speaker mgr"),
+  mSpeakerID(speaker_id)
+{
+}
+
+LLSD LLSpeakerListChangeEvent::getValue()
+{
+        return mSpeakerID;
+}
 
 // helper sort class
 struct LLSortRecentSpeakers
@@ -210,9 +220,9 @@ void* LLFloaterActiveSpeakers::createSpeakersPanel(void* data)
 }
 
 //
-// LLPanelActiveSpeakers::LLSpeakerListener
+// LLPanelActiveSpeakers::SpeakerMuteListener
 //
-bool LLPanelActiveSpeakers::LLSpeakerListener::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+bool LLPanelActiveSpeakers::SpeakerMuteListener::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
         LLPointer<LLSpeaker> speakerp = (LLSpeaker*)event->getSource();
         if (speakerp.isNull()) return false;
@@ -231,6 +241,35 @@ bool LLPanelActiveSpeakers::LLSpeakerListener::handleEvent(LLPointer<LLEvent> ev
 
 
 //
+// LLPanelActiveSpeakers::SpeakerAddListener
+//
+bool LLPanelActiveSpeakers::SpeakerAddListener::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+{
+        mPanel->addSpeaker(event->getValue().asUUID());
+        return true;
+}
+
+
+//
+// LLPanelActiveSpeakers::SpeakerRemoveListener
+//
+bool LLPanelActiveSpeakers::SpeakerRemoveListener::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+{
+        mPanel->removeSpeaker(event->getValue().asUUID());
+        return true;
+}
+
+//
+// LLPanelActiveSpeakers::SpeakerClearListener
+//
+bool LLPanelActiveSpeakers::SpeakerClearListener::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+{
+        mPanel->mSpeakerList->clearRows();
+        return true;
+}
+
+
+//
 // LLPanelActiveSpeakers
 //
 LLPanelActiveSpeakers::LLPanelActiveSpeakers(LLSpeakerMgr* data_source, BOOL show_text_chatters) : 
@@ -243,12 +282,14 @@ LLPanelActiveSpeakers::LLPanelActiveSpeakers(LLSpeakerMgr* data_source, BOOL sho
         mSpeakerMgr(data_source)
 {
         setMouseOpaque(FALSE);
-        mSpeakerListener = new LLSpeakerListener(this);
-}
-
-LLPanelActiveSpeakers::~LLPanelActiveSpeakers()
-{
-        
+        mSpeakerMuteListener = new SpeakerMuteListener(this);
+        mSpeakerAddListener = new SpeakerAddListener(this);
+        mSpeakerRemoveListener = new SpeakerRemoveListener(this);
+        mSpeakerClearListener = new SpeakerClearListener(this);
+
+        mSpeakerMgr->addListener(mSpeakerAddListener, "add");
+        mSpeakerMgr->addListener(mSpeakerRemoveListener, "remove");
+        mSpeakerMgr->addListener(mSpeakerClearListener, "clear");
 }
 
 BOOL LLPanelActiveSpeakers::postBuild()
@@ -283,6 +324,57 @@ BOOL LLPanelActiveSpeakers::postBuild()
         return TRUE;
 }
 
+void LLPanelActiveSpeakers::addSpeaker(const LLUUID& speaker_id)
+{
+        if (mSpeakerList->getItemIndex(speaker_id) >= 0)
+        {
+                // already have this speaker
+                return;
+        }
+
+        LLPointer<LLSpeaker> speakerp = mSpeakerMgr->findSpeaker(speaker_id);
+        if (speakerp)
+        {
+                // since we are forced to sort by text, encode sort order as string
+                LLString speaking_order_sort_string = llformat("%010d", speakerp->mSortIndex);
+
+                LLSD row;
+                row["id"] = speaker_id;
+
+                LLSD& columns = row["columns"];
+
+                columns[0]["column"] = "icon_speaking_status";
+                columns[0]["type"] = "icon";
+                columns[0]["value"] = gViewerArt.getString("icn_active-speakers-dot-lvl0.tga");
+
+                LLString speaker_name;
+                if (speakerp->mDisplayName.empty())
+                {
+                        speaker_name = LLCacheName::getDefaultName();
+                }
+                else
+                {
+                        speaker_name = speakerp->mDisplayName;
+                }
+                columns[1]["column"] = "speaker_name";
+                columns[1]["type"] = "text";
+                columns[1]["value"] = speaker_name;
+
+                columns[2]["column"] = "speaking_status";
+                columns[2]["type"] = "text";
+                
+                // print speaking ordinal in a text-sorting friendly manner
+                columns[2]["value"] = speaking_order_sort_string;
+
+                mSpeakerList->addElement(row);
+        }
+}
+
+void LLPanelActiveSpeakers::removeSpeaker(const LLUUID& speaker_id)
+{
+        mSpeakerList->deleteSingleItem(mSpeakerList->getItemIndex(speaker_id));
+}
+
 void LLPanelActiveSpeakers::handleSpeakerSelect()
 {
         LLUUID speaker_id = mSpeakerList->getValue().asUUID();
@@ -296,8 +388,8 @@ void LLPanelActiveSpeakers::handleSpeakerSelect()
                 childSetValue("moderator_allow_voice", selected_speakerp ? !selected_speakerp->mModeratorMutedVoice : TRUE);
                 childSetValue("moderator_allow_text", selected_speakerp ? !selected_speakerp->mModeratorMutedText : TRUE);
 
-                mSpeakerListener->clearDispatchers();
-                selected_speakerp->addListener(mSpeakerListener);
+                mSpeakerMuteListener->clearDispatchers();
+                selected_speakerp->addListener(mSpeakerMuteListener);
         }
 }
 
@@ -307,159 +399,131 @@ void LLPanelActiveSpeakers::refreshSpeakers()
         LLUUID selected_id = mSpeakerList->getSelectedValue().asUUID();
         S32 scroll_pos = mSpeakerList->getScrollInterface()->getScrollPos();
 
-        BOOL sort_ascending = mSpeakerList->getSortAscending();
-        LLString sort_column = mSpeakerList->getSortColumnName();
-        // TODO: put this in xml
-        // enforces default sort column of speaker status
-        if (sort_column.empty())
-        {
-                sort_column = "speaking_status";
-        }
-
         mSpeakerMgr->update();
 
-        // clear scrolling list widget of names
-        mSpeakerList->clearRows();
+        const LLString icon_image_0 = gViewerArt.getString("icn_active-speakers-dot-lvl0.tga");
+        const LLString icon_image_1 = gViewerArt.getString("icn_active-speakers-dot-lvl1.tga");
+        const LLString icon_image_2 = gViewerArt.getString("icn_active-speakers-dot-lvl2.tga");
+
+
+        std::vector<LLScrollListItem*> items = mSpeakerList->getAllData();
+
+        LLUUID mute_icon_image = LLUUID(gViewerArt.getString("mute_icon.tga"));
 
         LLSpeakerMgr::speaker_list_t speaker_list;
         mSpeakerMgr->getSpeakerList(&speaker_list, mShowTextChatters);
-        for (LLSpeakerMgr::speaker_list_t::const_iterator speaker_it = speaker_list.begin(); speaker_it != speaker_list.end(); ++speaker_it)
+        for (std::vector<LLScrollListItem*>::iterator item_it = items.begin();
+                item_it != items.end();
+                ++item_it)
         {
-                LLUUID speaker_id = (*speaker_it)->mID;
-                LLPointer<LLSpeaker> speakerp = (*speaker_it);
+                LLScrollListItem* itemp = (*item_it);
+                LLUUID speaker_id = itemp->getUUID();
+
+                LLPointer<LLSpeaker> speakerp = mSpeakerMgr->findSpeaker(speaker_id);
+                if (!speakerp)
+                {
+                        continue;
+                }
 
                 // since we are forced to sort by text, encode sort order as string
                 LLString speaking_order_sort_string = llformat("%010d", speakerp->mSortIndex);
 
-                LLSD row;
-                row["id"] = speaker_id;
+                LLScrollListCell* icon_cell = itemp->getColumn(0);
+                if (icon_cell)
+                {
 
-                row["columns"][0]["column"] = "icon_speaking_status";
-                row["columns"][0]["type"] = "icon";
-                LLString icon_image_id;
+                        LLString icon_image_id;
 
-                S32 icon_image_idx = llmin(2, llfloor((speakerp->mSpeechVolume / LLVoiceClient::OVERDRIVEN_POWER_LEVEL) * 3.f));
-                switch(icon_image_idx)
-                {
-                case 0:
-                        icon_image_id = gViewerArt.getString("icn_active-speakers-dot-lvl0.tga");
-                        break;
-                case 1:
-                        icon_image_id = gViewerArt.getString("icn_active-speakers-dot-lvl1.tga");
-                        break;
-                case 2:
-                        icon_image_id = gViewerArt.getString("icn_active-speakers-dot-lvl2.tga");
-                        break;
-                }
-                //if (speakerp->mTyping)
-                //{
-                //      S32 typing_anim_idx = llround(mIconAnimationTimer.getElapsedTimeF32() * TYPING_ANIMATION_FPS) % 3;
-                //      switch(typing_anim_idx)
-                //      {
-                //      case 0:
-                //              row["columns"][0]["overlay"] = LLUUID(gViewerArt.getString("icn_active-speakers-typing1.tga"));
-                //              break;
-                //      case 1:
-                //              row["columns"][0]["overlay"] = LLUUID(gViewerArt.getString("icn_active-speakers-typing2.tga"));
-                //              break;
-                //      case 2:
-                //              row["columns"][0]["overlay"] = LLUUID(gViewerArt.getString("icn_active-speakers-typing3.tga"));
-                //              break;
-                //      default:
-                //              break;
-                //      }
-                //}
-
-                LLColor4 icon_color;
-                if (speakerp->mStatus == LLSpeaker::STATUS_MUTED)
-                {
-                        row["columns"][0]["value"] = gViewerArt.getString("mute_icon.tga");
-                        if(speakerp->mModeratorMutedVoice)
+                        S32 icon_image_idx = llmin(2, llfloor((speakerp->mSpeechVolume / LLVoiceClient::OVERDRIVEN_POWER_LEVEL) * 3.f));
+                        switch(icon_image_idx)
                         {
-                                icon_color.setVec(0.5f, 0.5f, 0.5f, 1.f);
+                        case 0:
+                                icon_image_id = icon_image_0;
+                                break;
+                        case 1:
+                                icon_image_id = icon_image_1;
+                                break;
+                        case 2:
+                                icon_image_id = icon_image_2;
+                                break;
+                        }
+
+                        LLColor4 icon_color;
+                        if (speakerp->mStatus == LLSpeaker::STATUS_MUTED)
+                        {
+                                icon_cell->setValue(mute_icon_image);
+                                if(speakerp->mModeratorMutedVoice)
+                                {
+                                        icon_color.setVec(0.5f, 0.5f, 0.5f, 1.f);
+                                }
+                                else
+                                {
+                                        icon_color.setVec(1.f, 71.f / 255.f, 71.f / 255.f, 1.f);
+                                }
                         }
                         else
                         {
-                                icon_color.setVec(1.f, 71.f / 255.f, 71.f / 255.f, 1.f);
+                                icon_cell->setValue(icon_image_id);
+                                icon_color = speakerp->mDotColor;
+
+                                if (speakerp->mStatus > LLSpeaker::STATUS_VOICE_ACTIVE) // if voice is disabled for this speaker
+                                {
+                                        // non voice speakers have hidden icons, render as transparent
+                                        icon_color.setVec(0.f, 0.f, 0.f, 0.f);
+                                }
                         }
-                }
-                else
-                {
-                        row["columns"][0]["value"] = icon_image_id;
-                        icon_color = speakerp->mDotColor;
 
-                        if (speakerp->mStatus > LLSpeaker::STATUS_VOICE_ACTIVE) // if voice is disabled for this speaker
+                        icon_cell->setColor(icon_color);
+
+                        if (speakerp->mStatus > LLSpeaker::STATUS_VOICE_ACTIVE && speakerp->mStatus != LLSpeaker::STATUS_MUTED) // if voice is disabled for this speaker
                         {
                                 // non voice speakers have hidden icons, render as transparent
-                                icon_color.setVec(0.f, 0.f, 0.f, 0.f);
+                                icon_cell->setColor(LLColor4::transparent);
                         }
                 }
 
-                row["columns"][0]["color"] = icon_color.getValue();
-
-                if (speakerp->mStatus > LLSpeaker::STATUS_VOICE_ACTIVE && speakerp->mStatus != LLSpeaker::STATUS_MUTED) // if voice is disabled for this speaker
-                {
-                        // non voice speakers have hidden icons, render as transparent
-                        row["columns"][0]["color"] = LLColor4(0.f, 0.f, 0.f, 0.f).getValue();
-                }
-                row["columns"][1]["column"] = "speaker_name";
-                row["columns"][1]["type"] = "text";
-                if (speakerp->mStatus == LLSpeaker::STATUS_NOT_IN_CHANNEL)      
+                // update name column
+                LLScrollListCell* name_cell = itemp->getColumn(1);
+                if (name_cell)
                 {
-                        // draw inactive speakers in gray
-                        row["columns"][1]["color"] = LLColor4::grey4.getValue();
-                }
+                        if (speakerp->mStatus == LLSpeaker::STATUS_NOT_IN_CHANNEL)      
+                        {
+                                // draw inactive speakers in gray
+                                name_cell->setColor(LLColor4::grey4);
+                        }
 
-                LLString speaker_name;
-                if (speakerp->mDisplayName.empty())
-                {
-                        speaker_name = LLCacheName::getDefaultName();
-                }
-                else
-                {
-                        speaker_name = speakerp->mDisplayName;
+                        LLString speaker_name;
+                        if (speakerp->mDisplayName.empty())
+                        {
+                                speaker_name = LLCacheName::getDefaultName();
+                        }
+                        else
+                        {
+                                speaker_name = speakerp->mDisplayName;
+                        }
+
+                        if (speakerp->mIsModerator)
+                        {
+                                speaker_name += LLString(" ") + getFormattedUIString("moderator_label");
+                        }
+                        
+                        name_cell->setValue(speaker_name);
+                        ((LLScrollListText*)name_cell)->setFontStyle(speakerp->mIsModerator ? LLFontGL::BOLD : LLFontGL::NORMAL);
                 }
 
-                if (speakerp->mIsModerator)
+                // update speaking order column
+                LLScrollListCell* speaking_status_cell = itemp->getColumn(2);
+                if (speaking_status_cell)
                 {
-                        speaker_name += LLString(" ") + getFormattedUIString("moderator_label");
+                        // print speaking ordinal in a text-sorting friendly manner
+                        speaking_status_cell->setValue(speaking_order_sort_string);
                 }
-                row["columns"][1]["value"] = speaker_name;
-                row["columns"][1]["font-style"] = speakerp->mIsModerator ? "BOLD" : "NORMAL";
-
-                row["columns"][2]["column"] = "speaking_status";
-                row["columns"][2]["type"] = "text";
-                
-                // print speaking ordinal in a text-sorting friendly manner
-                row["columns"][2]["value"] = speaking_order_sort_string;
-
-                mSpeakerList->addElement(row);
         }
         
-        //restore sort order, selection, etc
-        mSpeakerList->sortByColumn(sort_column, sort_ascending);
-
-        // temporarily disable commit callback while restoring original selection
-        mSpeakerList->setCommitCallback(NULL);
-
-        // make sure something is selected
-        if (selected_id.isNull())
-        {
-                mSpeakerList->selectFirstItem();
-                handleSpeakerSelect();
-        }
-        else
-        {
-                // reselect original speaker but don't call handleSpeakerSelect()
-                // as that would change the moderation mute checkboxes before they
-                // have had time to get confirmation from the server
-                mSpeakerList->selectByValue(selected_id);
-        }
-
-        mSpeakerList->setCommitCallback(onSelectSpeaker);
+        // we potentially modified the sort order by touching the list items
+        mSpeakerList->setSorted(FALSE);
 
         LLPointer<LLSpeaker> selected_speakerp = mSpeakerMgr->findSpeaker(selected_id);
-
         
         if (gMuteListp)
         {
@@ -847,6 +911,7 @@ LLPointer<LLSpeaker> LLSpeakerMgr::setSpeaker(const LLUUID& id, const LLString&
                 speakerp->mStatus = status;
                 mSpeakers.insert(std::make_pair(speakerp->mID, speakerp));
                 mSpeakersSorted.push_back(speakerp);
+                fireEvent(new LLSpeakerListChangeEvent(this, speakerp->mID), "add");
         }
         else
         {
@@ -974,6 +1039,8 @@ void LLSpeakerMgr::update()
                 // remove speakers that have been gone too long
                 if (speakerp->mStatus == LLSpeaker::STATUS_NOT_IN_CHANNEL && speakerp->mActivityTimer.hasExpired())
                 {
+                        fireEvent(new LLSpeakerListChangeEvent(this, speakerp->mID), "remove");
+
                         mSpeakers.erase(speakerp->mID);
                         sorted_speaker_it = mSpeakersSorted.erase(sorted_speaker_it);
                 }
@@ -1221,6 +1288,7 @@ void LLActiveSpeakerMgr::updateSpeakerList()
         // always populate from active voice channel
         if (LLVoiceChannel::getCurrentVoiceChannel() != mVoiceChannel)
         {
+                fireEvent(new LLSpeakerListChangeEvent(this, LLUUID::null), "clear");
                 mSpeakers.clear();
                 mSpeakersSorted.clear();
                 mVoiceChannel = LLVoiceChannel::getCurrentVoiceChannel();
diff --git a/linden/indra/newview/llfloateractivespeakers.h b/linden/indra/newview/llfloateractivespeakers.h
index cded35d..1088be3 100644
--- a/linden/indra/newview/llfloateractivespeakers.h
+++ b/linden/indra/newview/llfloateractivespeakers.h
@@ -37,6 +37,7 @@
 #include "llvoiceclient.h"
 #include "llframetimer.h"
 #include "llevent.h"
+#include <list>
 
 class LLScrollListCtrl;
 class LLButton;
@@ -106,7 +107,17 @@ public:
         /*virtual*/ LLSD getValue();
 };
 
-class LLSpeakerMgr
+class LLSpeakerListChangeEvent : public LLEvent
+{
+public:
+        LLSpeakerListChangeEvent(LLSpeakerMgr* source, const LLUUID& speaker_id);
+        /*virtual*/ LLSD getValue();
+
+private:
+        const LLUUID& mSpeakerID;
+};
+
+class LLSpeakerMgr : public LLObservable
 {
 public:
         LLSpeakerMgr(LLVoiceChannel* channelp);
@@ -196,7 +207,6 @@ class LLPanelActiveSpeakers : public LLPanel
 {
 public:
         LLPanelActiveSpeakers(LLSpeakerMgr* data_source, BOOL show_text_chatters);
-        virtual ~LLPanelActiveSpeakers();
 
         /*virtual*/ BOOL postBuild();
 
@@ -222,16 +232,54 @@ public:
         static void     onChangeModerationMode(LLUICtrl* ctrl, void* user_data);
 
 protected:
-        class LLSpeakerListener : public LLSimpleListener
+        class SpeakerMuteListener : public LLSimpleListener
         {
         public:
-                LLSpeakerListener(LLPanelActiveSpeakers* panel) : mPanel(panel) {}
+                SpeakerMuteListener(LLPanelActiveSpeakers* panel) : mPanel(panel) {}
 
                 /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
 
                 LLPanelActiveSpeakers* mPanel;
         };
 
+        friend class SpeakerAddListener;
+        class SpeakerAddListener : public LLSimpleListener
+        {
+        public:
+                SpeakerAddListener(LLPanelActiveSpeakers* panel) : mPanel(panel) {}
+
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+
+                LLPanelActiveSpeakers* mPanel;
+        };
+
+        friend class SpeakerRemoveListener;
+        class SpeakerRemoveListener : public LLSimpleListener
+        {
+        public:
+                SpeakerRemoveListener(LLPanelActiveSpeakers* panel) : mPanel(panel) {}
+
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+
+                LLPanelActiveSpeakers* mPanel;
+        };
+
+
+        friend class SpeakerClearListener;
+        class SpeakerClearListener : public LLSimpleListener
+        {
+        public:
+                SpeakerClearListener(LLPanelActiveSpeakers* panel) : mPanel(panel) {}
+
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+
+                LLPanelActiveSpeakers* mPanel;
+        };
+
+        void addSpeaker(const LLUUID& id);
+        void removeSpeaker(const LLUUID& id);
+
+
         LLScrollListCtrl*       mSpeakerList;
         LLUICtrl*                       mMuteVoiceCtrl;
         LLUICtrl*                       mMuteTextCtrl;
@@ -240,7 +288,10 @@ protected:
         BOOL                            mShowTextChatters;
         LLSpeakerMgr*           mSpeakerMgr;
         LLFrameTimer            mIconAnimationTimer;
-        LLPointer<LLSpeakerListener> mSpeakerListener;
+        LLPointer<SpeakerMuteListener> mSpeakerMuteListener;
+        LLPointer<SpeakerAddListener> mSpeakerAddListener;
+        LLPointer<SpeakerRemoveListener> mSpeakerRemoveListener;
+        LLPointer<SpeakerClearListener> mSpeakerClearListener;
 };
 
 extern LLLocalSpeakerMgr*       gLocalSpeakerMgr;
diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index e6ff76b..0de8698 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -333,7 +333,7 @@ void LLPanelFriends::refreshRightsChangeList()
 
 struct SortFriendsByID
 {
-        bool SortFriendsByID::operator() (const LLScrollListItem* const a, const LLScrollListItem* const b) const
+        bool operator() (const LLScrollListItem* const a, const LLScrollListItem* const b) const
         {
                 return a->getValue().asUUID() < b->getValue().asUUID();
         }
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index ee84537..7a8940d 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -852,15 +852,17 @@ void LLFloaterWorldMap::friendsChanged()
 void LLFloaterWorldMap::buildAvatarIDList()
 {
         LLCtrlListInterface *list = childGetListInterface("friend combo");
-        if (!list) return;
-
+        if (!list)
+        {
+                return;
+        }
+        
     // Delete all but the "None" entry
         S32 list_size = list->getItemCount();
-        while (list_size > 1)
+        if (list_size > 1)
         {
-                list->selectNthItem(1);
+                list->selectItemRange(1, -1);
                 list->operateOnSelection(LLCtrlListInterface::OP_DELETE);
-                --list_size;
         }
 
         LLSD default_column;
@@ -872,11 +874,9 @@ void LLFloaterWorldMap::buildAvatarIDList()
         // Get all of the calling cards for avatar that are currently online
         LLCollectMappableBuddies collector;
         LLAvatarTracker::instance().applyFunctor(collector);
-        LLCollectMappableBuddies::buddy_map_t::iterator it;
-        LLCollectMappableBuddies::buddy_map_t::iterator end;
-        it = collector.mMappable.begin();
-        end = collector.mMappable.end();
-        for( ; it != end; ++it)
+        
+        for (LLCollectMappableBuddies::buddy_map_t::iterator it = collector.mMappable.begin();
+                 it != collector.mMappable.end(); ++it)
         {
                 list->addSimpleElement((*it).first, ADD_BOTTOM, (*it).second);
         }
@@ -889,15 +889,17 @@ void LLFloaterWorldMap::buildAvatarIDList()
 void LLFloaterWorldMap::buildLandmarkIDLists()
 {
         LLCtrlListInterface *list = childGetListInterface("landmark combo");
-        if (!list) return;
+        if (!list)
+        {
+                return;
+        }
 
     // Delete all but the "None" entry
         S32 list_size = list->getItemCount();
-        while (list_size > 1)
+        if (list_size > 1)
         {
-                list->selectNthItem(1);
+                list->selectItemRange(1, -1);
                 list->operateOnSelection(LLCtrlListInterface::OP_DELETE);
-                --list_size;
         }
 
         mLandmarkItemIDList.reset();
@@ -918,6 +920,7 @@ void LLFloaterWorldMap::buildLandmarkIDLists()
                                                                         items,
                                                                         LLInventoryModel::EXCLUDE_TRASH,
                                                                         is_landmark);
+
         std::sort(items.begin(), items.end(), LLViewerInventoryItem::comparePointers());
         
         S32 count = items.count();
@@ -930,7 +933,9 @@ void LLFloaterWorldMap::buildLandmarkIDLists()
                 mLandmarkAssetIDList.put( item->getAssetUUID() );
                 mLandmarkItemIDList.put( item->getUUID() );
         }
+        
         list->sortByColumn("landmark name", TRUE);
+
         list->selectFirstItem();
 }
 
diff --git a/linden/indra/newview/llgroupmgr.cpp b/linden/indra/newview/llgroupmgr.cpp
index 0dd8c6d..af6a6aa 100644
--- a/linden/indra/newview/llgroupmgr.cpp
+++ b/linden/indra/newview/llgroupmgr.cpp
@@ -96,16 +96,16 @@ LLGroupMemberData::~LLGroupMemberData()
 
 void LLGroupMemberData::addRole(const LLUUID& role, LLGroupRoleData* rd)
 {
-        mRoles[role] = rd;
+        mRolesList[role] = rd;
 }
 
 bool LLGroupMemberData::removeRole(const LLUUID& role)
 {
-        std::map<LLUUID,LLGroupRoleData*>::iterator it = mRoles.find(role);
+        role_list_t::iterator it = mRolesList.find(role);
 
-        if (it != mRoles.end())
+        if (it != mRolesList.end())
         {
-                mRoles.erase(it);
+                mRolesList.erase(it);
                 return true;
         }
 
@@ -233,7 +233,7 @@ LLGroupMgrGroupData::LLGroupMgrGroupData(const LLUUID& id) :
 
 BOOL LLGroupMgrGroupData::getRoleData(const LLUUID& role_id, LLRoleData& role_data)
 {
-        std::map<LLUUID,LLRoleData>::const_iterator it;
+        role_data_map_t::const_iterator it;
 
         // Do we have changes for it?
         it = mRoleChanges.find(role_id);
@@ -246,7 +246,7 @@ BOOL LLGroupMgrGroupData::getRoleData(const LLUUID& role_id, LLRoleData& role_da
         }
 
         // Ok, no changes, hasn't been deleted, isn't a new role, just find the role.
-        role_list::const_iterator rit = mRoles.find(role_id);
+        role_list_t::const_iterator rit = mRoles.find(role_id);
         if (rit != mRoles.end())
         {
                 role_data = (*rit).second->getRoleData();
@@ -261,7 +261,7 @@ BOOL LLGroupMgrGroupData::getRoleData(const LLUUID& role_id, LLRoleData& role_da
 void LLGroupMgrGroupData::setRoleData(const LLUUID& role_id, LLRoleData role_data)
 {
         // If this is a newly created group, we need to change the data in the created list.
-        std::map<LLUUID,LLRoleData>::iterator it;
+        role_data_map_t::iterator it;
         it = mRoleChanges.find(role_id);
         if (it != mRoleChanges.end())
         {
@@ -280,7 +280,7 @@ void LLGroupMgrGroupData::setRoleData(const LLUUID& role_id, LLRoleData role_dat
 
         // Not a new role, so put it in the changes list.
         LLRoleData old_role_data;
-        role_iter rit = mRoles.find(role_id);
+        role_list_t::iterator rit = mRoles.find(role_id);
         if (rit != mRoles.end())
         {
                 bool data_change = ( ((*rit).second->mRoleData.mRoleDescription != role_data.mRoleDescription)
@@ -337,7 +337,7 @@ void LLGroupMgrGroupData::createRole(const LLUUID& role_id, LLRoleData role_data
 
 void LLGroupMgrGroupData::deleteRole(const LLUUID& role_id)
 {
-        std::map<LLUUID,LLRoleData>::iterator it;
+        role_data_map_t::iterator it;
 
         // If this was a new role, just discard it.
         it = mRoleChanges.find(role_id);
@@ -404,7 +404,7 @@ void LLGroupMgrGroupData::removeData()
 
 void LLGroupMgrGroupData::removeMemberData()
 {
-        for (member_iter mi = mMembers.begin(); mi != mMembers.end(); ++mi)
+        for (member_list_t::iterator mi = mMembers.begin(); mi != mMembers.end(); ++mi)
         {
                 delete mi->second;
         }
@@ -414,7 +414,7 @@ void LLGroupMgrGroupData::removeMemberData()
 
 void LLGroupMgrGroupData::removeRoleData()
 {
-        for (member_iter mi = mMembers.begin(); mi != mMembers.end(); ++mi)
+        for (member_list_t::iterator mi = mMembers.begin(); mi != mMembers.end(); ++mi)
         {
                 LLGroupMemberData* data = mi->second;
                 if (data)
@@ -423,7 +423,7 @@ void LLGroupMgrGroupData::removeRoleData()
                 }
         }
 
-        for (role_iter ri = mRoles.begin(); ri != mRoles.end(); ++ri)
+        for (role_list_t::iterator ri = mRoles.begin(); ri != mRoles.end(); ++ri)
         {
                 LLGroupRoleData* data = ri->second;
                 delete data;
@@ -436,7 +436,7 @@ void LLGroupMgrGroupData::removeRoleData()
 
 void LLGroupMgrGroupData::removeRoleMemberData()
 {
-        for (member_iter mi = mMembers.begin(); mi != mMembers.end(); ++mi)
+        for (member_list_t::iterator mi = mMembers.begin(); mi != mMembers.end(); ++mi)
         {
                 LLGroupMemberData* data = mi->second;
                 if (data)
@@ -445,7 +445,7 @@ void LLGroupMgrGroupData::removeRoleMemberData()
                 }
         }
 
-        for (role_iter ri = mRoles.begin(); ri != mRoles.end(); ++ri)
+        for (role_list_t::iterator ri = mRoles.begin(); ri != mRoles.end(); ++ri)
         {
                 LLGroupRoleData* data = ri->second;
                 if (data)
@@ -467,8 +467,8 @@ bool LLGroupMgrGroupData::changeRoleMember(const LLUUID& role_id,
                                                                                    const LLUUID& member_id, 
                                                                                    LLRoleMemberChangeType rmc)
 {
-        role_iter ri = mRoles.find(role_id);
-        member_iter mi = mMembers.find(member_id);
+        role_list_t::iterator ri = mRoles.find(role_id);
+        member_list_t::iterator mi = mMembers.find(member_id);
 
         if (ri == mRoles.end()
                 || mi == mMembers.end() )
@@ -511,7 +511,7 @@ bool LLGroupMgrGroupData::changeRoleMember(const LLUUID& role_id,
         role_member.first = role_id;
         role_member.second = member_id;
 
-        change_map::iterator it = mRoleMemberChanges.find(role_member);
+        change_map_t::iterator it = mRoleMemberChanges.find(role_member);
         if (it != mRoleMemberChanges.end())
         {
                 // There was already a role change for this role_member
@@ -554,18 +554,15 @@ void LLGroupMgrGroupData::recalcAllAgentPowers()
 {
         LLGroupMemberData* gmd;
 
-        member_iter mit = mMembers.begin();
-        member_iter mend = mMembers.end();
-        for( ; mit != mend; ++mit)
+        for (member_list_t::iterator mit = mMembers.begin();
+                 mit != mMembers.end(); ++mit)
         {
                 gmd = mit->second;
                 if (!gmd) continue;
 
-                std::map<LLUUID,LLGroupRoleData*>::iterator it = gmd->mRoles.begin();
-                std::map<LLUUID,LLGroupRoleData*>::iterator end = gmd->mRoles.end();
-
                 gmd->mAgentPowers = 0;
-                for ( ; it != end; ++it)
+                for (LLGroupMemberData::role_list_t::iterator it = gmd->mRolesList.begin();
+                         it != gmd->mRolesList.end(); ++it)
                 {
                         LLGroupRoleData* grd = (*it).second;
                         if (!grd) continue;
@@ -577,18 +574,16 @@ void LLGroupMgrGroupData::recalcAllAgentPowers()
 
 void LLGroupMgrGroupData::recalcAgentPowers(const LLUUID& agent_id)
 {
-        member_iter mi = mMembers.find(agent_id);
+        member_list_t::iterator mi = mMembers.find(agent_id);
         if (mi == mMembers.end()) return;
 
         LLGroupMemberData* gmd = mi->second;
 
         if (!gmd) return;
 
-        std::map<LLUUID,LLGroupRoleData*>::iterator it = gmd->mRoles.begin();
-        std::map<LLUUID,LLGroupRoleData*>::iterator end = gmd->mRoles.end();
-
         gmd->mAgentPowers = 0;
-        for ( ; it != end; ++it)
+        for (LLGroupMemberData::role_list_t::iterator it = gmd->mRolesList.begin();
+                 it != gmd->mRolesList.end(); ++it)
         {
                 LLGroupRoleData* grd = (*it).second;
                 if (!grd) continue;
@@ -633,10 +628,8 @@ bool packRoleUpdateMessageBlock(LLMessageSystem* msg,
 void LLGroupMgrGroupData::sendRoleChanges()
 {
         // Commit changes locally
-        std::map<LLUUID,LLRoleData>::iterator it;
-        std::map<LLUUID,LLRoleData>::iterator end;
         LLGroupRoleData* grd;
-        role_iter role_it;
+        role_list_t::iterator role_it;
         LLMessageSystem* msg = gMessageSystem;
         bool start_message = true;
 
@@ -645,16 +638,15 @@ void LLGroupMgrGroupData::sendRoleChanges()
         bool need_power_recalc = false;
 
         // Apply all changes
-        it = mRoleChanges.begin();
-        end = mRoleChanges.end();
-        for ( ; it != end; ++it)
+        for (role_data_map_t::iterator iter = mRoleChanges.begin();
+                 iter != mRoleChanges.end(); )
         {
+                role_data_map_t::iterator it = iter++; // safely incrament iter
                 const LLUUID& role_id = (*it).first;
                 const LLRoleData& role_data = (*it).second;
 
                 // Commit to local data set
                 role_it = mRoles.find((*it).first);
-                LLGroupRoleData* group_role_data = (*role_it).second;
                 if ( (mRoles.end() == role_it 
                                 && RC_CREATE != role_data.mChangeType)
                         || (mRoles.end() != role_it
@@ -662,11 +654,13 @@ void LLGroupMgrGroupData::sendRoleChanges()
                 {
                         continue;
                 }
-
+        
+                // NOTE: role_it is valid EXCEPT for the RC_CREATE case
                 switch (role_data.mChangeType)
                 {
                         case RC_CREATE:
                         {
+                                // NOTE: role_it is NOT valid in this case
                                 grd = new LLGroupRoleData(role_id, role_data, 0);
                                 mRoles[role_id] = grd;
                                 need_role_data = true;
@@ -674,6 +668,7 @@ void LLGroupMgrGroupData::sendRoleChanges()
                         }
                         case RC_DELETE:
                         {
+                                LLGroupRoleData* group_role_data = (*role_it).second;
                                 delete group_role_data;
                                 mRoles.erase(role_it);
                                 need_role_cleanup = true;
@@ -686,7 +681,8 @@ void LLGroupMgrGroupData::sendRoleChanges()
                         case RC_UPDATE_DATA:
                         default: 
                         {
-                                group_role_data->setRoleData(role_data);
+                                LLGroupRoleData* group_role_data = (*role_it).second;
+                                group_role_data->setRoleData(role_data); // NOTE! might modify mRoleChanges!
                                 break;
                         }
                 }
@@ -751,7 +747,7 @@ void LLGroupMgr::clearGroups()
 
 void LLGroupMgr::clearGroupData(const LLUUID& group_id)
 {
-        std::map<LLUUID, LLGroupMgrGroupData*>::iterator iter = mGroups.find(group_id);
+        group_map_t::iterator iter = mGroups.find(group_id);
         if (iter != mGroups.end())
         {
                 delete (*iter).second;
@@ -770,7 +766,7 @@ void LLGroupMgr::removeObserver(LLGroupMgrObserver* observer)
         {
                 return;
         }
-        observer_iter it;
+        observer_multimap_t::iterator it;
         it = mObservers.find(observer->getID());
         while (it != mObservers.end())
         {
@@ -788,7 +784,7 @@ void LLGroupMgr::removeObserver(LLGroupMgrObserver* observer)
 
 LLGroupMgrGroupData* LLGroupMgr::getGroupData(const LLUUID& id)
 {
-        group_iter gi = mGroups.find(id);
+        group_map_t::iterator gi = mGroups.find(id);
 
         if (gi != mGroups.end())
         {
@@ -800,7 +796,7 @@ LLGroupMgrGroupData* LLGroupMgr::getGroupData(const LLUUID& id)
 // static
 void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
 {
-        llinfos << "LLGroupMgr::processGroupMembersReply" << llendl;
+        lldebugs << "LLGroupMgr::processGroupMembersReply" << llendl;
         LLUUID agent_id;
         msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
         if (gAgent.getID() != agent_id)
@@ -854,7 +850,7 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
                                                                                                                                         std::string(online_status),
                                                                                                                                         is_owner);
 #if LL_DEBUG
-                                LLGroupMgrGroupData::member_iter mit = group_datap->mMembers.find(member_id);
+                                LLGroupMgrGroupData::member_list_t::iterator mit = group_datap->mMembers.find(member_id);
                                 if (mit != group_datap->mMembers.end())
                                 {
                                         llinfos << " *** Received duplicate member data for agent " << member_id << llendl;
@@ -894,7 +890,7 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
 //static 
 void LLGroupMgr::processGroupPropertiesReply(LLMessageSystem* msg, void** data)
 {
-        llinfos << "LLGroupMgr::processGroupPropertiesReply" << llendl;
+        lldebugs << "LLGroupMgr::processGroupPropertiesReply" << llendl;
         LLUUID agent_id;
         msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
         if (gAgent.getID() != agent_id)
@@ -961,7 +957,7 @@ void LLGroupMgr::processGroupPropertiesReply(LLMessageSystem* msg, void** data)
 // static
 void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data)
 {
-        llinfos << "LLGroupMgr::processGroupRoleDataReply" << llendl;
+        lldebugs << "LLGroupMgr::processGroupRoleDataReply" << llendl;
         LLUUID agent_id;
         msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
         if (gAgent.getID() != agent_id)
@@ -1028,7 +1024,7 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data)
 // static
 void LLGroupMgr::processGroupRoleMembersReply(LLMessageSystem* msg, void** data)
 {
-        llinfos << "LLGroupMgr::processGroupRoleMembersReply" << llendl;
+        lldebugs << "LLGroupMgr::processGroupRoleMembersReply" << llendl;
         LLUUID agent_id;
         msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
         if (gAgent.getID() != agent_id)
@@ -1061,8 +1057,8 @@ void LLGroupMgr::processGroupRoleMembersReply(LLMessageSystem* msg, void** data)
         LLGroupRoleData* rd = NULL;
         LLGroupMemberData* md = NULL;
 
-        LLGroupMgrGroupData::role_iter ri;
-        LLGroupMgrGroupData::member_iter mi;
+        LLGroupMgrGroupData::role_list_t::iterator ri;
+        LLGroupMgrGroupData::member_list_t::iterator mi;
 
         // If total_pairs == 0, there are no members in any custom roles.
         if (total_pairs > 0)
@@ -1115,9 +1111,8 @@ void LLGroupMgr::processGroupRoleMembersReply(LLMessageSystem* msg, void** data)
                 }
                 else
                 {
-                        LLGroupMgrGroupData::member_iter mi = group_data->mMembers.begin();
-                        LLGroupMgrGroupData::member_iter end = group_data->mMembers.end();
-                        for ( ; mi != end; ++mi)
+                        for (LLGroupMgrGroupData::member_list_t::iterator mi = group_data->mMembers.begin();
+                                 mi != group_data->mMembers.end(); ++mi)
                         {
                                 LLGroupMemberData* data = mi->second;
                                 if (data)
@@ -1138,7 +1133,7 @@ void LLGroupMgr::processGroupRoleMembersReply(LLMessageSystem* msg, void** data)
 // static
 void LLGroupMgr::processGroupTitlesReply(LLMessageSystem* msg, void** data)
 {
-        llinfos << "LLGroupMgr::processGroupTitlesReply" << llendl;
+        lldebugs << "LLGroupMgr::processGroupTitlesReply" << llendl;
         LLUUID agent_id;
         msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
         if (gAgent.getID() != agent_id)
@@ -1188,7 +1183,7 @@ void LLGroupMgr::processGroupTitlesReply(LLMessageSystem* msg, void** data)
 // static
 void LLGroupMgr::processEjectGroupMemberReply(LLMessageSystem* msg, void ** data)
 {
-        llinfos << "processEjectGroupMemberReply" << llendl;
+        lldebugs << "processEjectGroupMemberReply" << llendl;
         LLUUID group_id;
         msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_GroupID, group_id);
         BOOL success;
@@ -1204,7 +1199,7 @@ void LLGroupMgr::processEjectGroupMemberReply(LLMessageSystem* msg, void ** data
 // static
 void LLGroupMgr::processJoinGroupReply(LLMessageSystem* msg, void ** data)
 {
-        llinfos << "processJoinGroupReply" << llendl;
+        lldebugs << "processJoinGroupReply" << llendl;
         LLUUID group_id;
         BOOL success;
         msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_GroupID, group_id);
@@ -1226,7 +1221,7 @@ void LLGroupMgr::processJoinGroupReply(LLMessageSystem* msg, void ** data)
 // static
 void LLGroupMgr::processLeaveGroupReply(LLMessageSystem* msg, void ** data)
 {
-        llinfos << "processLeaveGroupReply" << llendl;
+        lldebugs << "processLeaveGroupReply" << llendl;
         LLUUID group_id;
         BOOL success;
         msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_GroupID, group_id);
@@ -1291,7 +1286,7 @@ LLGroupMgrGroupData* LLGroupMgr::createGroupData(const LLUUID& id)
 {
         LLGroupMgrGroupData* group_datap;
 
-        group_iter existing_group = gGroupMgr->mGroups.find(id);
+        group_map_t::iterator existing_group = gGroupMgr->mGroups.find(id);
         if (existing_group == gGroupMgr->mGroups.end())
         {
                 group_datap = new LLGroupMgrGroupData(id);
@@ -1307,12 +1302,12 @@ LLGroupMgrGroupData* LLGroupMgr::createGroupData(const LLUUID& id)
 
 void LLGroupMgr::notifyObservers(LLGroupChange gc)
 {
-        for (group_iter gi = mGroups.begin(); gi != mGroups.end(); ++gi)
+        for (group_map_t::iterator gi = mGroups.begin(); gi != mGroups.end(); ++gi)
         {
                 if (gi->second->mChanged)
                 {
                         // find all observers for this group id
-                        observer_iter oi = mObservers.find(gi->first);
+                        observer_multimap_t::iterator oi = mObservers.find(gi->first);
                         for (; oi != mObservers.end(); ++oi)
                         {
                                 oi->second->changed(gc);
@@ -1327,9 +1322,9 @@ void LLGroupMgr::addGroup(LLGroupMgrGroupData* group_datap)
         if (mGroups.size() > MAX_CACHED_GROUPS)
         {
                 // get rid of groups that aren't observed
-                for (group_iter gi = mGroups.begin(); gi != mGroups.end() && mGroups.size() > MAX_CACHED_GROUPS / 2; )
+                for (group_map_t::iterator gi = mGroups.begin(); gi != mGroups.end() && mGroups.size() > MAX_CACHED_GROUPS / 2; )
                 {
-                        observer_iter oi = mObservers.find(gi->first);
+                        observer_multimap_t::iterator oi = mObservers.find(gi->first);
                         if (oi == mObservers.end())
                         {
                                 // not observed
@@ -1349,7 +1344,7 @@ void LLGroupMgr::addGroup(LLGroupMgrGroupData* group_datap)
 
 void LLGroupMgr::sendGroupPropertiesRequest(const LLUUID& group_id)
 {
-        llinfos << "LLGroupMgr::sendGroupPropertiesRequest" << llendl;
+        lldebugs << "LLGroupMgr::sendGroupPropertiesRequest" << llendl;
         // This will happen when we get the reply
         //LLGroupMgrGroupData* group_datap = createGroupData(group_id);
         
@@ -1365,7 +1360,7 @@ void LLGroupMgr::sendGroupPropertiesRequest(const LLUUID& group_id)
 
 void LLGroupMgr::sendGroupMembersRequest(const LLUUID& group_id)
 {
-        llinfos << "LLGroupMgr::sendGroupMembersRequest" << llendl;
+        lldebugs << "LLGroupMgr::sendGroupMembersRequest" << llendl;
         LLGroupMgrGroupData* group_datap = createGroupData(group_id);
         if (group_datap->mMemberRequestID.isNull())
         {
@@ -1386,7 +1381,7 @@ void LLGroupMgr::sendGroupMembersRequest(const LLUUID& group_id)
 
 void LLGroupMgr::sendGroupRoleDataRequest(const LLUUID& group_id)
 {
-        llinfos << "LLGroupMgr::sendGroupRoleDataRequest" << llendl;
+        lldebugs << "LLGroupMgr::sendGroupRoleDataRequest" << llendl;
         LLGroupMgrGroupData* group_datap = createGroupData(group_id);
         if (group_datap->mRoleDataRequestID.isNull())
         {
@@ -1407,7 +1402,7 @@ void LLGroupMgr::sendGroupRoleDataRequest(const LLUUID& group_id)
 
 void LLGroupMgr::sendGroupRoleMembersRequest(const LLUUID& group_id)
 {
-        llinfos << "LLGroupMgr::sendGroupRoleMembersRequest" << llendl;
+        lldebugs << "LLGroupMgr::sendGroupRoleMembersRequest" << llendl;
         LLGroupMgrGroupData* group_datap = createGroupData(group_id);
         
         if (group_datap->mRoleMembersRequestID.isNull())
@@ -1441,7 +1436,7 @@ void LLGroupMgr::sendGroupRoleMembersRequest(const LLUUID& group_id)
 
 void LLGroupMgr::sendGroupTitlesRequest(const LLUUID& group_id)
 {
-        llinfos << "LLGroupMgr::sendGroupTitlesRequest" << llendl;
+        lldebugs << "LLGroupMgr::sendGroupTitlesRequest" << llendl;
         LLGroupMgrGroupData* group_datap = createGroupData(group_id);
         
         group_datap->mTitles.clear();
@@ -1460,7 +1455,7 @@ void LLGroupMgr::sendGroupTitlesRequest(const LLUUID& group_id)
 
 void LLGroupMgr::sendGroupTitleUpdate(const LLUUID& group_id, const LLUUID& title_role_id)
 {
-        llinfos << "LLGroupMgr::sendGroupTitleUpdate" << llendl;
+        lldebugs << "LLGroupMgr::sendGroupTitleUpdate" << llendl;
 
         LLMessageSystem* msg = gMessageSystem;
         msg->newMessage("GroupTitleUpdate");
@@ -1474,10 +1469,8 @@ void LLGroupMgr::sendGroupTitleUpdate(const LLUUID& group_id, const LLUUID& titl
 
         // Save the change locally
         LLGroupMgrGroupData* group_datap = createGroupData(group_id);
-        std::vector<LLGroupTitle>::iterator iter = group_datap->mTitles.begin();
-        std::vector<LLGroupTitle>::iterator end = group_datap->mTitles.end();
-        
-        for ( ; iter != end; ++iter)
+        for (std::vector<LLGroupTitle>::iterator iter = group_datap->mTitles.begin();
+                 iter != group_datap->mTitles.end(); ++iter)
         {
                 if (iter->mRoleID == title_role_id)
                 {
@@ -1521,7 +1514,7 @@ void LLGroupMgr::sendCreateGroupRequest(const std::string& name,
 
 void LLGroupMgr::sendUpdateGroupInfo(const LLUUID& group_id)
 {
-        llinfos << "LLGroupMgr::sendUpdateGroupInfo" << llendl;
+        lldebugs << "LLGroupMgr::sendUpdateGroupInfo" << llendl;
         LLGroupMgrGroupData* group_datap = createGroupData(group_id);
 
         LLMessageSystem* msg = gMessageSystem;
@@ -1550,18 +1543,16 @@ void LLGroupMgr::sendUpdateGroupInfo(const LLUUID& group_id)
 
 void LLGroupMgr::sendGroupRoleMemberChanges(const LLUUID& group_id)
 {
-        llinfos << "LLGroupMgr::sendGroupRoleMemberChanges" << llendl;
+        lldebugs << "LLGroupMgr::sendGroupRoleMemberChanges" << llendl;
         LLGroupMgrGroupData* group_datap = createGroupData(group_id);
 
         if (group_datap->mRoleMemberChanges.empty()) return;
 
         LLMessageSystem* msg = gMessageSystem;
 
-        change_map::const_iterator citer = group_datap->mRoleMemberChanges.begin();
-        change_map::const_iterator end = group_datap->mRoleMemberChanges.end();
         bool start_message = true;
-
-        for ( ; citer != end; ++citer)
+        for (LLGroupMgrGroupData::change_map_t::const_iterator citer = group_datap->mRoleMemberChanges.begin();
+                 citer != group_datap->mRoleMemberChanges.end(); ++citer)
         {
                 if (start_message)
                 {
@@ -1618,9 +1609,8 @@ void LLGroupMgr::sendGroupMemberInvites(const LLUUID& group_id, std::map<LLUUID,
         bool start_message = true;
         LLMessageSystem* msg = gMessageSystem;
 
-        std::map<LLUUID,LLUUID>::iterator it = member_role_pairs.begin();
-        std::map<LLUUID,LLUUID>::iterator end = member_role_pairs.end();
-        for ( ; it != end; ++it)
+        for (std::map<LLUUID,LLUUID>::iterator it = member_role_pairs.begin();
+                 it != member_role_pairs.end(); ++it)
         {
                 if (start_message)
                 {
@@ -1660,15 +1650,14 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
         LLGroupMgrGroupData* group_datap = gGroupMgr->getGroupData(group_id);
         if (!group_datap) return;
 
-        std::vector<LLUUID>::iterator it = member_ids.begin();
-        std::vector<LLUUID>::iterator end = member_ids.end();
-        for ( ; it != end; ++it)
+        for (std::vector<LLUUID>::iterator it = member_ids.begin();
+                 it != member_ids.end(); ++it)
         {
                 // Can't use 'eject' to leave a group.
                 if ((*it) == gAgent.getID()) continue;
 
                 // Make sure they are in the group, and we need the member data
-                LLGroupMgrGroupData::member_iter mit = group_datap->mMembers.find(*it);
+                LLGroupMgrGroupData::member_list_t::iterator mit = group_datap->mMembers.find(*it);
                 if (mit != group_datap->mMembers.end())
                 {
                         // Add them to the message
@@ -1693,9 +1682,8 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
                         }
 
                         // Clean up groupmgr
-                        std::map<LLUUID,LLGroupRoleData*>::iterator rit = (*mit).second->roleBegin();
-                        std::map<LLUUID,LLGroupRoleData*>::iterator rend = (*mit).second->roleEnd();
-                        for ( ; rit != rend; ++rit)
+                        for (LLGroupMemberData::role_list_t::iterator rit = (*mit).second->roleBegin();
+                                 rit != (*mit).second->roleEnd(); ++rit)
                         {
                                 if ((*rit).first.notNull())
                                 {
@@ -1715,7 +1703,7 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
 
 void LLGroupMgr::sendGroupRoleChanges(const LLUUID& group_id)
 {
-        llinfos << "LLGroupMgr::sendGroupRoleChanges" << llendl;
+        lldebugs << "LLGroupMgr::sendGroupRoleChanges" << llendl;
         LLGroupMgrGroupData* group_datap = getGroupData(group_id);
 
         if (group_datap && group_datap->pendingRoleChanges())
@@ -1730,7 +1718,7 @@ void LLGroupMgr::sendGroupRoleChanges(const LLUUID& group_id)
 
 void LLGroupMgr::cancelGroupRoleChanges(const LLUUID& group_id)
 {
-        llinfos << "LLGroupMgr::cancelGroupRoleChanges" << llendl;
+        lldebugs << "LLGroupMgr::cancelGroupRoleChanges" << llendl;
         LLGroupMgrGroupData* group_datap = getGroupData(group_id);
 
         if (group_datap) group_datap->cancelRoleChanges();
@@ -1750,11 +1738,10 @@ bool LLGroupMgr::parseRoleActions(const LLString& xml_filename)
         }
 
         LLXMLNodeList role_list;
-        LLXMLNodeList::iterator role_iter;
 
         root->getChildren("action_set", role_list, false);
         
-        for (role_iter = role_list.begin(); role_iter != role_list.end(); ++role_iter)
+        for (LLXMLNodeList::iterator role_iter = role_list.begin(); role_iter != role_list.end(); ++role_iter)
         {
                 LLXMLNodePtr action_set = role_iter->second;
 
diff --git a/linden/indra/newview/llgroupmgr.h b/linden/indra/newview/llgroupmgr.h
index 7cef5ec..89be4bf 100644
--- a/linden/indra/newview/llgroupmgr.h
+++ b/linden/indra/newview/llgroupmgr.h
@@ -58,6 +58,8 @@ class LLGroupMemberData
 friend class LLGroupMgrGroupData;
 
 public:
+        typedef std::map<LLUUID,LLGroupRoleData*> role_list_t;
+        
         LLGroupMemberData(const LLUUID& id, 
                                                 S32 contribution,
                                                 U64 agent_powers,
@@ -75,11 +77,11 @@ public:
         const std::string& getOnlineStatus() const { return mOnlineStatus; }
         void addRole(const LLUUID& role, LLGroupRoleData* rd);
         bool removeRole(const LLUUID& role);
-        void clearRoles() { mRoles.clear(); };
-        std::map<LLUUID,LLGroupRoleData*>::iterator roleBegin() { return mRoles.begin(); }
-        std::map<LLUUID,LLGroupRoleData*>::iterator roleEnd() { return mRoles.end(); }
+        void clearRoles() { mRolesList.clear(); };
+        role_list_t::iterator roleBegin() { return mRolesList.begin(); }
+        role_list_t::iterator roleEnd() { return mRolesList.end(); }
 
-        BOOL isInRole(const LLUUID& role_id) { return (mRoles.find(role_id) != mRoles.end()); }
+        BOOL isInRole(const LLUUID& role_id) { return (mRolesList.find(role_id) != mRolesList.end()); }
 
 protected:
         LLUUID  mID;
@@ -88,7 +90,7 @@ protected:
         std::string     mTitle;
         std::string     mOnlineStatus;
         BOOL    mIsOwner;
-        std::map<LLUUID,LLGroupRoleData*> mRoles;
+        role_list_t mRolesList;
 };
 
 struct LLRoleData
@@ -185,8 +187,6 @@ struct lluuid_pair_less
         }
 };
 
-typedef std::map<lluuid_pair,LLRoleMemberChange,lluuid_pair_less> change_map;
-
 struct LLGroupTitle
 {
         std::string mTitle;
@@ -231,17 +231,16 @@ public:
         BOOL isGroupPropertiesDataComplete() { return mGroupPropertiesDataComplete; }
 
 public:
-        typedef std::map<LLUUID,LLGroupMemberData*> member_list;
-        typedef member_list::iterator member_iter;
-        typedef std::map<LLUUID,LLGroupRoleData*> role_list;
-        typedef role_list::iterator role_iter;
-
-        member_list                     mMembers;
-        role_list                       mRoles;
+        typedef std::map<LLUUID,LLGroupMemberData*> member_list_t;
+        typedef std::map<LLUUID,LLGroupRoleData*> role_list_t;
+        typedef std::map<lluuid_pair,LLRoleMemberChange,lluuid_pair_less> change_map_t;
+        typedef std::map<LLUUID,LLRoleData> role_data_map_t;
+        member_list_t           mMembers;
+        role_list_t                     mRoles;
 
         
-        change_map mRoleMemberChanges;
-        std::map<LLUUID,LLRoleData> mRoleChanges;
+        change_map_t            mRoleMemberChanges;
+        role_data_map_t         mRoleChanges;
 
         std::vector<LLGroupTitle> mTitles;
 
@@ -298,6 +297,8 @@ struct LLRoleActionSet
 
 class LLGroupMgr
 {
+        LOG_CLASS(LLGroupMgr);
+        
 public:
         LLGroupMgr();
         ~LLGroupMgr();
@@ -355,10 +356,10 @@ protected:
         LLGroupMgrGroupData* createGroupData(const LLUUID &id);
 
 protected:
-        typedef std::multimap<LLUUID,LLGroupMgrObserver*>::iterator observer_iter;
-        std::multimap<LLUUID,LLGroupMgrObserver*> mObservers;
-        typedef std::map<LLUUID, LLGroupMgrGroupData*>::iterator group_iter;
-        std::map<LLUUID, LLGroupMgrGroupData*> mGroups;
+        typedef std::multimap<LLUUID,LLGroupMgrObserver*> observer_multimap_t;
+        observer_multimap_t mObservers;
+        typedef std::map<LLUUID, LLGroupMgrGroupData*> group_map_t;
+        group_map_t mGroups;
 };
 
 extern LLGroupMgr* gGroupMgr;
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index b80b80b..193beb9 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1370,9 +1370,13 @@ void LLFloaterIMPanel::draw()
                 }
         }
 
+        // use embedded panel if available
         if (mSpeakerPanel)
         {
-                mSpeakerPanel->refreshSpeakers();
+                if (mSpeakerPanel->getVisible())
+                {
+                        mSpeakerPanel->refreshSpeakers();
+                }
         }
         else
         {
diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp
index 777cbc4..8bf9103 100644
--- a/linden/indra/newview/llmediaremotectrl.cpp
+++ b/linden/indra/newview/llmediaremotectrl.cpp
@@ -67,8 +67,8 @@ void LLMediaRemoteCtrl::build()
 
 BOOL LLMediaRemoteCtrl::postBuild()
 {
-        childSetAction("media_play",LLOverlayBar::mediaPlay,this);
-        childSetAction("music_play",LLOverlayBar::musicPlay,this);
+        childSetAction("media_play",LLOverlayBar::toggleMediaPlay,this);
+        childSetAction("music_play",LLOverlayBar::toggleMusicPlay,this);
 
         childSetAction("expand", onClickExpandBtn, this);       
         return TRUE;
diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp
index e645cc6..4b63b08 100644
--- a/linden/indra/newview/llnamelistctrl.cpp
+++ b/linden/indra/newview/llnamelistctrl.cpp
@@ -224,7 +224,7 @@ LLScrollListItem* LLNameListCtrl::addElement(const LLSD& value, EAddPosition pos
         LLScrollListCell* cell = (LLScrollListCell*)item->getColumn(mNameColumnIndex);
         ((LLScrollListText*)cell)->setText( fullname );
 
-        calcMaxContentWidth(item);
+        dirtyColumns();
 
         // this column is resizable
         LLScrollListColumn* columnp = getColumn(mNameColumnIndex);
@@ -277,9 +277,10 @@ void LLNameListCtrl::refresh(const LLUUID& id, const char* first,
                         cell = (LLScrollListCell*)item->getColumn(mNameColumnIndex);
 
                         ((LLScrollListText*)cell)->setText( fullname );
-                        calcMaxContentWidth(item);
                 }
         }
+
+        dirtyColumns();
 }
 
 
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 9ef2eba..e24cbc7 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -163,7 +163,6 @@ void LLOverlayBar::layoutButtons()
         {
                 LLViewQuery query;
                 LLWidgetTypeFilter widget_filter(WIDGET_TYPE_BUTTON);
-                query.addPreFilter(LLVisibleFilter::getInstance());
                 query.addPreFilter(LLEnabledFilter::getInstance());
                 query.addPreFilter(&widget_filter);
 
@@ -333,7 +332,7 @@ void LLOverlayBar::onClickStandUp(void*)
 // *TODO: Move this into an audio manager abstraction
 
 //static
-void LLOverlayBar::mediaPlay(void*)
+void LLOverlayBar::toggleMediaPlay(void*)
 {
         if (!gOverlayBar)
         {
@@ -361,7 +360,7 @@ void LLOverlayBar::mediaPlay(void*)
 }
 
 //static
-void LLOverlayBar::musicPlay(void*)
+void LLOverlayBar::toggleMusicPlay(void*)
 {
         if (!gOverlayBar)
         {
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 46dbfef..c4bf2cf 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -78,8 +78,8 @@ public:
         static void onClickResetView(void* data);
 
         //static media helper functions
-        static void mediaPlay(void*);
-        static void musicPlay(void*);
+        static void toggleMediaPlay(void*);
+        static void toggleMusicPlay(void*);
 
 protected:      
         static void* createMediaRemote(void* userdata);
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index dd4d6cf..664c9a6 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -575,7 +575,8 @@ LLPanelAvatarWeb::~LLPanelAvatarWeb()
 void LLPanelAvatarWeb::enableControls(BOOL self)
 {       
         childSetEnabled("url_edit",self);
-        childSetVisible("status_text",!self);
+        childSetVisible("status_text",!self && !mURL.empty());
+        childSetText("status_text", LLString::null);
 }
 
 void LLPanelAvatarWeb::setWebURL(std::string url)
@@ -605,6 +606,9 @@ void LLPanelAvatarWeb::setWebURL(std::string url)
         {
                 childSetVisible("profile_html",false);
         }
+
+        BOOL own_avatar = (getPanelAvatar()->getAvatarID() == gAgent.getID() );
+        childSetVisible("status_text",!own_avatar && !mURL.empty());
         
 #if !LL_LIBXUL_ENABLED
         childSetVisible("load",false);
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index 811527e..e8d6b0d 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -676,6 +676,8 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
                 self->mPaidFor = TRUE;
 
                 self->mUpdateBtn->setLabel(self->childGetText("update_txt"));
+
+                self->resetDirty();
     }
 }
 
@@ -823,6 +825,25 @@ void LLPanelClassified::callbackGotPriceForListing(S32 option, LLString text, vo
 
 }
 
+void LLPanelClassified::resetDirty()
+{
+        // Tell all the widgets to reset their dirty state since the ad was just saved
+        if (mSnapshotCtrl)
+                mSnapshotCtrl->resetDirty();
+        if (mNameEditor)
+                mNameEditor->resetDirty();
+        if (mDescEditor)
+                mDescEditor->resetDirty();
+        if (mLocationEditor)
+                mLocationEditor->resetDirty();
+        mLocationChanged = false;
+        if (mCategoryCombo)
+                mCategoryCombo->resetDirty();
+        if (mMatureCheck)
+                mMatureCheck->resetDirty();
+        if (mAutoRenewCheck)
+                mAutoRenewCheck->resetDirty();
+}
 
 // invoked from callbackConfirmPublish
 void LLPanelClassified::confirmPublish(S32 option)
@@ -846,22 +867,7 @@ void LLPanelClassified::confirmPublish(S32 option)
                 tab->setCurrentTabName(mNameEditor->getText());
         }
 
-        // Tell all the widgets to reset their dirty state since the ad was just saved
-        if (mSnapshotCtrl)
-                mSnapshotCtrl->resetDirty();
-        if (mNameEditor)
-                mNameEditor->resetDirty();
-        if (mDescEditor)
-                mDescEditor->resetDirty();
-        if (mLocationEditor)
-                mLocationEditor->resetDirty();
-        mLocationChanged = false;
-        if (mCategoryCombo)
-                mCategoryCombo->resetDirty();
-        if (mMatureCheck)
-                mMatureCheck->resetDirty();
-        if (mAutoRenewCheck)
-                mAutoRenewCheck->resetDirty();
+        resetDirty();
 }
 
 // static
diff --git a/linden/indra/newview/llpanelclassified.h b/linden/indra/newview/llpanelclassified.h
index 9c39d1b..087aae0 100644
--- a/linden/indra/newview/llpanelclassified.h
+++ b/linden/indra/newview/llpanelclassified.h
@@ -95,6 +95,7 @@ public:
 
     void sendClassifiedInfoRequest();
         void sendClassifiedInfoUpdate();
+        void resetDirty();
         void confirmPublish(S32 option);
 
     static void processClassifiedInfoReply(LLMessageSystem* msg, void**);
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 16e2ab7..1ecc2e5 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -762,9 +762,8 @@ void LLPanelGroupGeneral::updateMembers()
 
         all_timer.reset();
         S32 i = 0;
-        LLGroupMgrGroupData::member_iter end = gdatap->mMembers.end();
 
-        for( ; mMemberProgress != end && i<UPDATE_MEMBERS_PER_FRAME; 
+        for( ; mMemberProgress != gdatap->mMembers.end() && i<UPDATE_MEMBERS_PER_FRAME; 
                         ++mMemberProgress, ++i)
         {
                 //llinfos << "Adding " << iter->first << ", " << iter->second->getTitle() << llendl;
@@ -805,7 +804,7 @@ void LLPanelGroupGeneral::updateMembers()
         sAllTime += all_timer.getElapsedTimeF32();
 
         llinfos << "Updated " << i << " of " << UPDATE_MEMBERS_PER_FRAME << "members in the list." << llendl;
-        if (mMemberProgress == end)
+        if (mMemberProgress == gdatap->mMembers.end())
         {
                 llinfos << "   member list completed." << llendl;
                 mListVisibleMembers->setEnabled(TRUE);
diff --git a/linden/indra/newview/llpanelgroupgeneral.h b/linden/indra/newview/llpanelgroupgeneral.h
index 5c8b791..daf7bfa 100644
--- a/linden/indra/newview/llpanelgroupgeneral.h
+++ b/linden/indra/newview/llpanelgroupgeneral.h
@@ -110,7 +110,7 @@ private:
         LLTextBox       *mActiveTitleLabel;
         LLComboBox              *mComboActiveTitle;
 
-        LLGroupMgrGroupData::member_iter mMemberProgress;
+        LLGroupMgrGroupData::member_list_t::iterator mMemberProgress;
 };
 
 #endif
diff --git a/linden/indra/newview/llpanelgroupinvite.cpp b/linden/indra/newview/llpanelgroupinvite.cpp
index 0879ae5..73900f0 100644
--- a/linden/indra/newview/llpanelgroupinvite.cpp
+++ b/linden/indra/newview/llpanelgroupinvite.cpp
@@ -165,7 +165,7 @@ void LLPanelGroupInvite::impl::submitInvitations()
 
 void LLPanelGroupInvite::impl::addRoleNames(LLGroupMgrGroupData* gdatap)
 {
-        LLGroupMgrGroupData::member_iter agent_iter =
+        LLGroupMgrGroupData::member_list_t::iterator agent_iter =
                 gdatap->mMembers.find(gAgent.getID());
 
         //get the member data for the agent if it exists
@@ -191,8 +191,8 @@ void LLPanelGroupInvite::impl::addRoleNames(LLGroupMgrGroupData* gdatap)
                         bool can_assign_limited = gAgent.hasPowerInGroup(mGroupID,
                                                                                                  GP_ROLE_ASSIGN_MEMBER_LIMITED);
 
-                        LLGroupMgrGroupData::role_iter rit = gdatap->mRoles.begin();
-                        LLGroupMgrGroupData::role_iter end = gdatap->mRoles.end();
+                        LLGroupMgrGroupData::role_list_t::iterator rit = gdatap->mRoles.begin();
+                        LLGroupMgrGroupData::role_list_t::iterator end = gdatap->mRoles.end();
 
                         //populate the role list
                         for ( ; rit != end; ++rit)
diff --git a/linden/indra/newview/llpanelgrouproles.cpp b/linden/indra/newview/llpanelgrouproles.cpp
index 3401bee..5a2d9db 100644
--- a/linden/indra/newview/llpanelgrouproles.cpp
+++ b/linden/indra/newview/llpanelgrouproles.cpp
@@ -70,7 +70,7 @@ bool agentCanAddToRole(const LLUUID& group_id,
         }
 
         //make sure the agent is in the group
-        LLGroupMgrGroupData::member_iter mi = gdatap->mMembers.find(gAgent.getID());
+        LLGroupMgrGroupData::member_list_t::iterator mi = gdatap->mMembers.find(gAgent.getID());
         if (mi == gdatap->mMembers.end())
         {
                 return false;
@@ -1010,8 +1010,8 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
         // Build the assigned roles list.
         //////////////////////////////////
         // Add each role to the assigned roles list.
-        LLGroupMgrGroupData::role_iter iter = gdatap->mRoles.begin();
-        LLGroupMgrGroupData::role_iter end  = gdatap->mRoles.end();
+        LLGroupMgrGroupData::role_list_t::iterator iter = gdatap->mRoles.begin();
+        LLGroupMgrGroupData::role_list_t::iterator end  = gdatap->mRoles.end();
 
         BOOL can_eject_members = gAgent.hasPowerInGroup(mGroupID,
                                                                                                         GP_MEMBER_EJECT);
@@ -1052,7 +1052,7 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
                                         if ((*member_iter) == gAgent.getID()) continue;
                                         
                                         // Look up the member data.
-                                        LLGroupMgrGroupData::member_iter mi = 
+                                        LLGroupMgrGroupData::member_list_t::iterator mi = 
                                                                         gdatap->mMembers.find((*member_iter));
                                         if (mi == gdatap->mMembers.end()) continue;
                                         LLGroupMemberData* member_data = (*mi).second;
@@ -1146,7 +1146,7 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
         if (!can_eject_members && !member_is_owner)
         {
                 // Maybe we can eject them because we are an owner...
-                LLGroupMgrGroupData::member_iter mi = gdatap->mMembers.find(gAgent.getID());
+                LLGroupMgrGroupData::member_list_t::iterator mi = gdatap->mMembers.find(gAgent.getID());
                 if (mi != gdatap->mMembers.end())
                 {
                         LLGroupMemberData* member_data = (*mi).second;
@@ -1230,41 +1230,29 @@ void LLPanelGroupMembersSubTab::handleRoleCheck(const LLUUID& role_id,
         LLUUID member_id;
         
 
-        member_role_change_iter           member_end = mMemberRoleChangeData.end();
-        member_role_change_iter           member;
-        role_change_data_map_t           *role_change_datap;
-        role_change_data_map_t::iterator  role_end;
-        role_change_data_map_t::iterator  role;
-
         std::vector<LLScrollListItem*> selection = mMembersList->getAllSelected();
-        if (selection.empty()) return;
-
-        std::vector<LLScrollListItem*>::iterator itor;
-        for (itor = selection.begin() ; 
+        if (selection.empty())
+        {
+                return;
+        }
+        
+        for (std::vector<LLScrollListItem*>::iterator itor = selection.begin() ; 
                  itor != selection.end(); ++itor)
         {
                 member_id = (*itor)->getUUID();
 
                 //see if we requested a change for this member before
-                member = mMemberRoleChangeData.find(member_id);
-                if ( member != member_end )
+                if ( mMemberRoleChangeData.find(member_id) == mMemberRoleChangeData.end() )
                 {
-                        //this member had previously had their role data changed
-                        //so grab it
-                        role_change_datap = (*member).second;
-                }
-                else
-                {
-                        role_change_datap = new role_change_data_map_t;
-                        mMemberRoleChangeData[member_id] = role_change_datap;
+                        mMemberRoleChangeData[member_id] = new role_change_data_map_t;
                 }
+                role_change_data_map_t* role_change_datap = mMemberRoleChangeData[member_id];
 
                 //now check to see if the selected group member
                 //had changed his association with the selected role before
-                role_end = role_change_datap->end();
-                role     = role_change_datap->find(role_id);
 
-                if ( role != role_end )
+                role_change_data_map_t::iterator  role = role_change_datap->find(role_id);
+                if ( role != role_change_datap->end() )
                 {
                         //see if the new change type cancels out the previous change
                         if (role->second != type)
@@ -1454,15 +1442,11 @@ void LLPanelGroupMembersSubTab::applyMemberChanges()
 
         //we need to add all of the changed roles data
         //for each member whose role changed
-        member_role_change_iter member_end = mMemberRoleChangeData.end();
-        member_role_change_iter member     = mMemberRoleChangeData.begin();
-
-        for (; member != member_end; member++)
+        for (member_role_changes_map_t::iterator member = mMemberRoleChangeData.begin();
+                 member != mMemberRoleChangeData.end(); ++member)
         {
-                role_change_data_map_t::iterator role_end = member->second->end();
-                role_change_data_map_t::iterator role     = member->second->begin();
-
-                for (; role != role_end; role++)
+                for (role_change_data_map_t::iterator role = member->second->begin();
+                         role != member->second->end(); ++role)
                 {
                         gdatap->changeRoleMember(role->first, //role_id
                                                                          member->first, //member_id
@@ -1515,11 +1499,6 @@ U64 LLPanelGroupMembersSubTab::getAgentPowersBasedOnRoleChanges(const LLUUID& ag
         //if we are removing a role, we store that role id away
         //and then we have to build the powers up bases on the roles the agent
         //is in
-        member_role_change_iter          member_end = mMemberRoleChangeData.end();
-        member_role_change_iter          member;
-        role_change_data_map_t          *role_change_datap = NULL;
-        role_change_data_map_t::iterator role_end;
-        role_change_data_map_t::iterator role;
 
         LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
         if (!gdatap) 
@@ -1536,8 +1515,9 @@ U64 LLPanelGroupMembersSubTab::getAgentPowersBasedOnRoleChanges(const LLUUID& ag
         }
 
         //see if there are unsaved role changes for this agent
-        member = mMemberRoleChangeData.find(agent_id);
-        if ( member != member_end )
+        role_change_data_map_t* role_change_datap = NULL;
+        member_role_changes_map_t::iterator member = mMemberRoleChangeData.find(agent_id);
+        if ( member != mMemberRoleChangeData.end() )
         {
                 //this member has unsaved role changes
                 //so grab them
@@ -1550,13 +1530,13 @@ U64 LLPanelGroupMembersSubTab::getAgentPowersBasedOnRoleChanges(const LLUUID& ag
         {
                 std::vector<LLUUID> roles_to_be_removed;
 
-                role_end = role_change_datap->end();
-                role     = role_change_datap->begin();
-
-                for (; role != role_end; role++)
+                for (role_change_data_map_t::iterator role = role_change_datap->begin();
+                         role != role_change_datap->end(); ++ role)
                 {
                         if ( role->second == RMC_ADD )
+                        {
                                 new_powers |= gdatap->getRolePowers(role->first);
+                        }
                         else
                         {
                                 roles_to_be_removed.push_back(role->first);
@@ -1565,12 +1545,8 @@ U64 LLPanelGroupMembersSubTab::getAgentPowersBasedOnRoleChanges(const LLUUID& ag
 
                 //loop over the member's current roles, summing up
                 //the powers (not including the role we are removing)
-                std::map<LLUUID,LLGroupRoleData*>::iterator current_role =
-                        member_data->roleBegin();
-                std::map<LLUUID,LLGroupRoleData*>::iterator end_role = 
-                        member_data->roleEnd();
-
-                for (; current_role != end_role; current_role++)
+                for (LLGroupMemberData::role_list_t::iterator current_role = member_data->roleBegin();
+                         current_role != member_data->roleEnd(); ++current_role)
                 {
                         bool role_in_remove_list =
                                 (std::find(roles_to_be_removed.begin(),
@@ -1603,13 +1579,10 @@ bool LLPanelGroupMembersSubTab::getRoleChangeType(const LLUUID& member_id,
                                                                                                   const LLUUID& role_id,
                                                                                                   LLRoleMemberChangeType& type)
 {
-        member_role_change_iter           member_changes_iter;
-        role_change_data_map_t::iterator  role_changes_iter;
-
-        member_changes_iter = mMemberRoleChangeData.find(member_id);
+        member_role_changes_map_t::iterator member_changes_iter = mMemberRoleChangeData.find(member_id);
         if ( member_changes_iter != mMemberRoleChangeData.end() )
         {
-                role_changes_iter = member_changes_iter->second->find(role_id);
+                role_change_data_map_t::iterator role_changes_iter = member_changes_iter->second->find(role_id);
                 if ( role_changes_iter != member_changes_iter->second->end() )
                 {
                         type = role_changes_iter->second;
@@ -1707,7 +1680,7 @@ void LLPanelGroupMembersSubTab::updateMembers()
                 return;
         }
                 
-        LLGroupMgrGroupData::member_iter end = gdatap->mMembers.end();
+        LLGroupMgrGroupData::member_list_t::iterator end = gdatap->mMembers.end();
 
         char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
         char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
@@ -1997,8 +1970,8 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc)
 
                 LLScrollListItem* item = NULL;
 
-                LLGroupMgrGroupData::role_iter rit = gdatap->mRoles.begin();
-                LLGroupMgrGroupData::role_iter end = gdatap->mRoles.end();
+                LLGroupMgrGroupData::role_list_t::iterator rit = gdatap->mRoles.begin();
+                LLGroupMgrGroupData::role_list_t::iterator end = gdatap->mRoles.end();
 
                 for ( ; rit != end; ++rit)
                 {
@@ -2181,8 +2154,8 @@ void LLPanelGroupRolesSubTab::buildMembersList()
         if (item->getUUID().isNull())
         {
                 // Special cased 'Everyone' role
-                LLGroupMgrGroupData::member_iter mit = gdatap->mMembers.begin();
-                LLGroupMgrGroupData::member_iter end = gdatap->mMembers.end();
+                LLGroupMgrGroupData::member_list_t::iterator mit = gdatap->mMembers.begin();
+                LLGroupMgrGroupData::member_list_t::iterator end = gdatap->mMembers.end();
                 for ( ; mit != end; ++mit)
                 {
                         mAssignedMembersList->addNameItem((*mit).first);
@@ -2190,7 +2163,7 @@ void LLPanelGroupRolesSubTab::buildMembersList()
         }
         else
         {
-                LLGroupMgrGroupData::role_iter rit = gdatap->mRoles.find(item->getUUID());
+                LLGroupMgrGroupData::role_list_t::iterator rit = gdatap->mRoles.find(item->getUUID());
                 if (rit != gdatap->mRoles.end())
                 {
                         LLGroupRoleData* rdatap = (*rit).second;
@@ -2643,8 +2616,8 @@ void LLPanelGroupActionsSubTab::handleActionSelect()
 
         if (gdatap->isMemberDataComplete())
         {
-                LLGroupMgrGroupData::member_iter it = gdatap->mMembers.begin();
-                LLGroupMgrGroupData::member_iter end = gdatap->mMembers.end();
+                LLGroupMgrGroupData::member_list_t::iterator it = gdatap->mMembers.begin();
+                LLGroupMgrGroupData::member_list_t::iterator end = gdatap->mMembers.end();
                 LLGroupMemberData* gmd;
 
                 for ( ; it != end; ++it)
@@ -2664,8 +2637,8 @@ void LLPanelGroupActionsSubTab::handleActionSelect()
 
         if (gdatap->isRoleDataComplete())
         {
-                LLGroupMgrGroupData::role_iter it = gdatap->mRoles.begin();
-                LLGroupMgrGroupData::role_iter end = gdatap->mRoles.end();
+                LLGroupMgrGroupData::role_list_t::iterator it = gdatap->mRoles.begin();
+                LLGroupMgrGroupData::role_list_t::iterator end = gdatap->mRoles.end();
                 LLGroupRoleData* rmd;
 
                 for ( ; it != end; ++it)
diff --git a/linden/indra/newview/llpanelgrouproles.h b/linden/indra/newview/llpanelgrouproles.h
index a44f1a3..f84cb93 100644
--- a/linden/indra/newview/llpanelgrouproles.h
+++ b/linden/indra/newview/llpanelgrouproles.h
@@ -202,7 +202,6 @@ public:
 
 protected:
         typedef std::map<LLUUID, LLRoleMemberChangeType> role_change_data_map_t;
-        typedef std::map<LLUUID, role_change_data_map_t*>::iterator member_role_change_iter;
         typedef std::map<LLUUID, role_change_data_map_t*> member_role_changes_map_t;
 
         bool matchesSearchFilter(char* first, char* last);
@@ -224,7 +223,7 @@ protected:
         member_role_changes_map_t mMemberRoleChangeData;
         U32 mNumOwnerAdditions;
 
-        LLGroupMgrGroupData::member_iter mMemberProgress;
+        LLGroupMgrGroupData::member_list_t::iterator mMemberProgress;
 };
 
 class LLPanelGroupRolesSubTab : public LLPanelGroupSubTab
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 6029c2f..24d235e 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -368,6 +368,11 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         childSetKeystrokeCallback("password_edit", onPassKey, this);
         childSetUserData("password_edit", this);
 
+        // change z sort of clickable text to be behind buttons
+        sendChildToBack(getChildByName("channel_text"));
+        sendChildToBack(getChildByName("version_text"));
+        sendChildToBack(getChildByName("forgot_password_text"));
+
         LLLineEditor* edit = LLUICtrlFactory::getLineEditorByName(this, "password_edit");
         if (edit) edit->setDrawAsterixes(TRUE);
 
@@ -483,6 +488,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         // Initialize visibility (and don't force visibility - use prefs)
         refreshLocation( false );
 #endif
+
 }
 
 void LLPanelLogin::setSiteIsAlive( bool alive )
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 6ddae78..bb0ccde 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -3647,14 +3647,25 @@ void LLSelectMgr::saveSelectedObjectTransform(EActionType action_type)
                                         {
                                                 selectNode->mSavedPositionGlobal = gAgent.getPosGlobalFromAgent((object->getPosition() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition());
                                         }
+                                        else
+                                        {
+                                                selectNode->mSavedPositionGlobal = object->getPositionGlobal();
+                                        }
                                 }
                                 else
                                 {
                                         LLViewerObject* attachment_root = (LLViewerObject*)object->getParent();
-                                        LLXform* parent_xform = attachment_root->mDrawable->getXform()->getParent();
-                                        LLVector3 root_pos = (attachment_root->getPosition() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition();
-                                        LLQuaternion root_rot = (attachment_root->getRotation() * parent_xform->getWorldRotation());
-                                        selectNode->mSavedPositionGlobal = gAgent.getPosGlobalFromAgent((object->getPosition() * root_rot) + root_pos);
+                                        LLXform* parent_xform = attachment_root ? attachment_root->mDrawable->getXform()->getParent() : NULL;
+                                        if (parent_xform)
+                                        {
+                                                LLVector3 root_pos = (attachment_root->getPosition() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition();
+                                                LLQuaternion root_rot = (attachment_root->getRotation() * parent_xform->getWorldRotation());
+                                                selectNode->mSavedPositionGlobal = gAgent.getPosGlobalFromAgent((object->getPosition() * root_rot) + root_pos);
+                                        }
+                                        else
+                                        {
+                                                selectNode->mSavedPositionGlobal = object->getPositionGlobal();
+                                        }
                                 }
                                 selectNode->mSavedRotation = object->getRenderRotation();
                         }
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 07aefad..2e7e609 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1080,7 +1080,7 @@ BOOL idle_startup()
                         gAcceptTOS,
                         gAcceptCriticalMessage,
                         gViewerDigest,
-                        gLastExecFroze,
+                        gLastExecEvent,
                         requested_options,
                         hashed_mac_string,
                         LLAppViewer::instance()->getSerialNumber());
@@ -2887,8 +2887,8 @@ void update_dialog_callback(S32 option, void *userdata)
 
         llinfos << "Calling updater: " << update_exe_path << " " << params.str() << llendl;
 
-        // *REMOVE:Mani The following call is handled through ~LLAppViewer.
-        // remove_marker_file(); // In case updater fails
+        //Explicitly remove the marker file, otherwise we pass the lock onto the child process and things get weird.
+        LLAppViewer::instance()->removeMarkerFile(); // In case updater fails
         
         // Use spawn() to run asynchronously
         int retval = _spawnl(_P_NOWAIT, update_exe_path.c_str(), update_exe_path.c_str(), params.str().c_str(), NULL);
diff --git a/linden/indra/newview/lltoolbar.cpp b/linden/indra/newview/lltoolbar.cpp
index e3aa9a3..4120c2d 100644
--- a/linden/indra/newview/lltoolbar.cpp
+++ b/linden/indra/newview/lltoolbar.cpp
@@ -279,7 +279,7 @@ void LLToolBar::layoutButtons()
 
         // We actually want to extend "pad" pixels off the right edge of the    
         // screen, such that the rightmost button is aligned.                   
-        S32 segment_width = llround((F32)(width) / ((F32)count - 1.f));
+        S32 segment_width = llround((F32)(width) / ((F32)count - 1.f)); // ignore chat button
         S32 btn_width = segment_width - pad;
         
         // Evenly space all views
@@ -314,7 +314,7 @@ void LLToolBar::layoutButtons()
                         btn_view->reshape(r.getWidth(), r.getHeight());
                         i--;                                                            
                 }
-        }                                                                       
+        }
 }
 
 
diff --git a/linden/indra/newview/llurlsimstring.cpp b/linden/indra/newview/llurlsimstring.cpp
index 8113326..5829e73 100644
--- a/linden/indra/newview/llurlsimstring.cpp
+++ b/linden/indra/newview/llurlsimstring.cpp
@@ -75,9 +75,9 @@ void LLURLSimString::setString(const LLString& sim_string)
 // static
 S32 LLURLSimString::parseGridIdx(const LLString& in_string, S32 idx0, S32* res, S32 max)
 {
-        if (idx0 == INT_MAX || in_string[idx0] != '/')
+        if (idx0 == LLString::npos || in_string[idx0] != '/')
         {
-                return INT_MAX; // parse error
+                return LLString::npos; // parse error
         }
         idx0++;
         LLString::size_type idx1 = in_string.find_first_of('/', idx0);
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 81f5cc1..99bc98a 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -261,7 +261,6 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
         spinner4->setVisible(FALSE);
         color_swatch->setVisible(FALSE);
         childSetVisible("val_text", FALSE);
-        childSetVisible("boolean_combo", FALSE);
         mComment->setText(LLString::null);
 
         if (controlp)
@@ -299,6 +298,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
                   case TYPE_U32:
                         spinner1->setVisible(TRUE);
                         spinner1->setLabel(LLString("value")); // Debug, don't translate
+                        childSetVisible("boolean_combo", FALSE);
                         if (!spinner1->hasFocus())
                         {
                                 spinner1->setValue(sd);
@@ -311,6 +311,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
                   case TYPE_S32:
                         spinner1->setVisible(TRUE);
                         spinner1->setLabel(LLString("value")); // Debug, don't translate
+                        childSetVisible("boolean_combo", FALSE);
                         if (!spinner1->hasFocus())
                         {
                                 spinner1->setValue(sd);
@@ -323,6 +324,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
                   case TYPE_F32:
                         spinner1->setVisible(TRUE);
                         spinner1->setLabel(LLString("value")); // Debug, don't translate
+                        childSetVisible("boolean_combo", FALSE);
                         if (!spinner1->hasFocus())
                         {
                                 spinner1->setPrecision(3);
@@ -346,6 +348,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
                         break;
                   case TYPE_STRING:
                         childSetVisible("val_text", TRUE);
+                        childSetVisible("boolean_combo", FALSE);
                         if (!childHasFocus("val_text"))
                         {
                                 childSetValue("val_text", sd);
@@ -353,6 +356,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
                         break;
                   case TYPE_VEC3:
                   {
+                        childSetVisible("boolean_combo", FALSE);
                         LLVector3 v;
                         v.setValue(sd);
                         spinner1->setVisible(TRUE);
@@ -380,6 +384,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
                   }
                   case TYPE_VEC3D:
                   {
+                        childSetVisible("boolean_combo", FALSE);
                         LLVector3d v;
                         v.setValue(sd);
                         spinner1->setVisible(TRUE);
@@ -407,6 +412,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
                   }
                   case TYPE_RECT:
                   {
+                        childSetVisible("boolean_combo", FALSE);
                         LLRect r;
                         r.setValue(sd);
                         spinner1->setVisible(TRUE);
@@ -457,6 +463,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
                   }
                   case TYPE_COL4:
                   {
+                        childSetVisible("boolean_combo", FALSE);
                         LLColor4 clr;
                         clr.setValue(sd);
                         color_swatch->setVisible(TRUE);
@@ -478,6 +485,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
                   }
                   case TYPE_COL3:
                   {
+                        childSetVisible("boolean_combo", FALSE);
                         LLColor3 clr;
                         clr.setValue(sd);
                         color_swatch->setVisible(TRUE);
@@ -486,6 +494,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
                   }
                   case TYPE_COL4U:
                   {
+                        childSetVisible("boolean_combo", FALSE);
                         LLColor4U clr;
                         clr.setValue(sd);
                         color_swatch->setVisible(TRUE);
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 9c74b4a..68edca8 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -129,7 +129,8 @@ void LLViewerImageList::doPreloadImages()
         
         // Speeds up startup by 4-5 seconds. JC
         if (!gPreloadImages) return;
-        
+
+        LLViewerImage* image;
         // Images listed here are immediately decoded, before the login screen.
         // Since this slows down perceived viewer startup time, only include
         // images here for buttons/checkboxes/etc. that are immediately visible.
@@ -289,7 +290,8 @@ void LLViewerImageList::doPreloadImages()
         preloadUIImage("object_tube_active.tga", LLUUID::null, FALSE);
         preloadUIImage("pixiesmall.tga", LLUUID::null, TRUE);
         preloadUIImage("script_error.tga", LLUUID::null, TRUE);
-        preloadUIImage("silhouette.tga", LLUUID::null, TRUE);
+        image = preloadUIImage("silhouette.tga", LLUUID::null, TRUE);
+        if (image) image->setClamp(FALSE, FALSE);       
         preloadUIImage("status_no_build.tga", LLUUID::null, FALSE);
         preloadUIImage("status_buy_currency.tga", LLUUID::null, FALSE);
         preloadUIImage("status_buy_currency_pressed.tga", LLUUID::null, FALSE);
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index bad2f1c..fcebe70 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3513,7 +3513,8 @@ void process_sim_stats(LLMessageSystem *msg, void **user_data)
                         gViewerStats->mSimTotalUnackedBytes.addValue(stat_value / 1024.f);
                         break;
                 default:
-                        llwarns << "Unknown stat id" << stat_id << llendl;
+//                      llwarns << "Unknown stat id" << stat_id << llendl;
+                  break;
                 }
         }
 
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 6ec29ae..4730799 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -588,13 +588,13 @@ void LLViewerParcelMgr::deselectLand()
 
                 mSelectedDwell = 0.f;
 
-                notifyObservers();
-
                 // invalidate parcel selection so that existing users of this selection can clean up
                 mCurrentParcelSelection->setParcel(NULL);
                 mFloatingParcelSelection->setParcel(NULL);
                 // create new parcel selection
                 mCurrentParcelSelection = new LLParcelSelection(mCurrentParcel);
+
+                notifyObservers(); // Notify observers *after* changing the parcel selection
         }
 }
 
@@ -1803,9 +1803,9 @@ void optionally_start_music(const LLString& music_url)
 
                 // now only play music when you enter a new parcel if the control is in PLAY state
                 // changed as part of SL-4878
-                if ( gOverlayBar && gOverlayBar->musicPlaying() )
+                if ( gOverlayBar && gOverlayBar->musicPlaying())
                 {
-                        LLOverlayBar::musicPlay(NULL);
+                        gAudiop->startInternetStream(music_url.c_str());
                 }
         }
 }
@@ -1819,7 +1819,10 @@ void callback_start_music(S32 option, void* data)
         {
                 gSavedSettings.setBOOL("AudioStreamingMusic", TRUE);
                 llinfos << "Starting first parcel music " << music_url << llendl;
-                LLOverlayBar::musicPlay(NULL);
+                if ( gOverlayBar && gOverlayBar->musicPlaying())
+                {
+                        gAudiop->startInternetStream(music_url->c_str());
+                }
         }
         else
         {
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index a8ff246..b0577e6 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -3000,7 +3000,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
         }
 
         // Update rectangles for the various toolbars
-        if (gOverlayBar && gNotifyBoxView && gConsole)
+        if (gOverlayBar && gNotifyBoxView && gConsole && gToolBar)
         {
                 LLRect bar_rect(-1, STATUS_BAR_HEIGHT, getWindowWidth()+1, -1);
 
@@ -3022,7 +3022,8 @@ BOOL LLViewerWindow::handlePerFrameHover()
 
                 // snap floaters to top of chat bar/button strip
                 LLView* chatbar_and_buttons = gOverlayBar->getChildByName("chatbar_and_buttons", TRUE);
-                if (chatbar_and_buttons)
+                // find top of chatbar and strate buttons, if either are visible
+                if (chatbar_and_buttons && !chatbar_and_buttons->getLocalBoundingRect().isNull())
                 {
                         // convert top/left corner of chatbar/buttons container to gFloaterView-relative coordinates
                         S32 top, left;
@@ -3034,6 +3035,17 @@ BOOL LLViewerWindow::handlePerFrameHover()
                                                                                                 gFloaterView);
                         gFloaterView->setSnapOffsetBottom(top);
                 }
+                else if (gToolBar->getVisible())
+                {
+                        S32 top, left;
+                        gToolBar->localPointToOtherView(
+                                                                                        gToolBar->getLocalBoundingRect().mLeft,
+                                                                                        gToolBar->getLocalBoundingRect().mTop,
+                                                                                        &left,
+                                                                                        &top,
+                                                                                        gFloaterView);
+                        gFloaterView->setSnapOffsetBottom(top);
+                }
                 else
                 {
                         gFloaterView->setSnapOffsetBottom(0);
diff --git a/linden/indra/newview/newview_vc8.vcproj b/linden/indra/newview/newview_vc8.vcproj
index e68e59a..fc8912d 100644
--- a/linden/indra/newview/newview_vc8.vcproj
+++ b/linden/indra/newview/newview_vc8.vcproj
@@ -341,7 +341,7 @@
                                 WarningLevel="3"

                                 WarnAsError="true"

                                 Detect64BitPortabilityProblems="false"

-                                DebugInformationFormat="4"

+                                DebugInformationFormat="3"

                         />

                         <Tool

                                 Name="VCManagedResourceCompilerTool"

diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index f88987d..de547c5 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,3 +1,42 @@
+Release Notes for Second Life 1.19.0(2) February 13th, 2008
+=====================================
+
+Fixes:
+* Preferences window docks at an offscreen position and cannot be moved vertically
+* Communicate window has low  framerate for group ims.
+* Viewer freeze and delay in opening map 
+* Visible flashing of prim highlights when editing
+* Parcel audio play setting is not remembered when crossing over a parcel with no media
+* Alt and left/right arrow keys dont move you between tabs
+* Login Page > SL Release link overlaps Quit when viewer resized
+* Redocking the Contact list causes the communicate UI to get ugly
+* Clicking on gestures button moves open windows
+* Pressing escape does not cause the chat history or inventory windows to lose focus
+* Toggling voice causes layout problems in toolbar
+* Problems loading certain settings files
+* Deutsch "System Default" is translated as "System Error" in language preferences
+* Viewer crash just after login
+* Linux compile issue with g++ 4
+* Debug settings overrides do not work for booleans. 
+* reverted floater_test.xml to empty floater.
+
+Release Notes for Second Life 1.19.0(1) February 7th, 2008
+=====================================
+Changes:
+* Added second set of translated strings
+* Region info message is now a passive notification
+* Changed default SL window size to 1000x700, to allow buttons in UI to have proper labels 
+
+Fixes:
+* Preferences > Web has truncated text in the Address: section
+* Korean viewer crashes on startup
+* Stand up button etc dissapear offscreen after using mouselook
+* Client-readme-voice.txt missing from open source distribution
+* Clicking on another users classifieds ad then closing asks you to save changes
+* Checking to select a role does not enable the apply button
+* Stray 'Done" on the Profile Web tab
+
+
 Release Notes for Second Life 1.19.0(0) February 1st, 2008 
 =====================================
 New features and changes:
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 7ae5595..909393b 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -228,8 +228,8 @@ TOOLPIPETTE             CURSOR                  "toolpipette.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,19,0,0
- PRODUCTVERSION 1,19,0,0
+ FILEVERSION 1,19,0,2
+ PRODUCTVERSION 1,19,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -246,12 +246,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.19.0.0"
+            VALUE "FileVersion", "1.19.0.2"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2007, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.19.0.0"
+            VALUE "ProductVersion", "1.19.0.2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_general.xml b/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
index da066a1..8433c81 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
@@ -71,7 +71,7 @@
         </combo_box>
         <combo_box name="language_combobox">
                 <combo_item type="string" length="1" name="System Default Language">
-                        Systemfehler
+                        Betriebssystem-Einstellung
                 </combo_item>
                 <combo_item type="string" length="1" name="English">
                         English (Englisch)
diff --git a/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml b/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
index 933baad..259cb3d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
@@ -26,6 +26,7 @@
                         draw_stripes="false"

                         multi_select="false"

                         search_column="1"

+      sort_column="2"

                 >

                         <column name="icon_speaking_status" width="20" sort="speaking_status"/> 

                         <column name="speaker_name" label="Name" dynamicwidth="true" />

diff --git a/linden/indra/newview/skins/xui/en-us/floater_test.xml b/linden/indra/newview/skins/xui/en-us/floater_test.xml
index 71a3bd4..f6d38ff 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_test.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_test.xml
@@ -1,45 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-380" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="380" hidden="false" left="400" min_height="340"
-     min_width="200" mouse_opaque="true" name="avatarpicker"
-     title="Choose Resident" width="240">
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-40" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-             left="12" mouse_opaque="true" name="Type part of the resident&apos;s name:"
-             v_pad="0" width="220">
-                Type part of the resident&apos;s name:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-16"
-             follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-             left="12" max_length="254" mouse_opaque="true" name="Edit"
-             select_on_focus="false" width="132" />
-        <button bottom="-60" follows="top|right" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Find" label_selected="Find" left_delta="140"
-             mouse_opaque="true" name="Find" scale_image="TRUE" width="80" />
-        <scroll_list background_visible="true" bottom="-224" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" follows="left|top|right"
-             height="160" hidden="false" left="12" mouse_opaque="true"
-             multi_select="false" name="Names" width="220" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-             left="12" mouse_opaque="true" name="Or select their calling card:" v_pad="0"
-             width="220">
-                Or select a calling card:
-        </text>
-        <inventory_panel allow_multi_select="false" border="true" bottom_delta="-100"
-             follows="left|top|right|bottom" height="100" hidden="false" left="12"
-             mouse_opaque="true" name="Inventory Panel"
-             sort_order="AvatarPickerSortOrder" width="220" />
-        <button bottom_delta="-28" follows="left|bottom" font="SansSerif" halign="center"
-             height="20" hidden="false" label="Select" label_selected="Select" left="12"
-             mouse_opaque="true" name="Select" scale_image="TRUE" width="80" />
-        <button bottom="-376" follows="left|bottom" font="SansSerif" halign="center"
-             height="20" hidden="false" label="Close" label_selected="Close"
-             left_delta="88" mouse_opaque="true" name="Close" scale_image="TRUE"
-             width="80" />
-        <text hidden="true" name="NotFound">
-                &apos;[TEXT]&apos; not found
-        </text>
+<!-- Please don't commit this with any changes! For local testing only! -->
+<floater bottom="40" left="40" height="225" width="180" 
+         can_resize="false" can_close="true" can_drag_on_left="false" can_minimize="true"
+         name="Test" title="Test">
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
index 1aa8899..f36a380 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -213,7 +213,6 @@
                              width="400" />
                         <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
                              top="25">
-                                Done
                         </text>
                 </panel>
                 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_bars.xml b/linden/indra/newview/skins/xui/en-us/panel_bars.xml
index 8896cd6..93db538 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_bars.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_bars.xml
@@ -3,9 +3,9 @@
         <panel name="status" left="0" bottom="040" height="728" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

      <layout_stack name="bar_stack" left="0" bottom="0" height="768" width="1024" 

                         follows="left|right|bottom|top" mouse_opaque="false" orientation="vertical" border_size="0" use_bounding_rect="true">

-                <layout_panel name="spacer" left="0" bottom="0" height="768" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

-                <layout_panel name="overlay" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>

-                <layout_panel name="toolbar" filename="panel_toolbar.xml" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>

+                  <layout_panel name="spacer" left="0" bottom="0" height="768" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

+                  <layout_panel name="overlay" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>

+                  <layout_panel name="toolbar" filename="panel_toolbar.xml" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>

      </layout_stack>

         <panel name="hud" left="0" bottom="50" height="728" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

 </panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
index 5d51eed..dd89640 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
@@ -18,7 +18,7 @@
                         <scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true"

                                         draw_stripes="false" follows="left|top|bottom|right" left="0"

                                         multi_select="false" name="speakers_list" right="140" search_column="1"

-                                        top="120">

+                                        top="120" sort_column="2">

                                 <column name="icon_speaking_status" sort="speaking_status" width="20" />

                                 <column dynamicwidth="true" label="Name" name="speaker_name" />

                                 <column label="" name="speaking_status" width="0" />