diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-27 23:21:27 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-27 23:21:27 +0200 |
| commit | 407ee5d98fc9d856a0431cb1a39898e3805c159b (patch) | |
| tree | 9de0d0b5f4d2abf2d4fbe60000b17844c3aa99a5 /indra/llui/llfloater.h | |
| parent | d9ad20055330e0911a553af284359a5cf5711b7b (diff) | |
| parent | a77a49af4537ca7419947e083ae6950c1aba8330 (diff) | |
merging into latest changes
Diffstat (limited to 'indra/llui/llfloater.h')
| -rw-r--r-- | indra/llui/llfloater.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index a657538eb7..9ad566a1a1 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -302,6 +302,7 @@ public: /*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); // do not override void setFrontmost(BOOL take_focus = TRUE); + virtual void setVisibleAndFrontmost(BOOL take_focus=TRUE); // Defaults to false. virtual BOOL canSaveAs() const { return FALSE; } @@ -373,7 +374,6 @@ protected: void setInstanceName(const std::string& name); virtual void bringToFront(S32 x, S32 y); - virtual void setVisibleAndFrontmost(BOOL take_focus=TRUE); void setExpandedRect(const LLRect& rect) { mExpandedRect = rect; } // size when not minimized const LLRect& getExpandedRect() const { return mExpandedRect; } |