merge fix

meow-7.2.2
Leyla Farazha 2010-07-27 16:35:37 -07:00
parent 0e06dc8964
commit 17bf41415b
1 changed files with 1 additions and 0 deletions

View File

@ -1496,6 +1496,7 @@ void LLPostponedNotification::lookupName(LLPostponedNotification* thiz,
gCacheName->getGroup(id,
boost::bind(&LLPostponedNotification::onGroupNameCache,
thiz, _1, _2, _3));
}
else
{
LLAvatarNameCache::get(id,