diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-06-18 16:15:03 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-06-18 16:15:03 -0400 |
| commit | 69b062b90889fe581de0d10d60b979cb7883b4a0 (patch) | |
| tree | 6286fc967bc0f551a9e67b8377bdfbc743f090b2 /indra/llui | |
| parent | c67db8e75511de879c69de0faf06a88ac3cc731d (diff) | |
| parent | 425ff28e4bc38ba3f7bfeade4a72dce4eba63b54 (diff) | |
merge with viewer-release
Diffstat (limited to 'indra/llui')
| -rwxr-xr-x | indra/llui/llfloater.cpp | 2 | ||||
| -rwxr-xr-x | indra/llui/llfloater.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 09e27a264a..0807b497a7 100755 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1621,7 +1621,7 @@ void LLFloater::bringToFront( S32 x, S32 y ) // virtual -void LLFloater::setVisibleAndFrontmost(BOOL take_focus, const LLSD& key) +void LLFloater::setVisibleAndFrontmost(BOOL take_focus,const LLSD& key) { LLMultiFloater* hostp = getHost(); if (hostp) diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 4dba1e645f..1d0d3cb050 100755 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -305,7 +305,7 @@ public: /*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); // do not override void setFrontmost(BOOL take_focus = TRUE); - virtual void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD()); + virtual void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD()); // Defaults to false. virtual BOOL canSaveAs() const { return FALSE; } |