diff options
author | Kelly Washington <kelly@lindenlab.com> | 2011-03-31 14:07:54 -0700 |
---|---|---|
committer | Kelly Washington <kelly@lindenlab.com> | 2011-03-31 14:07:54 -0700 |
commit | 0080ed8e2914fba475b224344d8e4233e8fa48e2 (patch) | |
tree | c316dd991d5b54a19594639686215230a89736b4 /indra/newview/llinspectgroup.cpp | |
parent | 0b44850c6f1057cd095ed9fe68f9285e546c662e (diff) | |
parent | 5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff) |
Merge
Diffstat (limited to 'indra/newview/llinspectgroup.cpp')
-rw-r--r-- | indra/newview/llinspectgroup.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/indra/newview/llinspectgroup.cpp b/indra/newview/llinspectgroup.cpp index 214b135bc1..76617b55bf 100644 --- a/indra/newview/llinspectgroup.cpp +++ b/indra/newview/llinspectgroup.cpp @@ -78,9 +78,8 @@ public: // Callback for gCacheName to look up group name // Faster than waiting for group properties to return void nameUpdatedCallback(const LLUUID& id, - const std::string& first, - const std::string& last, - BOOL is_group); + const std::string& name, + bool is_group); // Button/menu callbacks void onClickViewProfile(); @@ -219,21 +218,19 @@ void LLInspectGroup::requestUpdate() mPropertiesRequest = new LLFetchGroupData(mGroupID, this); // Name lookup will be faster out of cache, use that - gCacheName->get(mGroupID, TRUE, + gCacheName->getGroup(mGroupID, boost::bind(&LLInspectGroup::nameUpdatedCallback, - this, _1, _2, _3, _4)); + this, _1, _2, _3)); } void LLInspectGroup::nameUpdatedCallback( const LLUUID& id, - const std::string& first, - const std::string& last, - BOOL is_group) + const std::string& name, + bool is_group) { if (id == mGroupID) { - // group names are returned as a first name - getChild<LLUICtrl>("group_name")->setValue(LLSD(first) ); + getChild<LLUICtrl>("group_name")->setValue( LLSD(name) ); } // Otherwise possibly a request for an older inspector, ignore it |