Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

1 files changed, 3 insertions, 5 deletions

diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index a3da4f5..b847a53 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -29,11 +29,11 @@
  * $/LicenseInfo$
  */
 
+#include "llviewerprecompiledheaders.h"
+
 #include <iostream>
 #include <fstream>
 
-#include "llviewerprecompiledheaders.h"
-
 #include <boost/regex.hpp>
 
 #include "llfeaturemanager.h"
@@ -447,8 +447,6 @@ void LLFeatureManager::applyRecommendedSettings()
         {
                 gSavedSettings.setF32("RenderFarClip", 128.0f);
         }
-
-
 }
 
 void LLFeatureManager::applyFeatures(bool skipFeatures)