diff options
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 14 | 
1 files changed, 11 insertions, 3 deletions
| diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index 81edb55f93..35a244c461 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -44,6 +44,8 @@  #include "llviewercontrol.h"  #include "llagentdata.h" +#include "llslurl.h" +  static const S32 msg_left_offset = 10;  static const S32 msg_right_offset = 10;  static const S32 msg_height_pad = 5; @@ -190,6 +192,8 @@ void LLNearbyChatToastPanel::init(LLSD& notification)  			style_params_name.font.name(font_name);  			style_params_name.font.size(font_style_size); +			style_params_name.link_href = LLSLURL("agent",mFromID,"about").getSLURLString(); +  			msg_text->appendText(str_sender, FALSE, style_params_name);  		} @@ -322,10 +326,14 @@ void LLNearbyChatToastPanel::draw()  		if(icon)  		{  			icon->setDrawTooltip(mSourceType == CHAT_SOURCE_AGENT); -			if(mSourceType == CHAT_SOURCE_AGENT) -				icon->setValue(mFromID); -			else +			if(mSourceType == CHAT_SOURCE_OBJECT)  				icon->setValue(LLSD("OBJECT_Icon")); +			else if(mSourceType == CHAT_SOURCE_SYSTEM) +				icon->setValue(LLSD("SL_Logo")); +			else if(mSourceType == CHAT_SOURCE_AGENT) +				icon->setValue(mFromID); +			else if(!mFromID.isNull()) +				icon->setValue(mFromID);  		}  		mIsDirty = false;  	} | 
