diff options
| -rw-r--r-- | indra/llui/llnotifications.cpp | 6 | ||||
| -rw-r--r-- | indra/llui/llnotifications.h | 5 | 
2 files changed, 6 insertions, 5 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); diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index c942a32512..f818b386b5 100644 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -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()  	{ | 
