summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2009-12-09 14:56:48 -0800
committercallum <none@none>2009-12-09 14:56:48 -0800
commita97479f41bae05ff08b3598a9497be9be3ee371d (patch)
tree860b0e365bc24fb056030622bdb04574e6f46ba3 /indra/llwindow/llwindowmacosx.cpp
parentdc3cad90c1cd4490d8035832138579f9711f8549 (diff)
parent874f53230dbe40e599e8903fae87a60816508fd6 (diff)
Merge with head
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
-rw-r--r--indra/llwindow/llwindowmacosx.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 86bbb0bcf8..ed62faece6 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -1033,6 +1033,7 @@ void LLWindowMacOSX::hide()
HideWindow(mWindow);
}
+//virtual
void LLWindowMacOSX::minimize()
{
setMouseClipping(FALSE);
@@ -1040,6 +1041,7 @@ void LLWindowMacOSX::minimize()
CollapseWindow(mWindow, true);
}
+//virtual
void LLWindowMacOSX::restore()
{
show();