summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsys.h
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-03-18 20:06:32 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-03-18 20:06:32 +0200
commit1944f64107be98f344824045a19e113966591340 (patch)
treed6b199092d07abc44fdf57deeaf8a332f010610f /indra/llcommon/llsys.h
parent1bf989705cf33fa27e404743108c6920cf33a7f2 (diff)
parentc74f87015118a6da7036623d026fc512f46af9d5 (diff)
manual merge -r 10503
Diffstat (limited to 'indra/llcommon/llsys.h')
-rw-r--r--indra/llcommon/llsys.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h
index f1dda1b2e2..c2c45bec9a 100644
--- a/indra/llcommon/llsys.h
+++ b/indra/llcommon/llsys.h
@@ -122,6 +122,7 @@ public:
U32 getPhysicalMemoryClamped() const; ///< Memory size in clamped bytes
};
+
LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLOSInfo& info);
LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLCPUInfo& info);
LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLMemoryInfo& info);