diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 16:35:37 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 16:35:37 -0700 |
| commit | 17bf41415bb9e347137ae01e7784b75910c0f146 (patch) | |
| tree | 975201775651cc7727b9c0137bc5494dfe6a2558 /indra/llui/llnotifications.cpp | |
| parent | 0e06dc8964d5ae31fccb2da522d05d822530d3c7 (diff) | |
merge fix
Diffstat (limited to 'indra/llui/llnotifications.cpp')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 4fa4da3f01..768a014081 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -1496,6 +1496,7 @@ void LLPostponedNotification::lookupName(LLPostponedNotification* thiz, gCacheName->getGroup(id, boost::bind(&LLPostponedNotification::onGroupNameCache, thiz, _1, _2, _3)); + } else { LLAvatarNameCache::get(id, |