Second Life viewer sources 1.21.0-RC

1 files changed, 131 insertions, 111 deletions

diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 759fae0..e795ad2 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -56,14 +56,12 @@
 #include "lltabcontainer.h"
 #include "v2math.h"
 
-extern BOOL gNoRender;
-
 const S32 MINIMIZED_WIDTH = 160;
 const S32 CLOSE_BOX_FROM_TOP = 1;
 // use this to control "jumping" behavior when Ctrl-Tabbing
 const S32 TABBED_FLOATER_OFFSET = 0;
 
-LLString        LLFloater::sButtonActiveImageNames[BUTTON_COUNT] = 
+std::string     LLFloater::sButtonActiveImageNames[BUTTON_COUNT] = 
 {
         "UIImgBtnCloseActiveUUID",              //BUTTON_CLOSE
         "UIImgBtnRestoreActiveUUID",    //BUTTON_RESTORE
@@ -72,7 +70,7 @@ LLString	LLFloater::sButtonActiveImageNames[BUTTON_COUNT] =
         "UIImgBtnCloseActiveUUID",              //BUTTON_EDIT
 };
 
-LLString        LLFloater::sButtonInactiveImageNames[BUTTON_COUNT] = 
+std::string     LLFloater::sButtonInactiveImageNames[BUTTON_COUNT] = 
 {
         "UIImgBtnCloseInactiveUUID",    //BUTTON_CLOSE
         "UIImgBtnRestoreInactiveUUID",  //BUTTON_RESTORE
@@ -81,7 +79,7 @@ LLString	LLFloater::sButtonInactiveImageNames[BUTTON_COUNT] =
         "UIImgBtnCloseInactiveUUID",    //BUTTON_EDIT
 };
 
-LLString        LLFloater::sButtonPressedImageNames[BUTTON_COUNT] = 
+std::string     LLFloater::sButtonPressedImageNames[BUTTON_COUNT] = 
 {
         "UIImgBtnClosePressedUUID",             //BUTTON_CLOSE
         "UIImgBtnRestorePressedUUID",   //BUTTON_RESTORE
@@ -90,7 +88,7 @@ LLString	LLFloater::sButtonPressedImageNames[BUTTON_COUNT] =
         "UIImgBtnClosePressedUUID",             //BUTTON_EDIT
 };
 
-LLString        LLFloater::sButtonNames[BUTTON_COUNT] = 
+std::string     LLFloater::sButtonNames[BUTTON_COUNT] = 
 {
         "llfloater_close_btn",  //BUTTON_CLOSE
         "llfloater_restore_btn",        //BUTTON_RESTORE
@@ -99,7 +97,7 @@ LLString	LLFloater::sButtonNames[BUTTON_COUNT] =
         "llfloater_edit_btn",           //BUTTON_EDIT
 };
 
-LLString        LLFloater::sButtonToolTips[BUTTON_COUNT] = 
+std::string     LLFloater::sButtonToolTips[BUTTON_COUNT] = 
 {
 #ifdef LL_DARWIN
         "Close (Cmd-W)",        //BUTTON_CLOSE
@@ -145,7 +143,7 @@ LLFloater::LLFloater() :
         mHandle.bind(this);
 }
 
-LLFloater::LLFloater(const LLString& name)
+LLFloater::LLFloater(const std::string& name)
 :       LLPanel(name), mAutoFocus(TRUE) // automatically take focus when opened
 {
         for (S32 i = 0; i < BUTTON_COUNT; i++)
@@ -153,12 +151,12 @@ LLFloater::LLFloater(const LLString& name)
                 mButtonsEnabled[i] = FALSE;
                 mButtons[i] = NULL;
         }
-        LLString title; // null string
+        std::string title; // null string
         initFloater(title, FALSE, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT, FALSE, TRUE, TRUE); // defaults
 }
 
 
-LLFloater::LLFloater(const LLString& name, const LLRect& rect, const LLString& title, 
+LLFloater::LLFloater(const std::string& name, const LLRect& rect, const std::string& title, 
         BOOL resizable, 
         S32 min_width, 
         S32 min_height,
@@ -176,7 +174,7 @@ LLFloater::LLFloater(const LLString& name, const LLRect& rect, const LLString& t
         initFloater( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn);
 }
 
-LLFloater::LLFloater(const LLString& name, const LLString& rect_control, const LLString& title, 
+LLFloater::LLFloater(const std::string& name, const std::string& rect_control, const std::string& title, 
         BOOL resizable, 
         S32 min_width, 
         S32 min_height,
@@ -196,7 +194,7 @@ LLFloater::LLFloater(const LLString& name, const LLString& rect_control, const L
 
 
 // Note: Floaters constructed from XML call init() twice!
-void LLFloater::initFloater(const LLString& title,
+void LLFloater::initFloater(const std::string& title,
                                          BOOL resizable, S32 min_width, S32 min_height,
                                          BOOL drag_on_left, BOOL minimizable, BOOL close_btn)
 {
@@ -291,12 +289,12 @@ void LLFloater::initFloater(const LLString& title,
                         0, 0,
                         DRAG_HANDLE_WIDTH,
                         getRect().getHeight() - LLPANEL_BORDER_WIDTH - close_box_size);
-                mDragHandle = new LLDragHandleLeft("drag", drag_handle_rect, title );
+                mDragHandle = new LLDragHandleLeft(std::string("drag"), drag_handle_rect, title );
         }
         else // drag on top
         {
                 LLRect drag_handle_rect( 0, getRect().getHeight(), getRect().getWidth(), 0 );
-                mDragHandle = new LLDragHandleTop( "Drag Handle", drag_handle_rect, title );
+                mDragHandle = new LLDragHandleTop( std::string("Drag Handle"), drag_handle_rect, title );
         }
         addChild(mDragHandle);
 
@@ -310,28 +308,28 @@ void LLFloater::initFloater(const LLString& title,
                 // Resize bars (sides)
                 const S32 RESIZE_BAR_THICKNESS = 3;
                 mResizeBar[LLResizeBar::LEFT] = new LLResizeBar( 
-                        "resizebar_left",
+                        std::string("resizebar_left"),
                         this,
                         LLRect( 0, getRect().getHeight(), RESIZE_BAR_THICKNESS, 0), 
                         min_width, S32_MAX, LLResizeBar::LEFT );
                 addChild( mResizeBar[0] );
 
                 mResizeBar[LLResizeBar::TOP] = new LLResizeBar( 
-                        "resizebar_top",
+                        std::string("resizebar_top"),
                         this,
                         LLRect( 0, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_BAR_THICKNESS), 
                         min_height, S32_MAX, LLResizeBar::TOP );
                 addChild( mResizeBar[1] );
 
                 mResizeBar[LLResizeBar::RIGHT] = new LLResizeBar( 
-                        "resizebar_right",
+                        std::string("resizebar_right"),
                         this,
                         LLRect( getRect().getWidth() - RESIZE_BAR_THICKNESS, getRect().getHeight(), getRect().getWidth(), 0), 
                         min_width, S32_MAX, LLResizeBar::RIGHT );
                 addChild( mResizeBar[2] );
 
                 mResizeBar[LLResizeBar::BOTTOM] = new LLResizeBar( 
-                        "resizebar_bottom",
+                        std::string("resizebar_bottom"),
                         this,
                         LLRect( 0, RESIZE_BAR_THICKNESS, getRect().getWidth(), 0), 
                         min_height, S32_MAX, LLResizeBar::BOTTOM );
@@ -340,28 +338,29 @@ void LLFloater::initFloater(const LLString& title,
 
                 // Resize handles (corners)
                 mResizeHandle[0] = new LLResizeHandle( 
-                        "Resize Handle",
+                        std::string("Resize Handle"),
                         LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT, getRect().getWidth(), 0),
                         min_width,
                         min_height,
                         LLResizeHandle::RIGHT_BOTTOM);
                 addChild(mResizeHandle[0]);
 
-                mResizeHandle[1] = new LLResizeHandle( "resize", 
+                mResizeHandle[1] = new LLResizeHandle(
+                        std::string("resize"), 
                         LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_HANDLE_HEIGHT),
                         min_width,
                         min_height,
                         LLResizeHandle::RIGHT_TOP );
                 addChild(mResizeHandle[1]);
                 
-                mResizeHandle[2] = new LLResizeHandle( "resize", 
-                        LLRect( 0, RESIZE_HANDLE_HEIGHT, RESIZE_HANDLE_WIDTH, 0 ),
-                        min_width,
-                        min_height,
-                        LLResizeHandle::LEFT_BOTTOM );
+                mResizeHandle[2] = new LLResizeHandle( std::string("resize"), 
+                                                                                           LLRect( 0, RESIZE_HANDLE_HEIGHT, RESIZE_HANDLE_WIDTH, 0 ),
+                                                                                           min_width,
+                                                                                           min_height,
+                                                                                           LLResizeHandle::LEFT_BOTTOM );
                 addChild(mResizeHandle[2]);
 
-                mResizeHandle[3] = new LLResizeHandle( "resize", 
+                mResizeHandle[3] = new LLResizeHandle( std::string("resize"), 
                         LLRect( 0, getRect().getHeight(), RESIZE_HANDLE_WIDTH, getRect().getHeight() - RESIZE_HANDLE_HEIGHT ),
                         min_width,
                         min_height,
@@ -650,31 +649,62 @@ void LLFloater::applyRectControl()
         }
 }
 
-void LLFloater::setTitle( const LLString& title )
+void LLFloater::applyTitle()
 {
         if (gNoRender)
         {
                 return;
         }
-        if (mDragHandle)
-                mDragHandle->setTitle( title );
+
+        if (!mDragHandle)
+        {
+                return;
+        }
+
+        if (isMinimized() && !mShortTitle.empty())
+        {
+                mDragHandle->setTitle( mShortTitle );
+        }
+        else
+        {
+                mDragHandle->setTitle ( mTitle );
+        }
+}
+
+const std::string& LLFloater::getCurrentTitle() const
+{
+        return mDragHandle ? mDragHandle->getTitle() : LLStringUtil::null;
 }
 
-const LLString& LLFloater::getTitle() const
+void LLFloater::setTitle( const std::string& title )
 {
-        return mDragHandle ? mDragHandle->getTitle() : LLString::null;
+        mTitle = title;
+        applyTitle();
 }
 
-void LLFloater::setShortTitle( const LLString& short_title )
+std::string LLFloater::getTitle()
+{
+        if (mTitle.empty())
+        {
+                return mDragHandle ? mDragHandle->getTitle() : LLStringUtil::null;
+        }
+        else
+        {
+                return mTitle;
+        }
+}
+
+void LLFloater::setShortTitle( const std::string& short_title )
 {
         mShortTitle = short_title;
+        applyTitle();
 }
 
-LLString LLFloater::getShortTitle()
+std::string LLFloater::getShortTitle()
 {
         if (mShortTitle.empty())
         {
-                return mDragHandle ? mDragHandle->getTitle() : LLString::null;
+                return mDragHandle ? mDragHandle->getTitle() : LLStringUtil::null;
         }
         else
         {
@@ -841,7 +871,7 @@ void LLFloater::setMinimized(BOOL minimize)
                                 mResizeHandle[i]->setEnabled(FALSE);
                         }
                 }
-
+                
                 mMinimized = TRUE;
 
                 // Reshape *after* setting mMinimized
@@ -890,12 +920,15 @@ void LLFloater::setMinimized(BOOL minimize)
                                 mResizeHandle[i]->setEnabled(isResizable());
                         }
                 }
-
+                
                 mMinimized = FALSE;
 
                 // Reshape *after* setting mMinimized
                 reshape( mExpandedRect.getWidth(), mExpandedRect.getHeight(), TRUE );
         }
+        
+        applyTitle ();
+
         make_ui_sound("UISndWindowClose");
         updateButtons();
 }
@@ -1083,38 +1116,37 @@ void LLFloater::removeDependentFloater(LLFloater* floaterp)
         floaterp->mDependeeHandle = LLHandle<LLFloater>();
 }
 
-// virtual
-BOOL LLFloater::handleMouseDown(S32 x, S32 y, MASK mask)
+BOOL LLFloater::offerClickToButton(S32 x, S32 y, MASK mask, EFloaterButtons index)
 {
-        if( mMinimized )
+        if( mButtonsEnabled[index] )
         {
-                // Offer the click to the close button.
-                if( mButtonsEnabled[BUTTON_CLOSE] )
-                {
-                        S32 local_x = x - mButtons[BUTTON_CLOSE]->getRect().mLeft;
-                        S32 local_y = y - mButtons[BUTTON_CLOSE]->getRect().mBottom;
-
-                        if (mButtons[BUTTON_CLOSE]->pointInView(local_x, local_y)
-                                && mButtons[BUTTON_CLOSE]->handleMouseDown(local_x, local_y, mask))
-                        {
-                                // close button handled it, return
-                                return TRUE;
-                        }
-                }
+                LLButton* my_butt = mButtons[index];
+                S32 local_x = x - my_butt->getRect().mLeft;
+                S32 local_y = y - my_butt->getRect().mBottom;
 
-                // Offer the click to the restore button.
-                if( mButtonsEnabled[BUTTON_RESTORE] )
+                if (
+                        my_butt->pointInView(local_x, local_y) &&
+                        my_butt->handleMouseDown(local_x, local_y, mask))
                 {
-                        S32 local_x = x - mButtons[BUTTON_RESTORE]->getRect().mLeft;
-                        S32 local_y = y - mButtons[BUTTON_RESTORE]->getRect().mBottom;
-
-                        if (mButtons[BUTTON_RESTORE]->pointInView(local_x, local_y)
-                                && mButtons[BUTTON_RESTORE]->handleMouseDown(local_x, local_y, mask))
-                        {
-                                // restore button handled it, return
-                                return TRUE;
-                        }
+                        // the button handled it
+                        return TRUE;
                 }
+        }
+        return FALSE;
+}
+
+// virtual
+BOOL LLFloater::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+        if( mMinimized )
+        {
+                // Offer the click to titlebar buttons.
+                // Note: this block and the offerClickToButton helper method can be removed
+                // because the parent container will handle it for us but we'll keep it here
+                // for safety until after reworking the panel code to manage hidden children.
+                if(offerClickToButton(x, y, mask, BUTTON_CLOSE)) return TRUE;
+                if(offerClickToButton(x, y, mask, BUTTON_RESTORE)) return TRUE;
+                if(offerClickToButton(x, y, mask, BUTTON_TEAR_OFF)) return TRUE;
 
                 // Otherwise pass to drag handle for movement
                 return mDragHandle->handleMouseDown(x, y, mask);
@@ -1249,6 +1281,7 @@ void LLFloater::onClickTearOff(void *userdata)
                 LLMultiFloater* new_host = (LLMultiFloater*)self->mLastHostHandle.get();
                 if (new_host)
                 {
+                        self->setMinimized(FALSE); // to reenable minimize button if it was minimized
                         new_host->showFloater(self);
                         // make sure host is visible
                         new_host->open();
@@ -1341,7 +1374,7 @@ void LLFloater::draw()
                         gl_rect_2d( left, top, right, bottom, getTransparentColor() );
                 }
 
-                if(gFocusMgr.childHasKeyboardFocus(this) && !getIsChrome() && !getTitle().empty())
+                if(gFocusMgr.childHasKeyboardFocus(this) && !getIsChrome() && !getCurrentTitle().empty())
                 {
                         // draw highlight on title bar to indicate focus.  RDW
                         const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
@@ -1421,31 +1454,15 @@ void LLFloater::draw()
 
 void    LLFloater::setCanMinimize(BOOL can_minimize)
 {
-        // removing minimize/restore button programmatically,
-        // go ahead and uniminimize floater
+        // if removing minimize/restore button programmatically,
+        // go ahead and unminimize floater
         if (!can_minimize)
         {
                 setMinimized(FALSE);
         }
 
-        if (can_minimize)
-        {
-                if (isMinimized())
-                {
-                        mButtonsEnabled[BUTTON_MINIMIZE] = FALSE;
-                        mButtonsEnabled[BUTTON_RESTORE] = TRUE;
-                }
-                else
-                {
-                        mButtonsEnabled[BUTTON_MINIMIZE] = TRUE;
-                        mButtonsEnabled[BUTTON_RESTORE] = FALSE;
-                }
-        }
-        else
-        {
-                mButtonsEnabled[BUTTON_MINIMIZE] = FALSE;
-                mButtonsEnabled[BUTTON_RESTORE] = FALSE;
-        }
+        mButtonsEnabled[BUTTON_MINIMIZE] = can_minimize && !isMinimized();
+        mButtonsEnabled[BUTTON_RESTORE]  = can_minimize &&  isMinimized();
 
         updateButtons();
 }
@@ -1484,28 +1501,28 @@ void	LLFloater::setCanResize(BOOL can_resize)
                 // Resize bars (sides)
                 const S32 RESIZE_BAR_THICKNESS = 3;
                 mResizeBar[0] = new LLResizeBar( 
-                        "resizebar_left",
+                        std::string("resizebar_left"),
                         this,
                         LLRect( 0, getRect().getHeight(), RESIZE_BAR_THICKNESS, 0), 
                         mMinWidth, S32_MAX, LLResizeBar::LEFT );
                 addChild( mResizeBar[0] );
 
                 mResizeBar[1] = new LLResizeBar( 
-                        "resizebar_top",
+                        std::string("resizebar_top"),
                         this,
                         LLRect( 0, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_BAR_THICKNESS), 
                         mMinHeight, S32_MAX, LLResizeBar::TOP );
                 addChild( mResizeBar[1] );
 
                 mResizeBar[2] = new LLResizeBar( 
-                        "resizebar_right",
+                        std::string("resizebar_right"),
                         this,
                         LLRect( getRect().getWidth() - RESIZE_BAR_THICKNESS, getRect().getHeight(), getRect().getWidth(), 0), 
                         mMinWidth, S32_MAX, LLResizeBar::RIGHT );
                 addChild( mResizeBar[2] );
 
                 mResizeBar[3] = new LLResizeBar( 
-                        "resizebar_bottom",
+                        std::string("resizebar_bottom"),
                         this,
                         LLRect( 0, RESIZE_BAR_THICKNESS, getRect().getWidth(), 0), 
                         mMinHeight, S32_MAX, LLResizeBar::BOTTOM );
@@ -1514,28 +1531,28 @@ void	LLFloater::setCanResize(BOOL can_resize)
 
                 // Resize handles (corners)
                 mResizeHandle[0] = new LLResizeHandle( 
-                        "Resize Handle",
+                        std::string("Resize Handle"),
                         LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT, getRect().getWidth(), 0),
                         mMinWidth,
                         mMinHeight,
                         LLResizeHandle::RIGHT_BOTTOM);
                 addChild(mResizeHandle[0]);
 
-                mResizeHandle[1] = new LLResizeHandle( "resize", 
+                mResizeHandle[1] = new LLResizeHandle( std::string("resize"), 
                         LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_HANDLE_HEIGHT),
                         mMinWidth,
                         mMinHeight,
                         LLResizeHandle::RIGHT_TOP );
                 addChild(mResizeHandle[1]);
                 
-                mResizeHandle[2] = new LLResizeHandle( "resize", 
-                        LLRect( 0, RESIZE_HANDLE_HEIGHT, RESIZE_HANDLE_WIDTH, 0 ),
-                        mMinWidth,
-                        mMinHeight,
-                        LLResizeHandle::LEFT_BOTTOM );
+                mResizeHandle[2] = new LLResizeHandle( std::string("resize"), 
+                                                                                           LLRect( 0, RESIZE_HANDLE_HEIGHT, RESIZE_HANDLE_WIDTH, 0 ),
+                                                                                           mMinWidth,
+                                                                                           mMinHeight,
+                                                                                           LLResizeHandle::LEFT_BOTTOM );
                 addChild(mResizeHandle[2]);
 
-                mResizeHandle[3] = new LLResizeHandle( "resize", 
+                mResizeHandle[3] = new LLResizeHandle( std::string("resize"), 
                         LLRect( 0, getRect().getHeight(), RESIZE_HANDLE_WIDTH, getRect().getHeight() - RESIZE_HANDLE_HEIGHT ),
                         mMinWidth,
                         mMinHeight,
@@ -1633,7 +1650,7 @@ void LLFloater::buildButtons()
                         btn_rect,
                         sButtonActiveImageNames[i],
                         sButtonPressedImageNames[i],
-                        "",
+                        LLStringUtil::null,
                         sButtonCallbacks[i],
                         this,
                         LLFontGL::sSansSerif);
@@ -1657,7 +1674,7 @@ void LLFloater::buildButtons()
 /////////////////////////////////////////////////////
 // LLFloaterView
 
-LLFloaterView::LLFloaterView( const LLString& name, const LLRect& rect )
+LLFloaterView::LLFloaterView( const std::string& name, const LLRect& rect )
 :       LLUICtrl( name, rect, FALSE, NULL, NULL, FOLLOWS_ALL ),
         mFocusCycleMode(FALSE),
         mSnapOffsetBottom(0)
@@ -2377,7 +2394,7 @@ LLMultiFloater::LLMultiFloater(LLTabContainer::TabPosition tab_pos) :
 
 }
 
-LLMultiFloater::LLMultiFloater(const LLString &name) :
+LLMultiFloater::LLMultiFloater(const std::string &name) :
         LLFloater(name),
         mTabContainer(NULL),
         mTabPos(LLTabContainer::TOP),
@@ -2388,7 +2405,7 @@ LLMultiFloater::LLMultiFloater(const LLString &name) :
 }
 
 LLMultiFloater::LLMultiFloater(
-        const LLString& name,
+        const std::string& name,
         const LLRect& rect,
         LLTabContainer::TabPosition tab_pos,
         BOOL auto_resize) : 
@@ -2399,7 +2416,7 @@ LLMultiFloater::LLMultiFloater(
         mOrigMinWidth(0),
         mOrigMinHeight(0)
 {
-        mTabContainer = new LLTabContainer("Preview Tabs", 
+        mTabContainer = new LLTabContainer(std::string("Preview Tabs"), 
                 LLRect(LLPANEL_BORDER_WIDTH, getRect().getHeight() - LLFLOATER_HEADER_SIZE, getRect().getWidth() - LLPANEL_BORDER_WIDTH, 0), 
                 mTabPos, 
                 FALSE, 
@@ -2414,8 +2431,8 @@ LLMultiFloater::LLMultiFloater(
 }
 
 LLMultiFloater::LLMultiFloater(
-        const LLString& name,
-        const LLString& rect_control,
+        const std::string& name,
+        const std::string& rect_control,
         LLTabContainer::TabPosition tab_pos,
         BOOL auto_resize) : 
         LLFloater(name, rect_control, name),
@@ -2425,7 +2442,7 @@ LLMultiFloater::LLMultiFloater(
         mOrigMinWidth(0),
         mOrigMinHeight(0)
 {
-        mTabContainer = new LLTabContainer("Preview Tabs", 
+        mTabContainer = new LLTabContainer(std::string("Preview Tabs"), 
                 LLRect(LLPANEL_BORDER_WIDTH, getRect().getHeight() - LLFLOATER_HEADER_SIZE, getRect().getWidth() - LLPANEL_BORDER_WIDTH, 0), 
                 mTabPos, 
                 FALSE, 
@@ -2863,7 +2880,7 @@ LLXMLNodePtr LLFloater::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLPanel::getXML();
 
-        node->createChild("title", TRUE)->setStringValue(getTitle());
+        node->createChild("title", TRUE)->setStringValue(getCurrentTitle());
 
         node->createChild("can_resize", TRUE)->setBoolValue(isResizable());
 
@@ -2885,12 +2902,12 @@ LLXMLNodePtr LLFloater::getXML(bool save_children) const
 // static
 LLView* LLFloater::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-        LLString name("floater");
+        std::string name("floater");
         node->getAttributeString("name", name);
 
         LLFloater *floaterp = new LLFloater(name);
 
-        LLString filename;
+        std::string filename;
         node->getAttributeString("filename", filename);
 
         if (filename.empty())
@@ -2909,10 +2926,10 @@ LLView* LLFloater::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
 
 void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory, BOOL open)  /* Flawfinder: ignore */
 {
-        LLString name(getName());
-        LLString title(getTitle());
-        LLString short_title(getShortTitle());
-        LLString rect_control("");
+        std::string name(getName());
+        std::string title(getCurrentTitle());
+        std::string short_title(getShortTitle());
+        std::string rect_control("");
         BOOL resizable = isResizable();
         S32 min_width = getMinWidth();
         S32 min_height = getMinHeight();
@@ -2950,6 +2967,9 @@ void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactor
                         minimizable,
                         close_btn);
 
+        setTitle(title);
+        applyTitle ();
+
         setShortTitle(short_title);
 
         BOOL can_tear_off;