summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.cpp
diff options
context:
space:
mode:
authorSamuel Kolb <skolb@lindenlab.com>2009-12-11 10:08:37 -0800
committerSamuel Kolb <skolb@lindenlab.com>2009-12-11 10:08:37 -0800
commit941497dd30c409a2f352b0bfc1c48bfaca5ea76e (patch)
treeed7bdc596ee0a856f9739864239f75c64db85f50 /indra/llwindow/llwindowmacosx.cpp
parent4b710367a1ac986e8be731bc391c0b375424148f (diff)
parent0a8d9fa5b5d044bed7d4c38ec51d87bc90f3b3a6 (diff)
merge
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
-rw-r--r--indra/llwindow/llwindowmacosx.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index af9a30cb25..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();
@@ -1441,7 +1443,7 @@ static void fixOrigin(void)
::GetPortBounds(port, &portrect);
if((portrect.left != 0) || (portrect.top != 0))
{
- // Mozilla sometimes changes our port origin. Fuckers.
+ // Mozilla sometimes changes our port origin.
::SetOrigin(0,0);
}
}