diff options
author | Jacek Antonelli | 2008-08-15 23:45:11 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:11 -0500 |
commit | 215f423cbe18fe9ca14a26caef918d303bad28ff (patch) | |
tree | 0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/llcommon/llmemory.h | |
parent | Second Life viewer sources 1.18.3.5-RC (diff) | |
download | meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2 meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz |
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to 'linden/indra/llcommon/llmemory.h')
-rw-r--r-- | linden/indra/llcommon/llmemory.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linden/indra/llcommon/llmemory.h b/linden/indra/llcommon/llmemory.h index b6f42e3..b72046c 100644 --- a/linden/indra/llcommon/llmemory.h +++ b/linden/indra/llcommon/llmemory.h | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file llmemory.h | 2 | * @file llmemory.h |
3 | * @brief Memory allocation/deallocation header-stuff goes here. | 3 | * @brief Memory allocation/deallocation header-stuff goes here. |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2002&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 7 | * Copyright (c) 2002-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,6 +26,7 @@ | |||
24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
29 | * $/LicenseInfo$ | ||
27 | */ | 30 | */ |
28 | #ifndef LL_MEMORY_H | 31 | #ifndef LL_MEMORY_H |
29 | #define LL_MEMORY_H | 32 | #define LL_MEMORY_H |
@@ -415,5 +418,8 @@ public: | |||
415 | 418 | ||
416 | //---------------------------------------------------------------------------- | 419 | //---------------------------------------------------------------------------- |
417 | 420 | ||
418 | #endif | 421 | // Return the resident set size of the current process, in bytes. |
422 | // Return value is zero if not known. | ||
423 | U64 getCurrentRSS(); | ||
419 | 424 | ||
425 | #endif | ||