diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-15 20:37:54 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-15 20:37:54 -0800 |
| commit | 41a53e864924cdb192aad9b3906006d7e8d4c91e (patch) | |
| tree | 1b3d61897aa6b5be23254f17a82dfdc55b22397b /indra/llui/llnotifications.cpp | |
| parent | de9e2c38126682e5c6215151e3389380a93b8bc0 (diff) | |
| parent | fd0cae39f38673d69448e90971e2369e0b81c2fe (diff) | |
merging changes
Diffstat (limited to 'indra/llui/llnotifications.cpp')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index a5492b46f7..ea52bee184 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -1852,6 +1852,7 @@ void LLPostponedNotification::fetchAvatarName(const LLUUID& id) { mAvatarNameCacheConnection.disconnect(); } + mAvatarNameCacheConnection = LLAvatarNameCache::get(id, boost::bind(&LLPostponedNotification::onAvatarNameCache, this, _1, _2)); } } @@ -1860,7 +1861,7 @@ void LLPostponedNotification::onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name) { mAvatarNameCacheConnection.disconnect(); - + std::string name = av_name.getCompleteName(); // from PE merge - we should figure out if this is the right thing to do |