livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up merge about name cache callback prototype

master
James Cook 2010-05-11 17:26:55 -07:00
parent 31a0d236d5
commit e2deaf5a14
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/llnotifications.cpp
View File

@ -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);

5
indra/llui/llnotifications.h
View File

@ -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()
{