diff options
| author | Palmer <palmer@lindenlab.com> | 2009-12-08 10:00:32 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-12-08 10:00:32 -0800 |
| commit | 74f2cb2a70ddad7fe8819fd6855831e0615dc8d5 (patch) | |
| tree | 61f2ce7a6cfb5963b7517a582164047a6833757b /indra/newview/llgrouplist.h | |
| parent | cd138869d5bfcf40d3d13d7b887e36263e2919d9 (diff) | |
| parent | e07ef0d0e0e8cbd58afd4c6ee970634bd2f783e7 (diff) | |
Grabbed more viewer 2 changes that should fix parabuild problem
Diffstat (limited to 'indra/newview/llgrouplist.h')
| -rw-r--r-- | indra/newview/llgrouplist.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h index 8dbc13997c..41b4d01711 100644 --- a/indra/newview/llgrouplist.h +++ b/indra/newview/llgrouplist.h @@ -37,6 +37,7 @@ #include "llflatlistview.h" #include "llpanel.h" #include "llpointer.h" +#include "llstyle.h" /** * Auto-updating list of agent groups. @@ -66,7 +67,7 @@ public: private: void setDirty(bool val = true) { mDirty = val; } void refresh(); - void addNewItem(const LLUUID& id, const std::string& name, const LLUUID& icon_id, BOOL is_bold, EAddPosition pos = ADD_BOTTOM); + void addNewItem(const LLUUID& id, const std::string& name, const LLUUID& icon_id, EAddPosition pos = ADD_BOTTOM); bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata); // called on agent group list changes bool mShowIcons; @@ -90,7 +91,7 @@ public: const LLUUID& getGroupID() const { return mGroupID; } const std::string& getGroupName() const { return mGroupName; } - void setName(const std::string& name); + void setName(const std::string& name, const std::string& highlight = LLStringUtil::null); void setGroupID(const LLUUID& group_id); void setGroupIconID(const LLUUID& group_icon_id); void setGroupIconVisible(bool visible); @@ -106,6 +107,7 @@ private: LLButton* mInfoBtn; std::string mGroupName; + LLStyle::Params mGroupNameStyle; static S32 sIconWidth; // icon width + padding }; |