diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-03-19 09:46:24 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-03-19 09:46:24 -0700 |
| commit | 40e04fdb3b416a686c66989ee5d44c5eaf97b9fd (patch) | |
| tree | 537b95c75bdb4a96a9f663895f89cb73f54c8f67 /indra/llwindow/llwindow.cpp | |
| parent | 70df3c1fa72ae8ecddf144452b4fe032ad48182e (diff) | |
| parent | 1a28e325c4d148d2322bc9becb672abf99315a96 (diff) | |
Merge with tip
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index b77deb003f..1c6c9e6e9d 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -407,30 +407,3 @@ BOOL LLWindowManager::isWindowValid(LLWindow *window) { return sWindowList.find(window) != sWindowList.end(); } - -S32 LLDisplayInfo::getDisplayWidth() const -{ -#if LL_WINDOWS - return LLWindowWin32::getDisplayWidth(); -#elif LL_DARWIN - return LLWindowMacOSX::getDisplayWidth(); -#elif LL_SDL - return LLWindowSDL::getDisplayWidth(); -#else - return 1024; //*FIXME -#endif -} - -S32 LLDisplayInfo::getDisplayHeight() const -{ -#if LL_WINDOWS - return LLWindowWin32::getDisplayHeight(); -#elif LL_DARWIN - return LLWindowMacOSX::getDisplayHeight(); -#elif LL_SDL - return LLWindowSDL::getDisplayHeight(); -#else - return 768; //*FIXME -#endif -} - |