summaryrefslogtreecommitdiff
path: root/indra/newview/llavatarlistitem.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2010-04-02 14:57:12 -0700
committerCallum Prentice <callum@lindenlab.com>2010-04-02 14:57:12 -0700
commit98e46e28e05c22c02da41603a056c0caf34f5ad0 (patch)
treea24352a4ce377d91428554aab15f96f887b24514 /indra/newview/llavatarlistitem.cpp
parent9e1b600d9b41afea62b2ba68fa8d5bc5861d1111 (diff)
parent2c5c563319d5ba8eaeae93b627536321956d347e (diff)
Merge with tip
Diffstat (limited to 'indra/newview/llavatarlistitem.cpp')
-rw-r--r--indra/newview/llavatarlistitem.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 9645e75e60..44f88cce29 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -119,8 +119,9 @@ S32 LLAvatarListItem::notifyParent(const LLSD& info)
if (info.has("visibility_changed"))
{
updateChildren();
+ return 1;
}
- return 0;
+ return LLPanel::notifyParent(info);
}
void LLAvatarListItem::onMouseEnter(S32 x, S32 y, MASK mask)
@@ -334,6 +335,9 @@ void LLAvatarListItem::onNameCache(const std::string& first_name, const std::str
{
std::string name = first_name + " " + last_name;
setName(name);
+
+ //requesting the list to resort
+ notifyParent(LLSD().with("sort", LLSD()));
}
// Convert given number of seconds to a string like "23 minutes", "15 hours" or "3 years",