diff options
| author | Richard Linden <none@none> | 2013-08-16 12:39:11 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-16 12:39:11 -0700 |
| commit | f8e3a34348ab98ecd56d53360b8f2b6512ad6bba (patch) | |
| tree | c0042514f1242d58cea031be84c23d493f39bb6a /indra/newview/llappviewer.h | |
| parent | 52640b85c497e8b0a900ff3f1e051021b5485277 (diff) | |
| parent | 25937040de9a787c221aae7f178f43827c799028 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rwxr-xr-x | indra/newview/llappviewer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 60a1045f58..10452e64e2 100755 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -367,7 +367,7 @@ class LLVFS; extern LLVFS *gStaticVFS; extern LLMemoryInfo gSysMemory; -extern U64 gMemoryAllocated; +extern U64Bytes gMemoryAllocated; extern std::string gLastVersionChannel; |