summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
AgeCommit message (Collapse)Author
2010-02-03PE merge.Tofu Linden
2010-02-03fixed EXT-4776 Make avatars in nearby chat inspectableIgor Borovkov
--HG-- branch : product-engine
2010-02-03fixed EXT-4805 “Friend offer is corrupted in resized IM window”,Alexei Arabadji
reverted IM floater default width; made offer buttons have absolute positions; avoided text message scrolling with default IM floater width; --HG-- branch : product-engine
2010-02-02DEV-32540: Lots of object IM and SLurl improvementsLynx Linden
- 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.
2010-02-01mergerichard
2010-01-29mergeIgor Borovkov
--HG-- branch : product-engine
2010-01-29fixed major EXT-3643 “Embed friendship offer into IM window”;Alexei Arabadji
--HG-- branch : product-engine
2010-01-29fixed EXT-4736 There's an ability to block system notifications from nearby chatIgor Borovkov
--HG-- branch : product-engine
2010-01-28PE merge.Tofu Linden
2010-01-28EXT-4693: Pass through owner ID to remote object inspector.Lynx Linden
Plumbing to pass the owner ID for a chatting object down into the LLChatHistory::appendMessage() method where we create the objectim SLapp that will bring up the remote object inspector. Pheww. For object notifications that are displayed as text chat, we
2010-01-28fixed EXT-3841 [BSI] "Send IM..." choosable in IM floater context menuIgor Borovkov
--HG-- branch : product-engine
2010-01-28EXT-4693: First steps at using remote inspector.Lynx Linden
Now Object IMs that get sent to your local chat window will have secondlife:///app/objectim SLapps, which will open the remote object inspector for that object, not the avatar inspector. However, we don't have all the information needed for the remote object inspector, so I'm going to have to investigate extending the inspector to request the missing information from the server.
2010-01-25EXT-4348 - List of names before "have said something new" wraps poorlyrichard
accepted patch from Josh
2010-01-25fixed EXT-4601 [BSI] New IM sessions use obsolete timestamps for first messageIgor Borovkov
--HG-- branch : product-engine
2010-01-19Fixed low bug EXT-3890([BSI] someone has said text cutoff when opening and ↵Eugene Mutavchi
closing user list) --HG-- branch : product-engine
2010-01-19Fixed EXT-3818 [BSI] plain text chat has too much space between linesIgor Borovkov
by redoing fix for the EXT-3263 Cut and Paste from text chat loses new lines --HG-- branch : product-engine
2010-01-14Fixed normal bug EXT-4072([BSI] Emotes appear as (italic) text chat in plain ↵Eugene Mutavchi
text mode) --HG-- branch : product-engine
2010-01-13fixed EXT04137 BSI] /me shows on the line below in group chat in plain textIgor Borovkov
--HG-- branch : product-engine
2010-01-13fixed EXT-4073 [BSI] Shouting is malformed in plain chat modeIgor Borovkov
--HG-- branch : product-engine
2010-01-08EXT-1847 Regression in the design spec: "You" should be replaced by your ↵Tofu Linden
full avatar name in communication
2010-01-06EXT-3878 - Menus disappear when UI Size is < 1.00richard
EXT-3647 - Auto-scrolling of IMs should resume when user types in chat EXT-3877 - Pinning two levels of menus prevents movement using arrow keys EXT-1303 - Hyperlink text wraps in the middle of a word reviewed by James
2009-12-26Reduced header dependency from the "llimview.h"Mike Antipov
--HG-- branch : product-engine
2009-12-21mergerichard
2009-12-21don't show incoming system messages in notification at bottom of chat ↵Rick Pasetto
history window
2009-12-18fix for buildrichard
2009-12-18ext-3307 - nearby chat stays scrolled at bottomrichard
2009-12-18fix for osx compile errorEric M. Tulla (BigPapi)
2009-12-18implemented major task EXT-3469 Make timestamp disappear instead of covering ↵Andrew Polunin
avatar name while IM floater is being resized --HG-- branch : product-engine
2009-12-15Merge from default branch.Vadim Savchuk
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs remote change) by removing them. --HG-- branch : product-engine
2009-12-11variable renames in LLTextBaserichard
2009-12-11Fixed normal bug EXT-3263 (Cut and Paste from text chat loses new lines)Eugene Mutavchi
--HG-- branch : product-engine
2010-03-01Automated merge from trunkRoxie Linden
2010-03-01Automated merge with a few fixups for code review commentsRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-25automated mergeRoxie Linden
2010-02-25automated merge from trunkRoxie Linden
2009-12-04Fixed normal bug EXT-1710 (IM & Chat: System messages should haveAndrew Dyukov
SL icon and title). "i" icon is temporarily used, changing it in xml to SL icon moved to new bug- EXT-3132. --HG-- branch : product-engine
2009-12-03Implemented normal sub-task EXT-3035 (Made other participants' names ↵Eugene Mutavchi
clickable in IM chat log (old school chat log style)) --HG-- branch : product-engine
2009-12-03fix for normal EXT-2944 [BSI] Object chat and Resident chat is combined in ↵Yuri Chebotarev
Nearby Chat floater when object and Resident share the same name --HG-- branch : product-engine
2009-12-02Manual merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-02fix major EXT-3003 IM messages loaded from a chat history are displayed with ↵Yuri Chebotarev
current time --HG-- branch : product-engine
2009-12-01DEV-43622 : API change (no functionality change) to fix a design error in LLSDKent Quirk
I made it about a year and a half ago; Zero found it while reading code. I had added a return value to LLSD::insert(), but a) did it wrong, and b) broke the STL-like semantics of insert(). So I've put insert() back to returning void and created LLSD::with(), which does what my earlier insert() did. The compiler then caught all the cases where insert()'s return value were being used, and I changed those to use with() instead.
2009-11-30Fixed Line endings to Unix formatMike Antipov
--HG-- branch : product-engine
2009-11-30Fixed wrong type for getChild<LLTextBox>("user_name") to prevent WARNING ↵Mike Antipov
logging. --HG-- branch : product-engine
2009-11-26EXT-2831 Timestamps are missing in nearby chat toastsYuri Chebotarev
--HG-- branch : product-engine
2009-11-24Merge from product-engineSteve Bennetts
2009-11-24Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0James Cook
2009-11-24Remove unnecessary log messageMike Antipov
--HG-- branch : product-engine