diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2010-03-19 16:35:45 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2010-03-19 16:35:45 +0200 |
| commit | 1c4eeed50fddd32c43fc4093492727035c9da49b (patch) | |
| tree | 207191d6edd4b38040f3d3f9750f4d301665bfc8 | |
| parent | 5fa1c1531bbeb23aa76ba605fb7bd30b3f51c6dd (diff) | |
fixed EXT-6451 Name of people sending a IM some times is NoBody
LLSD::maps keys accross the code are used in mix of cases, lower and upper.
Using "from_id" and "FROM_ID" causes avatar id to be null and thus "no body" was displayed.
BUT this fix is of no use since several minutes ago viewer-offers feature was merged into release,
which overrides avatar name with "Second Life" to display message about teleport offering as system message
Reviewed by Q at https://codereview.productengine.com/secondlife/r/72/
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llnotificationhandlerutil.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index ae41e673bf..5affd5c677 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -372,7 +372,9 @@ std::string LLHandlerUtil::getSubstitutionName(const LLNotificationPtr& notifica if (res.empty()) { LLUUID from_id = notification->getPayload()["FROM_ID"]; - if (from_id.isNull()) + + //*TODO all keys everywhere should be made of the same case, there is a mix of keys in lower and upper cases + if (from_id.isNull()) { from_id = notification->getPayload()["from_id"]; } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index f0b61bbf45..7ecff4c2d8 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5567,6 +5567,8 @@ bool handle_lure_callback(const LLSD& notification, const LLSD& response) args["TO_NAME"] = target_name; LLSD payload; + + //*TODO please rewrite all keys to the same case, lower or upper payload["from_id"] = target_id; payload["SESSION_NAME"] = target_name; payload["SUPPRESS_TOAST"] = true; |