diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-28 19:41:47 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-28 19:41:47 -0800 |
| commit | 1a9a55087248eb76330761c2f67e989135472153 (patch) | |
| tree | d18706e65e3eb5339607289daeca22689c1089e7 /indra/llui | |
| parent | 4da50b21d5dc49cf6b39f7c29b44c1bb869a13cd (diff) | |
| parent | 45e8926f138a2b42c5054149d3a9f6f39df29247 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.h | 2 | ||||
| -rwxr-xr-x | indra/llui/llfolderviewitem.h | 2 |
2 files changed, 2 insertions, 2 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; } diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h index c5d6d26e84..2e633a39e5 100755 --- a/indra/llui/llfolderviewitem.h +++ b/indra/llui/llfolderviewitem.h @@ -264,7 +264,7 @@ public: // virtual void handleDropped(); virtual void draw(); - virtual void drawOpenFolderArrow(const Params& default_params, const LLUIColor& fg_color); + void drawOpenFolderArrow(const Params& default_params, const LLUIColor& fg_color); void drawHighlight(const BOOL showContent, const BOOL hasKeyboardFocus, const LLUIColor &bgColor, const LLUIColor &outlineColor, const LLUIColor &mouseOverColor); void drawLabel(const LLFontGL * font, const F32 x, const F32 y, const LLColor4& color, F32 &right_x); virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, |