summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
AgeCommit message (Expand)Author
2010-09-16MergeLeyla Farazha
2010-09-13STORM-114 FIXED Removed showing of images inside notifications in IM in plain...Andrew Dyukov
2010-09-03Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Li...Aimee Linden
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
2010-08-24merge heads. whew.Tofu Linden
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
2010-07-30Merge with dessie/viewer-releaseLeyla Farazha
2010-07-20EXT-8463 FIXED Crash in IM/chat floaters.Vadim Savchuk
2010-07-06Merge from dessie/viewer-releaseLeyla Farazha
2010-07-05Checker: FORWARD_NULLTofu Linden
2010-06-21Merge with q/viewer-releaseLeyla Farazha
2010-06-18EXT-6527 FIX Introduce new plain_text flag in LLTextBase and prevent image se...Yuri Chebotarev
2010-06-22EXT-7820 FIX escape only parameters of slurlYuri Chebotarev
2010-06-11EXT-7137 FIXED nearby chat messages coming from non-null id with from name "...Igor Borovkov
2010-06-10EXT-6654 FIXED Using escaped (LLURI::escape()) text for objects link.Vladimir Pchelko
2010-06-03mergeRichard Linden
2010-06-01added newline at endRichard Linden
2010-06-01Avoid name lookups when loading chat history on startupJames Cook
2010-05-29EXT-7557 - About Second Life > Credits does not open with scrollbar all the w...Richard Linden
2010-05-28DEV-50451 FIX ??? shown in local chat for chat from objectsJames Cook
2010-05-24mergeRichard Nelson
2010-05-20EXT-7363 FIXED Provided passing owner ID through chat object since it is nece...Alexei Arabadji
2010-05-19DEV-50204 "Ericag Vader" shows when starting IM and local chatJames Cook
2010-05-18Rename mSLID to mUsername to match the name of the field in the UIJames Cook
2010-05-13merge pull from dessie/viewer-public, picking up SLE codeJames Cook
2010-05-12DEV-50013 IM inline text uses display namesJames Cook
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
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
2010-04-02Fixed normal bug EXT-5831(Do not apply font color to timestamps in chat histo...Eugene Mutavchi
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
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. Pr...Kent Quirk
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 over...Kent Quirk
2010-03-25fixed EXT-3818 “[BSI] plain text chat has too much space between lines”,Alexei Arabadji
2010-03-25fixed major EXT-6500 “Message Well counter changes to '-1' afterAlexei Arabadji
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