From 65215a59afe7b5292944b1b37fb2157ae4ff1687 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 27 Sep 2009 15:54:39 -0500 Subject: Re-enabled "allow first life" userauth stuff. It was commented out when grid manager was added, but it makes certain Profile window pieces disappear. --- ChangeLog.txt | 9 +++++++++ linden/indra/newview/llstartup.cpp | 3 +-- 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 @@ +2009-09-27 Jacek Antonelli + + * 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-26 Jacek Antonelli * 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() 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)) -- cgit v1.1