diff options
| author | Jacek Antonelli | 2009-09-09 11:38:26 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-09 11:59:42 -0500 |
| commit | ced5a5f6a0e7d294f9e477409387674fcecc532c (patch) | |
| tree | e7500de0806009c2955bef6af7103ac60ae1e8e0 /linden/indra/newview/llstartup.cpp | |
| parent | Merge branch 'objectbackup' into next (diff) | |
| parent | Commented out permissions button (todo: backport this if there's time) (diff) | |
| download | meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.zip meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.gz meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.bz2 meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Moved "Backup" pie menu item to fit "Go Here" in top-left slot.
Conflicts:
linden/indra/newview/llviewermenu.cpp
linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
Diffstat (limited to 'linden/indra/newview/llstartup.cpp')
| -rw-r--r-- | linden/indra/newview/llstartup.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index 2dc4e74..8d5aa9e 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
| @@ -2484,6 +2484,10 @@ bool idle_startup() | |||
| 2484 | 2484 | ||
| 2485 | // Have the agent start watching the friends list so we can update proxies | 2485 | // Have the agent start watching the friends list so we can update proxies |
| 2486 | gAgent.observeFriends(); | 2486 | gAgent.observeFriends(); |
| 2487 | |||
| 2488 | // Start loading inventory | ||
| 2489 | gInventory.startBackgroundFetch(); | ||
| 2490 | |||
| 2487 | if (gSavedSettings.getBOOL("LoginAsGod")) | 2491 | if (gSavedSettings.getBOOL("LoginAsGod")) |
| 2488 | { | 2492 | { |
| 2489 | gAgent.requestEnterGodMode(); | 2493 | gAgent.requestEnterGodMode(); |