STORM-1980 Code cleanup and an attempt to fix a mac/linux compile error

3 files changed, 7 insertions, 21 deletions

diff --git a/indra/newview/llfloaterregionrestarting.cpp b/indra/newview/llfloaterregionrestarting.cpp
index 62bce27d09..09518fff2d 100644
--- a/indra/newview/llfloaterregionrestarting.cpp
+++ b/indra/newview/llfloaterregionrestarting.cpp
@@ -39,7 +39,7 @@ LLFloaterRegionRestarting::LLFloaterRegionRestarting(const LLSD& key) :
 	LLFloater(key),
 	LLEventTimer(1)
 {
-	mName = key["NAME"];
+	mName = (std::string)key["NAME"];
 	mSeconds = (LLSD::Integer)key["SECONDS"];
 }
 
@@ -61,16 +61,6 @@ BOOL LLFloaterRegionRestarting::postBuild()
 
 	LLEnvManagerNew::instance().setRegionChangeCallback(boost::bind(&LLFloaterRegionRestarting::regionChange, this));
 
-	LLFloaterRegionRestarting* floaterp = LLFloaterReg::findTypedInstance<LLFloaterRegionRestarting>("region_restarting");
-
-	if (floaterp)
-	{
-llwarns << "DBG setting color" << llendl;
-		LLColor4 bg_color;
-		bg_color = LLUIColorTable::instance().getColor("LtOrange");
-		floaterp->setBackgroundColor(bg_color);
-	}
-
 	return TRUE;
 }
 
@@ -92,9 +82,7 @@ void LLFloaterRegionRestarting::refresh()
 	std::string text;
 
 	args["[SECONDS]"] = llformat("%d", mSeconds);
-	text = getString("RestartSeconds", args);
-	LLTextBox* textbox = getChild<LLTextBox>("restart_seconds");
-	textbox->setValue(text);
+	getChild<LLTextBox>("restart_seconds")->setValue(getString("RestartSeconds", args));
 
 	mSeconds = mSeconds - 1;
 	if(mSeconds < 0.0)
@@ -113,7 +101,7 @@ void LLFloaterRegionRestarting::close()
 	}
 }
 
-void LLFloaterRegionRestarting::updateTime(U32 time)
+void LLFloaterRegionRestarting::updateTime(S32 time)
 {
 	mSeconds = time;
 }
diff --git a/indra/newview/llfloaterregionrestarting.h b/indra/newview/llfloaterregionrestarting.h
index 84f1bc65fb..fef0dcddfe 100644
--- a/indra/newview/llfloaterregionrestarting.h
+++ b/indra/newview/llfloaterregionrestarting.h
@@ -37,7 +37,7 @@ class LLFloaterRegionRestarting : public LLFloater,  public LLEventTimer
 
 public:
 	static void close();
-	static void updateTime(U32 time);
+	static void updateTime(S32 time);
 
 private:
 	LLFloaterRegionRestarting(const LLSD& key);
@@ -47,8 +47,6 @@ private:
 	virtual void refresh();
 	virtual void regionChange();
 
-	LLTextBox*	mRestartSeconds;
-
 	std::string mName;
 };
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index ac652ef329..0ce8585c15 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5964,14 +5964,14 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
 		if (notificationID == "RegionRestartMinutes" ||
 			notificationID == "RegionRestartSeconds")
 		{
-			U32 seconds;
+			S32 seconds;
 			if (notificationID == "RegionRestartMinutes")
 			{
-				seconds = 60 * static_cast<U32>(llsdBlock["MINUTES"].asInteger());
+				seconds = 60 * static_cast<S32>(llsdBlock["MINUTES"].asInteger());
 			}
 			else
 			{
-				seconds = static_cast<U32>(llsdBlock["SECONDS"].asInteger());
+				seconds = static_cast<S32>(llsdBlock["SECONDS"].asInteger());
 			}
 
 			LLSD params;