diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-08 10:56:55 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-08 10:56:55 -0800 |
| commit | 5917029eefbd32d9db29e2359f9dcc805caeec60 (patch) | |
| tree | ab995985e3dcf011d9938ab78838b3f1e669ffab /indra/llwindow/llwindow.cpp | |
| parent | 72c6dc9698d0815bfd5b9ebefb401d92c6337500 (diff) | |
| parent | 0e11e774f839abf4c7e051fc3b021fd6d470a092 (diff) | |
Merge
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 1c6c9e6e9d..b77deb003f 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -407,3 +407,30 @@ 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 +} + |