From c96caed698afb38c50db229fff35fa8b91e40f83 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 27 Jul 2010 14:44:17 -0700
Subject: Merge from dessie/viewer-release

---
 indra/newview/app_settings/settings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index fa7343ed62..ce22db97b4 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7339,7 +7339,7 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  
+
   <key>RenderDeferredGI</key>
   <map>
     <key>Comment</key>
@@ -8032,7 +8032,7 @@
       <integer>2</integer>
     </map>
 
-  <key>RenderReflectionRes</key>
+    <key>RenderReflectionRes</key>
     <map>
       <key>Comment</key>
       <string>Reflection map resolution.</string>
-- 
cgit v1.2.3