summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
AgeCommit message (Collapse)Author
2010-09-16MergeLeyla Farazha
2010-09-13STORM-114 FIXED Removed showing of images inside notifications in IM in ↵Andrew Dyukov
plaintext mode. - Added argument show_images to constructors of LLIMToastNotifyPanel and LLToastNotifyPanel. Depending on it plaintext attribute for textbox with notification text is set. Used this argument when adding notification to chat history if IM is in plaintext mode.
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-09-16mergeRichard Linden
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-24removed LLLayoutStack::fromXML custom xml parsingRichard Nelson
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-20changed buildPanel/buildFloater to member functions buildFromFileRichard Nelson
streamlined LLUICtrlFactory's interface
2010-08-16cleaned up LLUICtrlFactory...Richard Nelson
removed redundant functionality moved buildPanel to LLPanel
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-09EXT-8010 ADDITIONAL FIX Fixed problems with avatar links underlining.Andrew Dyukov
There were two problems: 1. Underlining broke when avatar's first and second name were on different lines. 2. There was no underline on hover for avatar miniinspector links in plaintext IM. - First problem was caused by calling LLOnHoverChangeableTextSegment::draw() for the same segment twice- for first and second name that were on different lines, while handleHover() was called only once. So handleHover() was called -> text was underlined -> first part of segment was drawn underlined -> its draw set style back to normal -> second part of segment was drawn without underlining. Fixed this by setting style back to normal only when drawing the last part of the segment. - Second problem was caused by unusual way of appending link to text in chat history. Changed it so that LLTextBase::appendText() now receives link not inside style params, but directly. Also added "/inspect" ending to check in LLUrlEntryAgent::underlineOnHoverOnly(). Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/833/ --HG-- branch : product-engine
2010-07-30Merge with dessie/viewer-releaseLeyla Farazha
2010-07-20EXT-8463 FIXED Crash in IM/chat floaters.Vadim Savchuk
Reason ====== Each message in an IM/chat session has a header. The header shows an (i) button on hover and hides it when mouse leaves the header. The button is shown by adding it as a header child and hidden by resetting the button parent. So, if you close the IM session so that the hovered header doesn't get the MouseLeave message (e.g. by Ctrl+W), the button gets destroyed. If you then open the IM session again and hover a message header, the destroyed button is referenced, which leads to crash. Fix === We make sure that when a hovered message header is being destroyed (by closing the IM session), the button is detached (i.e. its parent gets reset), so that it remains usable. I also add a couple of checks for the case when the (i) button fails to construct from XML file. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/783/ --HG-- branch : product-engine
2010-07-06Merge from dessie/viewer-releaseLeyla Farazha
2010-07-05Checker: FORWARD_NULLTofu Linden
Function: LLChatHistory::appendMessage(const LLChat &, const LLSD &, const LLStyle::Params &) File: /indra/newview/llchathistory.cpp
2010-06-21Merge with q/viewer-releaseLeyla Farazha
2010-06-18EXT-6527 FIX Introduce new plain_text flag in LLTextBase and prevent image ↵Yuri Chebotarev
segment from being created if this flag is set. reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/587/ --HG-- branch : product-engine
2010-06-22EXT-7820 FIX escape only parameters of slurlYuri Chebotarev
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/614/ --HG-- branch : product-engine
2010-06-11EXT-7137 FIXED nearby chat messages coming from non-null id with from name ↵Igor Borovkov
"Second Life" are no longer considered "system messages" Messages coming from objects named "Second Life" were mistaken for messages coming from system under the name "Second Life". It is impossible to distinguish using the from_id and from_name two cases: - messages coming from system under the name "Second Life" but under the id of an object - messages comding from object named "Second Life" Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/556/ --HG-- branch : product-engine
2010-06-10EXT-6654 FIXED Using escaped (LLURI::escape()) text for objects link.Vladimir Pchelko
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/543/ --HG-- branch : product-engine
2010-06-03mergeRichard Linden
2010-06-01added newline at endRichard Linden
2010-06-01Avoid name lookups when loading chat history on startupJames Cook
Also fixes DEV-50451, ??? for object names in chat history log on login.
2010-05-29EXT-7557 - About Second Life > Credits does not open with scrollbar all the ↵Richard Linden
way at the top also made floaters not update title label every time they are resized
2010-05-28DEV-50451 FIX ??? shown in local chat for chat from objectsJames Cook
Simple - was always doing name lookup even if ID was for an object
2010-05-24mergeRichard Nelson
2010-05-20EXT-7363 FIXED Provided passing owner ID through chat object since it is ↵Alexei Arabadji
necessary to correctly build objectim SLURL when chat history reloads content. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/420/ --HG-- branch : product-engine
2010-05-19DEV-50204 "Ericag Vader" shows when starting IM and local chatJames Cook
Start with blank header to hide sample text from XUI XML. Also fixed problem with computation of minimum chat header name width when the name wasn't in cache.
2010-05-18Rename mSLID to mUsername to match the name of the field in the UIJames Cook
Product made a late-breaking request to change the name of this field. The wire protocol for People API has not yet changed.
2010-05-13merge pull from dessie/viewer-public, picking up SLE codeJames Cook
2010-05-12DEV-50013 IM inline text uses display namesJames Cook
Reviewed with Leyla
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-05-07DEV-49780 Chat/IM history shows SLID in tooltipJames Cook
Reviewed with Callum
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-29Merge latest viewer-hotfix, approximately equal to Viewer 2.0 finalJames Cook
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 01:19:38 +0000