aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt9
-rw-r--r--linden/indra/newview/llstartup.cpp3
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index df161e6..c9fc8a9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,12 @@
12009-09-27 Jacek Antonelli <jacek.antonelli@gmail.com>
2
3 * Re-enabled "allow first life" userauth stuff.
4 It was commented out when grid manager was added, but it
5 makes certain Profile window pieces disappear.
6
7 modified: linden/indra/newview/llstartup.cpp
8
9
12009-09-26 Jacek Antonelli <jacek.antonelli@gmail.com> 102009-09-26 Jacek Antonelli <jacek.antonelli@gmail.com>
2 11
3 * Renamed 'Restrained Life Active' to 'Restrained Life Support'. 12 * Renamed 'Restrained Life Active' to 'Restrained Life Support'.
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()
2130 LLAvatarTracker::instance().addBuddyList(list); 2130 LLAvatarTracker::instance().addBuddyList(list);
2131 } 2131 }
2132 2132
2133 /*
2134 options.clear(); 2133 options.clear();
2135 if(LLUserAuth::getInstance()->getOptions("ui-config", options)) 2134 if(LLUserAuth::getInstance()->getOptions("ui-config", options))
2136 { 2135 {
@@ -2149,7 +2148,7 @@ bool idle_startup()
2149 } 2148 }
2150 } 2149 }
2151 } 2150 }
2152 */ 2151
2153 options.clear(); 2152 options.clear();
2154 bool show_hud = false; 2153 bool show_hud = false;
2155 if(LLUserAuth::getInstance()->getOptions("tutorial_setting", options)) 2154 if(LLUserAuth::getInstance()->getOptions("tutorial_setting", options))