diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:17:30 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:17:30 -0700 |
| commit | 80b682d4b4dd1256ee09dd3327d2c51e3adee0b5 (patch) | |
| tree | 751731e4b23e08264caf6436ae2c60cff8094240 /indra/newview/llfeaturemanager.cpp | |
| parent | b43771cad585cb9820941eb1b24b67390eaa9435 (diff) | |
| parent | 127b428863707c882fbf4d30699321b8a2365644 (diff) | |
merge
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"; |