summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2010-03-18 23:44:30 -0400
committerKent Quirk <q@lindenlab.com>2010-03-18 23:44:30 -0400
commita072b63f4106b707ce0cea7826223433f5bba352 (patch)
tree4f1b3ad15b57a58508e0402c2f6cbeb31a4928f8 /indra/llcommon
parent0c1ff8e8769a569c2551a2be04a18cc854cfc5d4 (diff)
parent1944f64107be98f344824045a19e113966591340 (diff)
Merge of PE merge with extra head
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);