diff options
| author | McCabe Maxsted | 2009-09-27 21:44:44 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-27 21:44:44 -0700 |
| commit | a8477f3570e249ee8b4a089340001ff9b26f69c0 (patch) | |
| tree | 4c81383dc2b4bb650141147a08151c3f0be9547e /linden/indra/newview/llstartup.cpp | |
| parent | Show disabled buttons for own profile rather than hiding them (diff) | |
| parent | Rearranged the Import stuff in the File menu. (diff) | |
| download | meta-impy-a8477f3570e249ee8b4a089340001ff9b26f69c0.zip meta-impy-a8477f3570e249ee8b4a089340001ff9b26f69c0.tar.gz meta-impy-a8477f3570e249ee8b4a089340001ff9b26f69c0.tar.bz2 meta-impy-a8477f3570e249ee8b4a089340001ff9b26f69c0.tar.xz | |
Merge jacek/next into 1.2.0-next
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llstartup.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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)) |