diff options
author | Lynx Linden <lynx@lindenlab.com> | 2010-02-02 17:19:14 +0000 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2010-02-02 17:19:14 +0000 |
commit | e563a07659b74b2dca850834a44c3b92ff993b44 (patch) | |
tree | 00d888fdd800be481ab6662a601ce6642f8e715e /indra/newview/llviewermessage.cpp | |
parent | 4ad357ec70e15afdfe78816990cb23c7ba17619c (diff) |
DEV-32540: Lots of object IM and SLurl improvements
- Don't let object names that are URLs override links to display the
remote object inspector
- Don't hyperlink the object name in the remote object inspector
- Made the <nolink>...</nolink> regex more robust and made it support
non-URLs between the tags, so that we don't get random <nolink> tags
when trying to disable URLs in user-typed text.
- Improved the llurlentry unit test and added some more test cases.
- Hooked up another LLViewerMessage code path to objectim SLapps to
pass down the owner and slurl information.
- Made a few LLUrlEntryBase methods be const methods, because they are
- Fixed a bug in the remote object inspector where it would never show
the teleport URL.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index b0952dd698..aa9d0f469d 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2189,7 +2189,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD()); if(nearby_chat) { - nearby_chat->addMessage(chat); + LLSD args; + args["owner_id"] = from_id; + args["slurl"] = location; + nearby_chat->addMessage(chat, true, args); } |