diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-07 15:27:17 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-07 15:27:17 +0000 |
| commit | 0775e919018a8246e7af03f00b94f50abd84dd96 (patch) | |
| tree | 530fcb0473adacde42f9c3df2258f1c26a6bcc62 /indra/llcommon/llsys.cpp | |
| parent | 93051dc23cb3252af327a9b113abc45de154ff4e (diff) | |
| parent | f499260782a0c94c4f164a743da9d2690240dad7 (diff) | |
PE merge.
Diffstat (limited to 'indra/llcommon/llsys.cpp')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 0ed700b9da..0272c55db2 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -775,33 +775,6 @@ void LLMemoryInfo::stream(std::ostream& s) const #endif } -S32 LLDisplayInfo::getDisplayWidth() const -{ -#if LL_WINDOWS - return ::GetSystemMetrics(SM_CXVIRTUALSCREEN); -#elif LL_DARWIN - return 1024; //*FIXME -#elif LL_SOLARIS - return 1024; //*FIXME -#else - return 1024; //*FIXME -#endif -} - -S32 LLDisplayInfo::getDisplayHeight() const -{ -#if LL_WINDOWS - return ::GetSystemMetrics(SM_CYVIRTUALSCREEN); -#elif LL_DARWIN - return 768; //*FIXME -#elif LL_SOLARIS - return 768; //*FIXME -#else - return 768; //*FIXME -#endif -} - - std::ostream& operator<<(std::ostream& s, const LLOSInfo& info) { info.stream(s); |