From 6dd3f54924b57224298f6d76c766b403d165783f Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 30 Nov 2009 17:55:19 -0800
Subject: Simple fix for Hg merge tool shittiness..

---
 indra/newview/llfloatermediasettings.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp
index 1446b828c9..16a76723eb 100644
--- a/indra/newview/llfloatermediasettings.cpp
+++ b/indra/newview/llfloatermediasettings.cpp
@@ -268,8 +268,6 @@ const std::string LLFloaterMediaSettings::getHomeUrl()
 		return std::string( "" );
 }
 
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // virtual 
 void LLFloaterMediaSettings::draw()
@@ -300,4 +298,6 @@ void LLFloaterMediaSettings::draw()
 	
 	enableOkApplyBtns(values_changed);
 	
-	LLFloater::draw();
\ No newline at end of file
+	LLFloater::draw();
+}
+
-- 
cgit v1.2.3