diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
| commit | a3a430651780f82afb0fd355a0abe11d88f410d6 (patch) | |
| tree | a2ec3b87b2bff75904be0e7a6bf38d17c59edb68 /indra/llcommon | |
| parent | b952a5e5851d1a8bc2a45f00248b051497fec71f (diff) | |
| parent | f50be64167c254e27f635ad47d8940551f0c6ab4 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsys.h | 1 |
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); |