diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-11-05 16:45:18 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-05 16:45:18 -0700 |
| commit | d1c365e7b79c91a51b847535d8df0d804af5ae70 (patch) | |
| tree | 786ada896c585004d9e94c2171f13fd808009441 /indra/newview/llappviewer.h | |
| parent | 169fe36f69e3be6104af980ed005af5b77909e90 (diff) | |
| parent | 124a59263184391b0b4ec418c532b7a715e9b5a3 (diff) | |
Merge latest lindenlab/viewer-development with mani_linden/viewer-development.
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index ea44ade8c6..118f1c6dad 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -260,6 +260,9 @@ private: std::set<struct apr_dso_handle_t*> mPlugins; + U32 mAvailPhysicalMemInKB ; + U32 mAvailVirtualMemInKB ; + boost::scoped_ptr<LLUpdaterService> mUpdater; //--------------------------------------------- |