From a4000c3744e42fcbb638e742f3b63fa31a0dee15 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 8 May 2009 07:43:08 +0000 Subject: merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7 --- indra/newview/llnamebox.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'indra/newview/llnamebox.h') 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 + { + Optional 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 sInstances; -- cgit v1.2.3