diff options
| author | angela <angela@lindenlab.com> | 2009-11-24 11:54:33 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-24 11:54:33 +0800 |
| commit | cfccf4d5145274f7bfe1c88b7e51c000461226e8 (patch) | |
| tree | 958804983e46008f18fcf68b07f508faa40f1bed /indra/newview/llpanelprofileview.cpp | |
| parent | dd9b1f819de025f1a6caa37cfbd4fd3394f9fa9e (diff) | |
EXT-2780 allow_scroll = false in LLTextEditor will crash the viewer
Diffstat (limited to 'indra/newview/llpanelprofileview.cpp')
| -rw-r--r-- | indra/newview/llpanelprofileview.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp index c7c2484be3..bcf5b16aa6 100644 --- a/indra/newview/llpanelprofileview.cpp +++ b/indra/newview/llpanelprofileview.cpp @@ -43,7 +43,6 @@ #include "llpanelpicks.h" #include "llpanelprofile.h" #include "llsidetraypanelcontainer.h" -#include "lltexteditor.h" static LLRegisterPanelClassWrapper<LLPanelProfileView> t_panel_target_profile("panel_profile_view"); @@ -191,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<LLTextEditor>("user_name", FALSE)->setValue(first_name + " " + last_name); + getChild<LLUICtrl>("user_name", FALSE)->setValue(first_name + " " + last_name); } void LLPanelProfileView::togglePanel(LLPanel* panel) |