Commit Graph

349 Commits (ae79bc0da2e01eb07f5adbb6ecfd4e9a66cd8501)

Author SHA1 Message Date
Tank_Master fd1dc7b2e1 Backported from Viewer-Release (13841 (ff28840ea96b) (DN-211) Conference call dialog shows Conference with ??? (???) in title header with view display names on and off) 2011-02-12 00:36:48 -08:00
Kitty Barnett 44c1d1a58a - internal : LLAvatarName::mIsDummy was renamed to LLAvatarName::mIsTemporaryName 2011-01-27 20:25:57 +01:00
Kitty Barnett 3a9c08aa5f Imported Chat-Logs patch from Catznip (revision e6e0393682f8)
-> Description:
- changed : LLCacheName::buildUsername() will properly extract the username if the passed name is a "complete name"
    -> "Catznip Catnap" => "catznip.catnap"
    -> "Catznip Tester (catznip.catnap)" => "catznip.catnap"
- fixed   : P2P IM session names are inconsistent (chiclet hover tip shows the legacy name rather than the complete name for incoming IM sessions)
    -> incoming IM session would have a session name of "Catznip Catnap" (legacy name)
    -> outgoing IM session would have a session name of "Catznip Tester (catznip.catnap)" (complete name)
    -> standarized P2P IM session names to "complete name"
- added   : LLIMModel::buildIMP2PLogFilename() to have one single function to construct log filenames for P2P IMs
- fixed   : teleport offers to another avie are logged to the wrong file when no IM session is open for that avie
    -> open IM session => logged to "catznip_catnap.txt"
    -> no open IM session => logged to "Catznip Catnap.txt"
- fixed   : inventory offers to another avie are logged to the wrong file when no IM session is open for that avie
    -> no open IM session => logged to "Catznip Catnap.txt"
- fixed   : inventory accepted/declined notifications are logged to the wrong file
    -> no open IM session => logged to secondlife____app_agent_<uuid>_completename.txt
- added   : "UseLegacyIMLogNames" setting to use "old-style" log filenames for P2P IM sessions (TRUE by default)
    -> needed for people who mix older and newer viewers
    -> side-steps any other remaining bugs due to log filename change
2011-01-26 00:19:43 +01:00
Arrehn 1bbff1ac31 Compensate for "???" with smarter caching. Uses Oz Linden's patch. More comprehensive than what we had previously. 2011-01-21 17:41:52 -05:00
Arrehn 0586dca369 Merge up part2 to Release 2.4.0 + RLVa . Needs live testing 2011-01-19 12:40:31 -05:00
Arrehn a30a9064b1 Merge Firestorm up to LL 2.4 Release. (initial pass)
RLVa needs additional merging
2011-01-18 00:50:43 -05:00
Arrehn dc5250f237 chat text fixes + initial feature work.
- Repaired ability to disable chat toasts
- iniitial implementation to disable chat icons
- initial groundwork for separate color for chat header names
2010-12-02 01:29:48 -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 3eb3198248 STORM-654 : Person to Person chat logs are not created if Display Names are off
Modified code in indicated changeset to correct problem after consulting with
 Leyla Linden who sugested the orginal change. This fix will convert the Legacy
 name to a user name id not useing Display Names.
2010-11-18 18:30:00 -05:00
Wolfpup Lowenhar 2632565bbc STORM-102 : STORM-143 :Removed unneeded code in llimview. 2010-11-12 09:09:41 -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
Arrehn b96b8e3ca0 Merge with RLva-#head 2010-11-04 10:09:29 -07:00
Arrehn d0d3e716dc Rolling back before back RLV merge 2010-11-04 10:02:01 -07:00
Arrehn cc718fcdf2 Snowstorm syncup 2010-11-03 22:44:26 -07:00
Merov Linden 94c41b2c00 STORM-255 : merge with viewer-development 2010-11-01 22:02:29 -07:00
Merov Linden 44f6b6ea47 merge from viewer-beta 2010-11-01 17:34:45 -07:00
Arrehn 8fcb69d0c3 Integration of RLVa, pre-display names.
HUDtext updates may be broken, much testing needed.
I expect this merge to be improved and even fully replaced by up and coming RLVa work.
When we do get a clean merge of RLVa, it should stay clean.
It does compile ;)
2010-10-31 20:47:18 -04:00
Kitty Barnett 9498c31d3c Merged with default tip (Revision aeb7e6c38341)
--HG--
branch : RLVa
2010-10-31 23:41:40 +01:00
Kitty Barnett 1c2ef4090a Merged with default tip (Revision f20bf424bd86)
--HG--
branch : RLVa
2010-10-30 17:28:00 +02:00
Leyla Farazha 360ce3d667 DN-190 Last name resident shown in title of IM Conference Window with no Display name 2010-10-27 15:22:39 -07:00
Wolfpup Lowenhar 379f9b8240 Made changes to setting names and in pannel_preferences_chat.xml for better understanding
as per Esbee's comments in STORM-255
2010-10-27 11:00:39 -04:00
Wolfpup Lowenhar 2e023b0aff Merge from Viewer-development 2010-10-25 22:24:44 -04:00
Merov Linden 78f291a722 pull viewer-beta in viewer-development 2010-10-25 12:08:58 -07:00
Leyla Farazha e98eff02ae DN-181 Chat & IM logs saved in unreadable .llsd instead of .txt - fixing saving of p2p logs 2010-10-25 10:31:47 -07:00
Wolfpup Lowenhar 6da1e54e6a Inverting settings and test so that telling other how to turn off the messages popping is easier as per discussion with Oz and Boroondas also correcting some minor spelling issues 2010-10-25 11:43:50 -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
Wolfpup Lowenhar 19836c86e9 Merge from Viewer-development 2010-10-21 10:59:11 -04:00
Andrew Productengine b8444e52c1 STORM-402 FIXED Fixed adding of people whom you sent IM to Recent list.
This regression was caused by fix of STORM-126 in changeset 09f13edf6aa8 where adding of people from mInitialTargetIDs was removed.
And it was used to add people whom you P2P im'ed.

- Used mInitialTargetIDs to add people whom you P2P im'ed.
2010-10-19 20:23:07 +03:00
Leyla Farazha b0fd7bf7ea fixing ims not logging with display names off 2010-10-15 13:32:31 -07:00
Leyla Farazha 68d769ae8e Merge 2010-09-29 16:14:40 -07:00
Leyla Farazha a4b223248e Merge 2010-09-27 17:54:52 -07:00
Wolfpup Lowenhar 5db02993ef [STORM-255] As a user I would like to disable incoming Group/IM toasts from showing up.
This will also take care of STORM-221 since the person that would be affected by
	the toast cha now disable them.
2010-09-27 20:20:09 -04:00
Andrew Productengine 2d6db708f4 STORM-210 FIXED Implemented adding of ad-hoc call participans in Recent.
Both offline and online users are added. It is done in LLVoiceChannelGroup::activate(), where TODO for it was placed earlier.
To avoid code duplication when adding users from speakers list to Recent, a new method was added to LLIMModel.
2010-09-27 22:30:50 +03:00
Andrew Productengine 09ef4a2417 STORM-153 ADDITIONAL FIX Properly fixed unlocalized chiclet tooltip and syswell session names for adhoc.
Bug was caused by using unlocalized name of session as argument in LLIMModel::newSession() after the session name was localized in constructor.

- Used correct session name in LLIMModel::newSession(). Adding similar logic to addMessage() turned out to be unnecessary and also caused regression (VWR-23180),
so previous fix of the same bug(8ab901af1241) was backed out in 28ed1b4cf4cd. Erroneous part was excluded from this fix.
2010-09-27 18:18:03 +03:00
Kitty Barnett c434dcafb2 Merged with branch point for SL-2.2.0 (Revision dc8ac597008a)
--HG--
branch : RLVa
2010-09-22 21:01:32 +02:00
Andrew Dyukov 98c49322c1 STORM-153 FIXED Localized Conference and non-existent IM session name strings.
- Moved the "no session" string to XML and used it in code instead of hardcode.



- Conference string turned out to be already translated, but the way translation was happening ad-hoc chat log files on disk
would get localized names, and thus be inconsistent (and that would create problems with browsing them later).
It didn't happen already just because this string wasn't translated in other locales somewhy.
So moved localization of session name after the the creation of log file.
Also changed value of string according to Eli's comment in ticket.
2010-09-17 20:11:17 +03:00
Leyla Farazha 40a6786af6 Fixing chat logs to use username 2010-09-08 16:39:25 -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
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01:00
Kitty Barnett 436f3ba929 Merged with default tip (Revision b7f03886bbc7)
--HG--
branch : RLVa
2010-09-02 03:27:33 +02:00
Tofu Linden 0be99ec115 Backed out changeset 8ab901af1241
Was causing LEAP-2 (forensics by Boroondas)
2010-09-25 10:00:25 +01:00
Andrew Productengine 4ddf507d28 STORM-153 ADDITIONAL FIX Fixed unlocalized chiclet tooltip and syswell session names for adhoc.
Bug was caused by using incorrect (unlocalized) name of session as argument for some methods after the session name was localized in constructor.

- Used correct (localized) session name instead.
2010-09-23 19:25:30 +03:00
Kitty Barnett e6e551cb41 Merged with default tip (Revision 7a739cbdce56)
--HG--
branch : RLVa
2010-08-28 02:06:00 +02:00
Vadim Savchuk 19fb0a1669 Manual merge from default branch
--HG--
branch : product-engine
2010-08-26 16:52:32 +03:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Paul Guslisty 4fe662fe9a EXT-8672 FIXED ([HARD CODED] ALL LANGS The word \"Saved\" is hard coded, in the long timestamp displayed in IM when user is offline)
- Created a string with a time stamp parameter and added it to the strings.xml

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/872/

--HG--
branch : product-engine
2010-08-24 11:15:53 +03:00
Kitty Barnett b6a073c659 Initial commit of RLVa-1.2.0i
--HG--
branch : RLVa
2010-08-22 10:57:22 +02:00
Andrew Dyukov b091125a0e EXT-8658 FIXED Made only online participants of Adhoc chat to be shown shown in Recent Tab.
Used previously commented code which adds only online paricipants instead of current code that added all.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/860/

--HG--
branch : product-engine
2010-08-19 15:11:37 +03:00