diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 19:12:04 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 19:12:04 -0800 |
| commit | 4105ae946707947e469793364e07adde7993cffe (patch) | |
| tree | e17aa66d11cedf6ab6e0c4b304b94ec9b7670b57 /indra/llui | |
| parent | 14e82732f4f74ec59933bb9e6c67cf1ce7800a7f (diff) | |
CHUI-529: Post code review changes. When showing a floater using LLFloater::showInstance() instead of setVisibleAndFrontmost(). Also made setVisibleAndFrontmost() public since both setVisible and setFrontmost are public functions.
Diffstat (limited to 'indra/llui')
| -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; } |