Merged in 'paymessage' branch.

Custom message in Pay Resident floater, and XUI cleanup.
(SNOW-436, formerly VWR-9597)

1 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index 12f878d..fa69258 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -165,6 +165,8 @@ public:
         std::string             getTitle();
         void                    setShortTitle( const std::string& short_title );
         std::string             getShortTitle();
+        BOOL setTitleArg( const std::string& key, const LLStringExplicit& text );
+        BOOL setShortTitleArg( const std::string& key, const LLStringExplicit& text );
         void                    setTitleVisible(bool visible);
         virtual void    setMinimized(BOOL b);
         void                    moveResizeHandlesToFront();
@@ -276,8 +278,8 @@ private:
         BOOL                    mMinimized;
         BOOL                    mForeground;
         LLHandle<LLFloater>     mDependeeHandle;
-        std::string             mTitle;
-        std::string             mShortTitle;
+        LLUIString              mTitle;
+        LLUIString              mShortTitle;
 
         BOOL                    mFirstLook;                     // TRUE if the _next_ time this floater is visible will be the first time in the session that it is visible.