summaryrefslogtreecommitdiff
path: root/indra/llcommon/llchat.h
AgeCommit message (Collapse)Author
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-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
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-03-08Merge with viewer 2 beta 4James Cook
2010-02-24Hack to refresh name tags when I change my display name.James Cook
Also fixes a crash when turning on display names.
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-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-01-29fixed major EXT-3643 “Embed friendship offer into IM window”;Alexei Arabadji
--HG-- branch : product-engine
2010-01-28fixed EXT-3841 [BSI] "Send IM..." choosable in IM floater context menuIgor Borovkov
--HG-- branch : product-engine
2009-11-18Fixed major bug EXT-2532-IM timestamp is when message is viewed, not when it ↵Eugene Kondrashev
was sent and received. Time str from the arriving message used now instead of constructing it dynamicly. --HG-- branch : product-engine
2009-09-02merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3 * Bugs: EXT-622 EXT-702 EXT-626 EXT-638 EXT-600 EXT-543 EXT-656 EXT-801 * New Dev: EXT-282 EXT-782 EXT-694 EXT-797 EXT-798 EXT-799 EXT-453
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-15svn merge -r105329:105903 ↵Melinda Green
svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge Resolving QAR-1051 Merge featurettes batch #4
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 ↵Brad Kittenbrink
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
2007-01-02Print done when done.James Cook