diff options
| author | angela <angela@lindenlab.com> | 2009-11-24 11:55:12 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-24 11:55:12 +0800 |
| commit | f27aff450fd394dc53c7160d58df40037d57c774 (patch) | |
| tree | 3893fd9aed15b0a3c186d565bc0afb7bdc8247a3 /indra/newview/llpanelprofileview.cpp | |
| parent | 65fd784f136d4fc2183b97b6c15bd0c338bdb833 (diff) | |
| parent | cfccf4d5145274f7bfe1c88b7e51c000461226e8 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
Diffstat (limited to 'indra/newview/llpanelprofileview.cpp')
| -rw-r--r-- | indra/newview/llpanelprofileview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp index d4ab5013f9..bcf5b16aa6 100644 --- a/indra/newview/llpanelprofileview.cpp +++ b/indra/newview/llpanelprofileview.cpp @@ -190,7 +190,7 @@ void LLPanelProfileView::processOnlineStatus(bool online) void LLPanelProfileView::onAvatarNameCached(const LLUUID& id, const std::string& first_name, const std::string& last_name, BOOL is_group) { llassert(getAvatarId() == id); - getChild<LLTextBox>("user_name", FALSE)->setValue(first_name + " " + last_name); + getChild<LLUICtrl>("user_name", FALSE)->setValue(first_name + " " + last_name); } void LLPanelProfileView::togglePanel(LLPanel* panel) |