summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.h
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-05-11 17:26:55 -0700
committerJames Cook <james@lindenlab.com>2010-05-11 17:26:55 -0700
commite2deaf5a14a01020afe4240f33e438a0676ba0ec (patch)
tree5d757a9d46b58ceb93ca71920c719c737b7c576c /indra/llui/llnotifications.h
parent31a0d236d59de5eaaa9e33ed99e6971c1ee01ad7 (diff)
Clean up merge about name cache callback prototype
Diffstat (limited to 'indra/llui/llnotifications.h')
-rw-r--r--indra/llui/llnotifications.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index c942a32512..f818b386b5 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -1005,12 +1005,11 @@ public:
gCacheName->get(id, is_group, boost::bind(
&LLPostponedNotification::onCachedNameReceived, thiz, _1, _2,
- _3, _4));
+ _3));
}
private:
- void onCachedNameReceived(const LLUUID& id, const std::string& first,
- const std::string& last, bool is_group);
+ void onCachedNameReceived(const LLUUID& id, const std::string& full_name, bool is_group);
void cleanup()
{