aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-06-18 21:23:29 -0700
committerJacek Antonelli2010-06-19 02:44:20 -0500
commitad5b6e3de6648e53bb8669e561d5e0fcf2e84c76 (patch)
tree739b4094d9674395eaade9c1e73d0d65338d4bbf /linden/indra/newview/llstartup.cpp
parentFixed #318 Crash in LLWindlightRemoteCtrl::refreshPresets() (diff)
downloadmeta-impy-ad5b6e3de6648e53bb8669e561d5e0fcf2e84c76.zip
meta-impy-ad5b6e3de6648e53bb8669e561d5e0fcf2e84c76.tar.gz
meta-impy-ad5b6e3de6648e53bb8669e561d5e0fcf2e84c76.tar.bz2
meta-impy-ad5b6e3de6648e53bb8669e561d5e0fcf2e84c76.tar.xz
Made the AO start loading at startup
(fixes bug where it wouldn't enable unless the window was opened)
Diffstat (limited to 'linden/indra/newview/llstartup.cpp')
-rw-r--r--linden/indra/newview/llstartup.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 1cc1871..735397e 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -197,6 +197,8 @@
197#include "lldxhardware.h" 197#include "lldxhardware.h"
198#endif 198#endif
199 199
200#include "floaterao.h"
201
200#include "hippoGridManager.h" 202#include "hippoGridManager.h"
201#include "hippoLimits.h" 203#include "hippoLimits.h"
202// 204//
@@ -2671,6 +2673,12 @@ bool idle_startup()
2671 gStatusBar->updateElements(); 2673 gStatusBar->updateElements();
2672 } 2674 }
2673 2675
2676 // Start the AO now that settings have loaded and login successful -- MC
2677 if (!gAOInvTimer)
2678 {
2679 gAOInvTimer = new AOInvTimer();
2680 }
2681
2674 LLFirstUse::ClientTags(); 2682 LLFirstUse::ClientTags();
2675 2683
2676 // Let the map know about the inventory. 2684 // Let the map know about the inventory.