diff options
author | McCabe Maxsted | 2011-05-15 13:03:40 -0700 |
---|---|---|
committer | Jacek Antonelli | 2011-05-27 22:45:35 -0500 |
commit | 5c4a01acd1892a1ff862e6dc24d3f8ce988c39b5 (patch) | |
tree | 0330c9f5c2a1f49a36f9d94f8b6daabfbe21cd54 | |
parent | Made LLTextEditor::clear() actually clear the contents of the textbox rather ... (diff) | |
download | meta-impy-5c4a01acd1892a1ff862e6dc24d3f8ce988c39b5.zip meta-impy-5c4a01acd1892a1ff862e6dc24d3f8ce988c39b5.tar.gz meta-impy-5c4a01acd1892a1ff862e6dc24d3f8ce988c39b5.tar.bz2 meta-impy-5c4a01acd1892a1ff862e6dc24d3f8ce988c39b5.tar.xz |
Fixed avatar profile and group charters not displaying in search
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpanelavatar.cpp | 3 | ||||
-rw-r--r-- | linden/indra/newview/llpanelgroupgeneral.cpp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp index c261a18..4f041f5 100644 --- a/linden/indra/newview/llpanelavatar.cpp +++ b/linden/indra/newview/llpanelavatar.cpp | |||
@@ -1992,6 +1992,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) | |||
1992 | LLTextEditor* about_field = self->mPanelSecondLife->getChild<LLTextEditor>("about"); | 1992 | LLTextEditor* about_field = self->mPanelSecondLife->getChild<LLTextEditor>("about"); |
1993 | if (about_field) | 1993 | if (about_field) |
1994 | { | 1994 | { |
1995 | about_field->clear(); | ||
1995 | if (self->mAllowEdit && (self->mAvatarID == agent_id)) | 1996 | if (self->mAllowEdit && (self->mAvatarID == agent_id)) |
1996 | { | 1997 | { |
1997 | about_field->setText(about_text); | 1998 | about_field->setText(about_text); |
@@ -2011,8 +2012,10 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) | |||
2011 | about_field = self->mPanelFirstLife->getChild<LLTextEditor>("about"); | 2012 | about_field = self->mPanelFirstLife->getChild<LLTextEditor>("about"); |
2012 | if (about_field) | 2013 | if (about_field) |
2013 | { | 2014 | { |
2015 | about_field->clear(); | ||
2014 | if (self->mAllowEdit && (self->mAvatarID == agent_id)) | 2016 | if (self->mAllowEdit && (self->mAvatarID == agent_id)) |
2015 | { | 2017 | { |
2018 | about_field->setText(fl_about_text); | ||
2016 | } | 2019 | } |
2017 | else | 2020 | else |
2018 | { | 2021 | { |
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp index 8e61c60..8c522cc 100644 --- a/linden/indra/newview/llpanelgroupgeneral.cpp +++ b/linden/indra/newview/llpanelgroupgeneral.cpp | |||
@@ -814,6 +814,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc) | |||
814 | 814 | ||
815 | if (mEditCharter) | 815 | if (mEditCharter) |
816 | { | 816 | { |
817 | mEditCharter->clear(); | ||
817 | if (mAllowEdit && can_change_ident) | 818 | if (mAllowEdit && can_change_ident) |
818 | { | 819 | { |
819 | mEditCharter->setText(gdatap->mCharter); | 820 | mEditCharter->setText(gdatap->mCharter); |