diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-16 19:48:11 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-16 19:48:11 +0300 |
| commit | 30b864e6d45299d2105e7f8a6554e073d0aca6f0 (patch) | |
| tree | 0744f7c7bc14995b3f952ec18344aa38fc9b1ac4 /indra/llwindow/llwindowmacosx.cpp | |
| parent | 847afb9c653f3bb7d0729589cabacb9f4910ccf3 (diff) | |
| parent | db6d4a3cb45e65d06f2e2dca54b5352694cd0a16 (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index fedea3de08..6dec131a34 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -869,10 +869,11 @@ BOOL LLWindowMacOSX::getSize(LLCoordScreen *size) size->mX = sz.width; size->mY = sz.height; + err = noErr; } else { - LL_ERRS() << "LLWindowMacOSX::getPosition(): no window and not fullscreen!" << LL_ENDL; + LL_ERRS() << "LLWindowMacOSX::getSize(): no window and not fullscreen!" << LL_ENDL; } return (err == noErr); @@ -894,10 +895,13 @@ BOOL LLWindowMacOSX::getSize(LLCoordWindow *size) size->mX = sz.width; size->mY = sz.height; + err = noErr; + + } else { - LL_ERRS() << "LLWindowMacOSX::getPosition(): no window and not fullscreen!" << LL_ENDL; + LL_ERRS() << "LLWindowMacOSX::getSize(): no window and not fullscreen!" << LL_ENDL; } return (err == noErr); |