diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-07 17:11:30 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-07 17:11:30 -0800 |
| commit | 4ee2b01b304b5c95fd4b1d73109033d37e84cb25 (patch) | |
| tree | a9daa67e94ae62cab5ecacf1743d02ce2e0a21e4 /indra/llui | |
| parent | 87c94625d39a72ce8b19b2c295c3824fb45717a3 (diff) | |
| parent | bfb22638f865c2270fad95c35eff273b134772e3 (diff) | |
Pull from viewer-chui, had to resolve conflicts on llimfloatercontainer.cpp
Diffstat (limited to 'indra/llui')
| -rwxr-xr-x | indra/llui/llfolderviewitem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h index 7e37e06064..b157aabdcf 100755 --- a/indra/llui/llfolderviewitem.h +++ b/indra/llui/llfolderviewitem.h @@ -260,7 +260,7 @@ public: // virtual void handleDropped(); virtual void draw(); - void drawOpenFolderArrow(const Params& default_params, const LLUIColor& fg_color); + virtual 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, |