diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-22 16:12:41 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-22 16:12:41 -0700 |
| commit | 18b7ab0018695e261dbc5058d76f9d371958b034 (patch) | |
| tree | 9b4baa5a5ca563ace1b06ac6b3df9fd9c0a0d0f7 /indra/llcommon/llsys.h | |
| parent | 60c4621500e478d66a8bdc3a1c80573be2860fee (diff) | |
| parent | be139dfb957e1b0d3c59110284c43630d3b57d23 (diff) | |
Weekly automated merge from viewer 2.0
Diffstat (limited to 'indra/llcommon/llsys.h')
| -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); |