summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
AgeCommit message (Collapse)Author
2010-04-07Automated mergeRoxie Linden
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07mergeTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-02PE mergeTofu Linden
2010-04-02Fixed normal bug EXT-6357 (SLapp for object chat does display an inspector) ↵Eugene Mutavchi
- added new LLUrlEntry to support 'secondlife:///app/objectim/{UUID}/' SLapps. Fixed passing the SLURL to inspect_remote_object floater. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/158/ --HG-- branch : product-engine
2010-04-02Fixed normal bug EXT-5831(Do not apply font color to timestamps in chat ↵Eugene Mutavchi
history) - added new 'ChatTimestampColor' color setting, which is set to timestamps for chat history messages in text mode which are not from log. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/160/. --HG-- branch : product-engine
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
Includes: DEV-45800, DEV-45803 - Grid Manager DEV-45804 - SLURL refactor DEV-45801 - Single username field (for Identity Evolution and SLE Ldap) Also, Includes Certificate Management code allowing the viewer to connect to grids not signed by a well know key (just like any web browser). Also contains secure storage for things like passwords. The security/certificate code is modular with the intention of adding modules to directly use the operating system facilities for crypto if available. (that's much more secure than we'll ever be) Also, refactor of voice to modularize it, and add a diamondware voice module. CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-03-29Automated mergeRoxie Linden
2010-03-26EXT-3818 -- absolute minimal fix for Viewer 2, can be better fixed in 2.1. ↵Kent Quirk
Previous proposed fix caused a crash on at least one machine, too risky.
2010-03-26Backed out changeset 686628355e4a as it caused a crash.Kent Quirk
2010-03-26Fix for EXT-3818 -- back out some code that was put in for EXT-6373, but ↵Kent Quirk
overreached.
2010-03-25fixed EXT-3818 “[BSI] plain text chat has too much space between lines”,Alexei Arabadji
To fix EXT-6373 I added vertical padding between posts in plain-text and unified padding in default mode of IM/chat history. Now I'm backing out the changes to plain-text mode that led to EXT-3818. reviewed by Leyla Farazha at https://codereview.productengine.com/secondlife/r/95/ --HG-- branch : product-engine
2010-03-25fixed major EXT-6500 “Message Well counter changes to '-1' afterAlexei Arabadji
plain text chat was enabled while unresolved offer was in hided IM window”, Added check to LLToastNotifyPanel destructor whether we should close notification since notification will be reused by IM floater when reload messages, the rule is: if LLToastNotifyPanel destroying but IM floater is exists – we shouldn't close notification. The problem is that notification was incorrectly deleted when IM floater reloads messages on chat log fromat change event. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/80/ --HG-- branch : product-engine
2010-03-23mergeRichard Linden
2010-03-23EXT-5549 Can't select last character in chat windowRichard Nelson
2010-03-23mergeRichard Linden
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-19mergeRichard Nelson
2010-03-19mergeRichard Nelson
2010-03-19Implemented normal task EXT-6379 ([TRUNCATION] [EN XUI REDESIGN] - Receiving ↵Andrew Dyukov
Landmarks). - Button order was fixed in changeset dd44dac25177. It was an implemetation of EXT-5906 (Reverse buttons order in the inventory offers). That changeset was included in cumulative diff at https://codereview.productengine.com/secondlife/r/52/ and already made its way into viewer 2-0. - This changeset removes inventory offer button truncation in IM in German locale by increasing default width of IM floater and decreasing distance between buttons. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/77/ --HG-- branch : product-engine
2010-03-18EXT-5549 - Can't Select Last Character In Chat WindowRichard Linden
2010-03-17Automated merge with https://hg.productengine.com/secondlife/viewer-offers/Alexei Arabadji
--HG-- branch : product-engine
2010-03-17fixed EXT-6373 “Consecutive offer messages are unreadable in the IM log”,Alexei Arabadji
added spacer panel for IM chat plaintext mode; --HG-- branch : product-engine
2010-03-17(work in progress) low task EXT-6377 - Embedded offer panels aren't reshaped ↵Dmitry Zaporozhan
by height on IM window resize Added new Toast panel class for use in IM floater. New class handles IM floater reshape and updates Toast height. --HG-- branch : product-engine
2010-03-04Implemented normal subtasks EXT-5906 (Reverse buttons order in the inventory ↵Andrew Dyukov
offers) and EXT-5907 (Reverse buttons order in the friendship offer). - Used reverse iterator when iterating over control list in LLChatHistory::appendMessage(). --HG-- branch : product-engine
2010-02-24Work on major bug EXT-5589 (Notifications button falls under side panel)Mike Antipov
-- updated LLLayoutStack to process "max_width" & "max_height" attributes for layout_panel. --HG-- branch : product-engine
2010-02-24fixed EXT-5526 Objects are shown as persons in the chat history from ↵Igor Borovkov
previous sessions - new chat source type CHAT_SOURCE_UNKNOWN for avatar names not in cache and object names consisting of two words (avatar names like) - new icon (unknown_icon.png) for message headers () of nearby chat messagses coming from CHAT_SOURCE_UNKNOWN - context menu no longer displayed for object names from chat history (no UUIDs) - double click on message headers in nearby chat no longer opens Inspector (no UUIDs) - object names (loaded from chat history) in nearby chat are no longer SLURLed (no UUIDs for them) --HG-- branch : product-engine
2010-02-22fixed EXT-5292 'i' btn is visible through inspectorIgor Borovkov
--HG-- branch : product-engine
2010-02-19Implemented low task EXT-5215 (Disable showing full yyyy/mm/dd timestamp for ↵Eugene Mutavchi
messages (nearby chat/im) received today) --HG-- branch : product-engine
2010-02-18fixed EXT-5006 “One inventory offer cause blinking of both Conversations andAlexei Arabadji
Notifications wells”, embedded inventory offer panel into IM window; --HG-- branch : product-engine
2010-02-17completed EXT-5427 Disable appearance of "i" button for SL system messages ↵Igor Borovkov
in IM and other chats --HG-- branch : product-engine
2010-02-17fixed EXT-5367 Emotes '/me says ...' out of context when nearby chat or ↵Igor Borovkov
group chat window expanded. --HG-- branch : product-engine
2010-02-17fixed EXT-5456 Messages from objects are shownas messages from Second Life ↵Igor Borovkov
in nearby chat history from the prev session Completed things which were agreed on: - system messages in the log file are prepended with "Second Life:" after the timestamp - object names set which are parsed extended to object names consisting with any number of words Side effect: "Second Life:" is shown as From Name in Nearby Chat when in plain text chat --HG-- branch : product-engine
2010-02-15fixed EXT-5010 Redundant resident name in the IM log for offersIgor Borovkov
--HG-- branch : product-engine
2010-02-12fixed reopened EXT-926 System notification toast has avatar's iconIgor Borovkov
--HG-- branch : product-engine
2010-02-10implemented graying out chat history from log - EXT-5102 IM chat from ↵Igor Borovkov
previous sessions should be grayed out --HG-- branch : product-engine
2010-02-10fixed for plain text chat history EXT-5279 Resident Names should Appear in ↵Igor Borovkov
Selected URL Color --HG-- branch : product-engine
2010-02-10partitial fix for normal task EXT-2957 [BSI] Implement object icon for chat ↵Ychebotarev ProductEngine
from objects, instead of using generic image for missing profile picture --HG-- branch : product-engine
2010-02-09Fixed normal bug EXT-5244 ( There is no "i" button for Name fields from ↵Mike Antipov
nearby chat) - reason: changes in c91e724d4f15 related to EXT-4547. Also multiple warnings appeared in log: LLView::getChild: Found child named user_name but of wrong type class L LTextBox, expecting class LLViewerTextEditor * - fix: changed template class from LLViewerTextEditor to LLTextBase in getChild. --HG-- branch : product-engine
2010-02-08fix for major EXT-5067 Copy-paste is broken in nearby and IM logsYchebotarev ProductEngine
--HG-- branch : product-engine
2010-02-05EXT-5025 - Tooltips block mouse clicksrichard
EXT-4547 [BSI] it is possible to highlight multiple layers of chat EXT-3844 Mouse wheel camera zoom is not reflected on View popup slider EXT-3103 Add an option to restrict entering non-ascii symbols in text editor. reviewed by Leyla
2010-02-04fixed shout/whisper representation for EXT-4777 Implement saving and loading ↵Igor Borovkov
chat history for Nearby Chat (both plain text and widgeted chat) --HG-- branch : product-engine
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