diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-12-08 17:40:20 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-12-08 17:40:20 -0500 |
commit | c130f5d4c9ea6ffb423f05d965168d10c6c99c05 (patch) | |
tree | a69aae20d514ed88d1da30c9b60b9ac378e16e22 /indra/llwindow/llwindowmacosx.cpp | |
parent | d4b888d47840d57b071dd2cf6dea492c4230e4b4 (diff) | |
parent | 27da9502d4f10311d12af7a0b129d46bdf94925e (diff) |
automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
-rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 2 |
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(); |