diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-10-25 10:23:11 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-10-25 10:23:11 -0700 |
| commit | 6480612a91b0e72fa746d294d8cade4f093c9372 (patch) | |
| tree | 8d43a33390938c371fbbc5da804bc2def61a3cef /indra/newview/lltoastimpanel.cpp | |
| parent | 2f0d9b78d28deba58988012a9940cb4f232ec2f9 (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Merge 3.6.9 ShareStorm
Diffstat (limited to 'indra/newview/lltoastimpanel.cpp')
| -rwxr-xr-x | indra/newview/lltoastimpanel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp index 09ab31df36..bdbd8f1f83 100755 --- a/indra/newview/lltoastimpanel.cpp +++ b/indra/newview/lltoastimpanel.cpp @@ -93,7 +93,7 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) : LLToastPanel(p.notif if(!mIsGroupMsg) { - mAvatarName->setValue(p.from); + mAvatarName->setValue(p.from); } mTime->setValue(p.time); mSessionID = p.session_id; @@ -164,7 +164,7 @@ void LLToastIMPanel::spawnNameToolTip() params.background_visible(false); if(!mIsGroupMsg) { - params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_avatar", LLSD().with("avatar_id", mAvatarID), FALSE)); + params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_avatar", LLSD().with("avatar_id", mAvatarID), FALSE)); } else { |