Second Life viewer sources 1.21.0-RC

1 files changed, 11 insertions, 4 deletions

diff --git a/linden/indra/newview/llfloaterhtml.cpp b/linden/indra/newview/llfloaterhtml.cpp
index 2ad9307..eb09754 100644
--- a/linden/indra/newview/llfloaterhtml.cpp
+++ b/linden/indra/newview/llfloaterhtml.cpp
@@ -57,7 +57,7 @@ LLFloaterHtml* LLFloaterHtml::getInstance()
 ////////////////////////////////////////////////////////////////////////////////
 //
 LLFloaterHtml::LLFloaterHtml()
-:       LLFloater( "HTML Floater" )
+:       LLFloater( std::string("HTML Floater") )
 
         ,
         mWebBrowser( 0 )
@@ -113,11 +113,11 @@ void LLFloaterHtml::draw()
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-void LLFloaterHtml::show( LLString content_id, bool open_link_external, bool open_app_slurls )
+void LLFloaterHtml::show( std::string content_id, bool open_link_external, bool open_app_slurls )
 {
         // calculate the XML labels we'll need (if only XML folders worked)
-        LLString title_str = content_id + "_title";
-        LLString url_str = content_id + "_url";
+        std::string title_str = content_id + "_title";
+        std::string url_str = content_id + "_url";
 
         std::string title = getString( title_str );
         std::string url = getString( url_str );
@@ -146,6 +146,13 @@ void LLFloaterHtml::show( std::string start_url, std::string title, bool open_li
 
 ////////////////////////////////////////////////////////////////////////////////
 //
+std::string LLFloaterHtml::getSupportUrl()
+{
+        return getString("support_page_url");
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
 void LLFloaterHtml::onClose( bool app_quitting )
 {
         setVisible( false );