diff options
| author | James Cook <james@lindenlab.com> | 2010-03-29 16:55:22 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-29 16:55:22 -0700 |
| commit | ecc2c726502448076295254714c0bfa8c0074f25 (patch) | |
| tree | 6a9434c540f7b5ea7bca326df1a420e4a0a99cc4 /indra/llcommon/llsys.cpp | |
| parent | d2f9e34598621f1dabad15025417efd6b81dddf0 (diff) | |
| parent | ac103403160e87bb6b40ac3e032d077a3381da8e (diff) | |
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
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); |