From 10f61f6f00e4c0ce6dd5fbfb9ff065238e2930e2 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Sun, 16 Jun 2013 22:45:48 -0500 Subject: [PATCH] Old habits die hard. Fix gcc compile. --- indra/newview/llslurl.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp index 5bfba42a8..b1a30f78b 100644 --- a/indra/newview/llslurl.cpp +++ b/indra/newview/llslurl.cpp @@ -97,10 +97,10 @@ LLSLURL::LLSLURL(const std::string& slurl) if(gHippoGridManager->getCurrentGrid()->isInProductionGrid()) fixed_slurl = MAIN_GRID_SLURL_BASE; else - fixed_slurl = llformat(SYSTEM_GRID_SLURL_BASE, gHippoGridManager->getCurrentGridNick()); + fixed_slurl = llformat(SYSTEM_GRID_SLURL_BASE, gHippoGridManager->getCurrentGridNick().c_str()); } else - fixed_slurl = llformat(DEFAULT_SLURL_BASE, gHippoGridManager->getCurrentGridNick()); + fixed_slurl = llformat(DEFAULT_SLURL_BASE, gHippoGridManager->getCurrentGridNick().c_str()); //std::string fixed_slurl = MAIN_GRID_SLURL_BASE; @@ -423,10 +423,10 @@ std::string LLSLURL::getSLURLString() const if(gHippoGridManager->getCurrentGrid()->isInProductionGrid()) fixed_slurl = MAIN_GRID_SLURL_BASE; else - fixed_slurl = llformat(SYSTEM_GRID_SLURL_BASE, gHippoGridManager->getCurrentGridNick()); + fixed_slurl = llformat(SYSTEM_GRID_SLURL_BASE, gHippoGridManager->getCurrentGridNick().c_str()); } else - fixed_slurl = llformat(DEFAULT_SLURL_BASE, gHippoGridManager->getCurrentGridNick()); + fixed_slurl = llformat(DEFAULT_SLURL_BASE, gHippoGridManager->getCurrentGridNick().c_str()); return fixed_slurl + LLURI::escape(mRegion) + llformat("/%d/%d/%d",x,y,z); } @@ -438,7 +438,7 @@ std::string LLSLURL::getSLURLString() const if(gHippoGridManager->getCurrentGrid()->isSecondLife()) app_url << SYSTEM_GRID_APP_SLURL_BASE << "/" << mAppCmd; else - app_url << llformat(DEFAULT_APP_SLURL_BASE, gHippoGridManager->getCurrentGridNick()) << "/" << mAppCmd; + app_url << llformat(DEFAULT_APP_SLURL_BASE, gHippoGridManager->getCurrentGridNick().c_str()) << "/" << mAppCmd; for(LLSD::array_const_iterator i = mAppPath.beginArray(); i != mAppPath.endArray(); i++)