diff options
author | Richard Nelson <none@none> | 2010-05-24 16:37:52 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-05-24 16:37:52 -0700 |
commit | 2920d4c46f99c8c5bc8942a08a87fa204c57464b (patch) | |
tree | 515837435a28924b028815fc79f7f4f2ec18871e /indra/llui/llnotifications.cpp | |
parent | a146a0f27b3ea2fadaa9e7286645a0944996309d (diff) | |
parent | d674d11f895b8f3d578cded931cdc1c430379c95 (diff) |
merge
Diffstat (limited to 'indra/llui/llnotifications.cpp')
-rw-r--r-- | indra/llui/llnotifications.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 7b8f51ae3c..23f79aad36 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -1488,9 +1488,11 @@ std::ostream& operator<<(std::ostream& s, const LLNotification& notification) return s; } -void LLPostponedNotification::onCachedNameReceived(const LLUUID& id, const std::string& first, - const std::string& last, bool is_group) +void LLPostponedNotification::onCachedNameReceived(const LLUUID& id, + const std::string& full_name, + bool is_group) { + // *TODO: This is dumb, just use full_name as given gCacheName->getFullName(id, mName); modifyNotificationParams(); LLNotifications::instance().add(mParams); |