summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2010-03-19 09:46:24 -0700
committerCallum Prentice <callum@lindenlab.com>2010-03-19 09:46:24 -0700
commit40e04fdb3b416a686c66989ee5d44c5eaf97b9fd (patch)
tree537b95c75bdb4a96a9f663895f89cb73f54c8f67 /indra/llcommon
parent70df3c1fa72ae8ecddf144452b4fe032ad48182e (diff)
parent1a28e325c4d148d2322bc9becb672abf99315a96 (diff)
Merge with tip
Diffstat (limited to 'indra/llcommon')
-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);