From 4b847b4388a38209ec8e12ed55d8137c94119c17 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Fri, 26 Mar 2010 10:28:57 +0200
Subject: [PATCH] =?UTF-8?q?fixed=20EXT-6373=20=E2=80=9CConsecutive=20offer?=
=?UTF-8?q?=20messages=20are=20unreadable=20in=20the=20IM=20log=E2=80=9D,?=
=?UTF-8?q?=20replaced=20[NAME]=20with=20[NAME=5FSLURL]=20in=20teleport=20?=
=?UTF-8?q?offer=20notification,=20this=20will=20unify=20offers=20appearan?=
=?UTF-8?q?ce=20and=20gap=20between=20offers=20in=20IM=20chat=20log=20with?=
=?UTF-8?q?=20disabled=20plaintext=20mode;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
--HG--
branch : product-engine
---
indra/newview/llviewermessage.cpp | 2 +-
indra/newview/skins/default/xui/en/notifications.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 6043ec49543..c8cc8135765 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2313,7 +2313,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
{
LLSD args;
// *TODO: Translate -> [FIRST] [LAST] (maybe)
- args["NAME"] = name;
+ args["NAME_SLURL"] = LLSLURL::buildCommand("agent", from_id, "about");
args["MESSAGE"] = message;
LLSD payload;
payload["from_id"] = from_id;
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5403defc598..6d18111be01 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5110,7 +5110,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
icon="notify.tga"
name="TeleportOffered"
type="offer">
-[NAME] has offered to teleport you to their location:
+[NAME_SLURL] has offered to teleport you to their location:
[MESSAGE]
<form name="form">
--
GitLab