summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.cpp
diff options
context:
space:
mode:
authorPalmer Truelson <palmer@lindenlab.com>2009-12-14 11:44:48 -0600
committerPalmer Truelson <palmer@lindenlab.com>2009-12-14 11:44:48 -0600
commitde38b58f37d6c7dadd4a5f15be519cb0bb230fc7 (patch)
treefdfe34a8be0e2086c1e9407931af85f5f8c2fc39 /indra/llwindow/llwindowmacosx.cpp
parentfadfa09e6d3bbff9ebae0aabeacf26a83aae4ad7 (diff)
parenta9e409c7071ba74f01158aa7b876a1ad60161fc4 (diff)
Merging in latest viewer 2
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();