2 files changed, 24 insertions, 16 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index bcb715e..518db1e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,7 +1,16 @@
+2009-09-27  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Re-enabled "allow first life" userauth stuff.
+          It was commented out when grid manager was added, but it
+          makes certain Profile window pieces disappear.
+
+          modified:   linden/indra/newview/llstartup.cpp
+
+
 2009-09-27 McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Changes to make the grid manager compile on Windows.
-        
+
           modified:   linden/indra/newview/hippoGridManager.cpp
           modified:   linden/indra/newview/hippoLimits.cpp
           modified:   linden/indra/newview/hippoRestRequest.cpp
@@ -23,14 +32,14 @@
 
 2009-09-26 McCabe Maxsted  <hakushakukun@gmail.com>
 
-        * Made the windlight floater toggle.  
-          
+        * Made the windlight floater toggle.
+
           modified:   linden/indra/newview/llfloaterwindlight.cpp
-          
-          
+
+
         * Added select Torley Windlight presets to Imprudence.
           Presets good for photography, mainly.
-          
+
           new file:   %5BTOR%5D%202012.xml
           new file:   %5BTOR%5D%20Alien%20planet.xml
           new file:   %5BTOR%5D%20An%20incongruent%20truth.xml
@@ -79,23 +88,23 @@
           new file:   %5BTOR%5D%20Study%20vessels.xml
           new file:   %5BTOR%5D%20Teak%20weak.xml
           new file:   %5BTOR%5D%20Wuxia%20nights.xml
-          
-          
+
+
         * Removed overridden /oy compiler option.
-        
+
           modified:   linden/indra/cmake/00-Common.cmake
-        
-        
+
+
         * Changed radar label from 'meters' to 'm'.
-        
+
           modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
 
 
         * Added Windlight presets by Ana Lutetia to Imprudence.
-        
+
           new file:   %2EAnaLu%2E%20default1.xml
           new file:   %2EAnaLu%2E%20default2.xml
-          new file:   %2EAnaLu%2E%20default3.xml
+          new file:   %2EAnaLu%2E%20default3.xml
           new file:   %2EAnaLu%2E%20neutral.xml
           new file:   %2EAnaLu%2E%20outdoor%20city%20weirdlights.xml
           new file:   %2EAnaLu%2E%20outdoor%20city.xml
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 9b46054..6839a4f 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2130,7 +2130,6 @@ bool idle_startup()
                         LLAvatarTracker::instance().addBuddyList(list);
                 }
 
-                /*
                 options.clear();
                 if(LLUserAuth::getInstance()->getOptions("ui-config", options))
                 {
@@ -2149,7 +2148,7 @@ bool idle_startup()
                                 }
                         }
                 }
-                */
+
                 options.clear();
                 bool show_hud = false;
                 if(LLUserAuth::getInstance()->getOptions("tutorial_setting", options))