diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/llnamebox.h | |
parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/llnamebox.h')
-rw-r--r-- | indra/newview/llnamebox.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/indra/newview/llnamebox.h b/indra/newview/llnamebox.h index f76850bd3c..3edb36883f 100644 --- a/indra/newview/llnamebox.h +++ b/indra/newview/llnamebox.h @@ -44,10 +44,15 @@ class LLNameBox : public LLTextBox { public: - LLNameBox(const std::string& name, const LLRect& rect, const LLUUID& name_id = LLUUID::null, BOOL is_group = FALSE, const LLFontGL* font = NULL, BOOL mouse_opaque = TRUE ); - // By default, follows top and left and is mouse-opaque. - // If no text, text = name. - // If no font, uses default system font. + struct Params : public LLInitParam::Block<Params, LLTextBox::Params> + { + Optional<bool> is_group; + + Params() + : is_group("is_group", false) + {} + }; + virtual ~LLNameBox(); void setNameID(const LLUUID& name_id, BOOL is_group); @@ -57,6 +62,10 @@ public: static void refreshAll(const LLUUID& id, const std::string& firstname, const std::string& lastname, BOOL is_group); +protected: + LLNameBox (const Params&); + + friend class LLUICtrlFactory; private: static std::set<LLNameBox*> sInstances; |