Merov Linden
804495ad41
STORM-477 : backout changeset 6f5cb303d3e2
2011-01-13 11:15:47 -08:00
Seth ProductEngine
4af9db7b79
STORM-477 FIXED Re-implemented LLDir::getNextFileInDir() as an iterator object.
...
- Replaced all existing usages of LLDir::getNextFileInDir() with the new directory iterator object.
- Removed platform specific LLDir::getNextFileInDir() implementation.
2011-01-11 19:50:58 +02:00
Oz Linden
a4d5e38535
STORM-826 (workaround): correct mixed and dos-style line endings
2011-01-06 11:06:20 -05:00
Wolfpup Lowenhar
379c385877
STORM-102: this is to correct a minor issue with ad-hoc conferences so that they do not
...
get date stamped at all since each one is defined as a unique conversation.
2010-11-23 17:32:00 -05:00
Wolfpup Lowenhar
4077e6bb52
STORM-102 : STORM-143 :Made needed changes to code to improve searching for previous logs
...
and also changed the name used for P2P IM log file names. The latter change is going to
temporarely break personal content for those that are saving conversation logs as P2P IM
logs will now be useinf the user name and not the legacy name.
2010-11-11 22:50:14 -05:00
Wolfpup Lowenhar
669cf170ce
STORM-102: STORM-143: Refactored the STORM-103 code to pull the proper plain test log no
...
matter when it was generated or if it has the date stamp in the name of the log or not.
--HG--
branch : storm-102
2010-11-08 09:31:35 -05:00
Wolfpup Lowenhar
7c89e565b3
This is the setting of the core file name date stamp code and settings files for
...
Chat, Group and IM Logs.
--HG--
branch : storm-102
2010-10-26 20:02:07 -04:00
Leyla Farazha
cb5d8d1a92
DN-181 Chat & IM logs saved in unreadable .llsd instead of .txt
2010-10-22 17:41:06 -07:00
Aimee Linden
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
James Cook
b34eee98d1
DEV-50451 Fix names in local chat history loading, again
...
Switch to new serialization format, change filename so old viewers
don't get confused if the user switches back. Reviewed with Richard
2010-06-02 15:21:46 -07:00
James Cook
d6ea429845
DEV-50013 Display names load at startup in local chat/IM history
...
Had to change the chat log file format to include agent_id.
Code will load viewer 2.0 logs, but viewer 2.0 will just discard
data from 2.1 logs, which seems OK. Reviewed with Leyla.
2010-05-25 11:40:29 -07:00
Mike Antipov
57a81ed44d
No ticket. Fixed Windows Release build (warning treated as error)
...
Warning: c:\slbuild\viewer-2-0\libraries\include\boost\lexical_cast.hpp(1159) : warning C4702: unreachable code
Reason: additional boost lib dependence after changes (EXT-5215) for EXT-5215 (Disable showing full yyyy/mm/dd timestamp for messages (nearby chat/im)
--HG--
branch : product-engine
2010-02-23 18:32:55 +02:00
Eugene Mutavchi
2a089e25ba
No ticket, fixed the mistake in class name.
...
--HG--
branch : product-engine
2010-02-19 17:55:45 +02:00
Eugene Mutavchi
10c5f2f080
Implemented low task EXT-5215 (Disable showing full yyyy/mm/dd timestamp for messages (nearby chat/im) received today)
...
--HG--
branch : product-engine
2010-02-19 13:36:47 +02:00
Igor Borovkov
4c5a998f79
fixed EXT-5456 Messages from objects are shownas messages from Second Life 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-17 16:09:50 +02:00
Igor Borovkov
250680a078
fixed EXT-4755 Own context menu in voice chat participants list has 'Add Friend' and 'Pay' enabled
...
--HG--
branch : product-engine
2010-02-02 17:58:29 +02:00
Igor Borovkov
a2105d1702
implemented EXT-4523 Log for all Ad-Hoc conferences is stored in one file
...
* for outgoing ad-hoc sessions chat history is saved into new file for every distinct set of initial participants
format: ["Ad-hoc Conference" "hash"<md5 hash of sorted participants' UUIDs>.txt]
ex: Ad-hoc Conference hash77a0ff26-614d-0dbd-ce19-5da9108f141a.txt
* for incoming ad-hoc sessions, chat history of each session is saved into a separate file:
format: [<ad-hoc session name> <timestamp> <4 first symbols of session id>.txt]
ex: Igor ProductEngine Conference 2010_01_22 07_41 2752.txt
--HG--
branch : product-engine
2010-01-22 18:10:07 +02:00
Ychebotarev ProductEngine
f28778b8b8
work on EXT-4322 Remove the Communicate floater
...
leave some LLFloaterChat usages commented for later review...
--HG--
branch : product-engine
2010-01-18 17:50:19 +02:00
Tofu Linden
0d09530d85
EXT-1847 Regression in the design spec: "You" should be replaced by your full avatar name in communication
2010-01-08 16:33:03 -08:00
brad kittenbrink
256b8aba31
Fixed some more header file usage after the recent rebasing of my old precompiled header work.
2009-12-02 20:20:12 -08:00
Igor Borovkov
dd262a7a36
implemented EXT-2582 (Save IM chat history as plain text file)
...
updated 1.23 chat log format - in multilined messages subsequent lines are prepended with a space
multilined messages of an old format are not supported, each line is considered as a separate message
the parser depends on current used date and time format
--HG--
branch : product-engine
2009-12-01 19:01:42 +02:00
Vadim Savchuk
a703d9eff9
Fixed low priority bug EXT-2935 (IM log in plain text contains redundant
...
space between timestamp and bracket).
--HG--
branch : product-engine
2009-11-27 17:18:55 +02:00
Steve Bennetts
884a9887a7
Changes to IM Logging, includes preference changes
2009-11-18 21:42:27 -08:00
Sergey Borushevsky
e724fa0ab4
Implemented major task EXT-1487 (Reimplement chat history persistence using LLSD serialization).
...
Moved loading of IM history from LLIMFloater and LLFloaterIMPanel to LLModel::LLIMSession.
Implemented disabling of saving logs if it's disabled in Preferences.
--HG--
branch : product-engine
2009-10-29 20:26:56 +02:00
Steven Bennetts
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Adam Moss
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
Mark Palange
46f8fb8781
svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22
...
Merge back of viewer 1.22 RC6 and RC7 change to trunk.
QAR-1214 and QAR-1227
2009-02-03 21:15:57 +00:00
Aaron Brashears
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
Steven Bennetts
d725e5b240
QAR-872 Viewer 1.21 RC 3
...
merge viewer_1-21 96116-97380 -> release
2008-09-29 19:14:50 +00:00
Steven Bennetts
80be4c1d2d
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
...
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
Steven Bennetts
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Bryan O'Sullivan
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
Steven Bennetts
63e7894148
QAR-570 maint-render-4 merge
...
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-08 18:41:20 +00:00
Josh Bell
a10f963900
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
...
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
2008-03-04 16:59:57 +00:00
Steven Bennetts
050dad0ce3
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
2007-11-07 22:55:27 +00:00
Aaron Brashears
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
Kelly Washington
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +00:00
Aaron Brashears
305c74d516
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-02-02 17:28:58 +00:00
James Cook
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00