diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-28 01:03:56 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-28 01:03:56 +0300 |
| commit | 057c034cb4584fb70f63a1572be0ff2219ad6294 (patch) | |
| tree | 069ecea204f81c380f484caa6aac41c29184ed3e /indra/llui/llfloater.h | |
| parent | 817ae347744eab55ee1f8084102fbc8dc5195f3a (diff) | |
| parent | 0d5edb03a226a62bb416ddca250e4f1f789f56fd (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/llui/llfloater.h')
| -rw-r--r-- | indra/llui/llfloater.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index ef7c6180d2..165f67499b 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -310,7 +310,7 @@ public: /*virtual*/ void setVisible(BOOL visible); // do not override /*virtual*/ void onVisibilityChange ( BOOL new_visibility ); // do not override - void setFrontmost(BOOL take_focus = TRUE); + void setFrontmost(BOOL take_focus = TRUE, BOOL restore = TRUE); virtual void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD()); // Defaults to false. @@ -547,7 +547,7 @@ public: void setCycleMode(BOOL mode) { mFocusCycleMode = mode; } BOOL getCycleMode() const { return mFocusCycleMode; } - void bringToFront( LLFloater* child, BOOL give_focus = TRUE ); + void bringToFront( LLFloater* child, BOOL give_focus = TRUE, BOOL restore = TRUE ); void highlightFocusedFloater(); void unhighlightFocusedFloater(); void focusFrontFloater(); |