summaryrefslogtreecommitdiff
path: root/indra/newview/llnamebox.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-02-23 10:44:59 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-02-23 10:44:59 -0700
commit01cdeb0cdd8c48b76a229d42ced4e5563cd18c5c (patch)
treee7b7ca976f17c8af3c8a2648a801030594e94c8c /indra/newview/llnamebox.h
parent7daa3d1ca10199468946feef0ce8eb67489deee0 (diff)
parentff5e3f5c2e566f3a8e86efaa763f7b12e07eeb53 (diff)
Merge from viewer-development
Diffstat (limited to 'indra/newview/llnamebox.h')
-rw-r--r--indra/newview/llnamebox.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llnamebox.h b/indra/newview/llnamebox.h
index dbabcc0e52..76e8551268 100644
--- a/indra/newview/llnamebox.h
+++ b/indra/newview/llnamebox.h
@@ -53,10 +53,9 @@ public:
void setNameID(const LLUUID& name_id, BOOL is_group);
- void refresh(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group);
+ void refresh(const LLUUID& id, const std::string& full_name, bool is_group);
- static void refreshAll(const LLUUID& id, const std::string& firstname,
- const std::string& lastname, BOOL is_group);
+ static void refreshAll(const LLUUID& id, const std::string& full_name, bool is_group);
protected:
LLNameBox (const Params&);