diff options
author | brad kittenbrink <brad@lindenlab.com> | 2009-07-30 19:39:08 -0700 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2009-07-30 19:39:08 -0700 |
commit | a7efd0d8ddb68315653265d7e4ab87a156e56560 (patch) | |
tree | 4210ae49796fdb8fb4b28f0bdd857dc338110070 /indra/newview/llfeaturemanager.cpp | |
parent | b3a83059c464c9a974d547f57ab8e93ca0bee0f1 (diff) | |
parent | 29607ab70edea79cfdceaa52d632d77e6699cb8f (diff) |
Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups.
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
-rw-r--r-- | indra/newview/llfeaturemanager.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 2a8365b3f0..fb724f30e0 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -44,6 +44,7 @@ #include "llgl.h" #include "llsecondlifeurls.h" +#include "llappviewer.h" #include "llviewercontrol.h" #include "llworld.h" #include "lldrawpoolterrain.h" @@ -58,11 +59,6 @@ #include "lldxhardware.h" #endif -// -// externs -// -extern LLMemoryInfo gSysMemory; -extern LLCPUInfo gSysCPU; #if LL_DARWIN const char FEATURE_TABLE_FILENAME[] = "featuretable_mac.txt"; |