From 798d367d54a6c6379ad355bd8345fa40e31e7fe9 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 6 Sep 2008 18:24:57 -0500 Subject: Second Life viewer sources 1.21.0-RC --- linden/indra/newview/llfloaterenvsettings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linden/indra/newview/llfloaterenvsettings.cpp') diff --git a/linden/indra/newview/llfloaterenvsettings.cpp b/linden/indra/newview/llfloaterenvsettings.cpp index b16b48d..d7f2ed0 100644 --- a/linden/indra/newview/llfloaterenvsettings.cpp +++ b/linden/indra/newview/llfloaterenvsettings.cpp @@ -53,7 +53,7 @@ LLFloaterEnvSettings* LLFloaterEnvSettings::sEnvSettings = NULL; -LLFloaterEnvSettings::LLFloaterEnvSettings() : LLFloater("Environment Settings Floater") +LLFloaterEnvSettings::LLFloaterEnvSettings() : LLFloater(std::string("Environment Settings Floater")) { LLUICtrlFactory::getInstance()->buildFloater(this, "floater_env_settings.xml"); @@ -110,7 +110,7 @@ void LLFloaterEnvSettings::syncMenu() // sync the clock F32 val = (F32)LLWLParamManager::instance()->mAnimator.getDayTime(); - LLString timeStr = timeToString(val); + std::string timeStr = timeToString(val); LLTextBox* textBox; textBox = sEnvSettings->getChild("EnvTimeText"); @@ -308,7 +308,7 @@ void LLFloaterEnvSettings::onUseEstateTime(void* userData) LLWLParamManager::instance()->mAnimator.mUseLindenTime = true; } -LLString LLFloaterEnvSettings::timeToString(F32 curTime) +std::string LLFloaterEnvSettings::timeToString(F32 curTime) { S32 hours; S32 min; -- cgit v1.1