summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-12-09 12:47:36 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-12-09 12:47:36 +0200
commitcc6f28432e0b21df1cbb56bbc436175827332da1 (patch)
treed5d6006fa91a36bfdc2a731ac1c8a861290c398f /indra/llwindow/llwindowmacosx.cpp
parentff87f87fa6a33daf72eae963b2aa33c9d5890509 (diff)
parentb93fb9f31954b4851a13bd3070661537f9359b00 (diff)
Merge from default branch.
--HG-- branch : product-engine
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();