Commit Graph

346 Commits (0bf3ee7fa7f09bee0ee12077442fac9e4d0b32cd)

Author SHA1 Message Date
Oz Linden f10384d014 merge changes for storm-941 2011-05-19 11:48:48 -04:00
Leyla Farazha 314961674a EXP-769 Group call requests received in Basic mode 2011-04-29 15:52:48 -07:00
Seth ProductEngine 4993cfba34 STORM-941 FIXED IM history to use the resident's user name for the log file name.
Added conversions from legacy names or SLURLs with avatar id to the user names in cases of logging P2P sessions and inventory offers.
Removed asynchronous writes to temporary IM log file depending on name cache responses.
2011-04-13 18:13:02 +03:00
Don Kjer 8330a4d0fd Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/ 2011-02-19 00:17:12 +00:00
Don Kjer 774405e92b Cleanup of headless client (was: DisableRendering mode)
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode.  This gets us closer to a 'true' client, for testing purposes.
2011-02-18 23:16:38 +00:00
paul_productengine 1a1d5f4c00 STORM-507 FIXED User that has sent p2p call invitation to other user, is not added to Recent tab
- Add the caller to the Recent List just after Incoming Call floater appears. Before recicpient accepted or rejected the call.
2011-01-31 19:47:50 +02:00
Oz Linden c5d8624ba4 renamed temp name flag member in name cache to avoid confusion with similar names in other classes 2011-01-15 09:09:41 -05:00
Monroe Linden 1e050c2ed8 merge 2010-12-02 14:33:42 -08:00
Merov Linden 2e46db239f Pull from viewer-beta 2010-11-24 13:57:22 -08:00
Leyla Farazha f3705df982 (DN-211) Conference call dialog shows Conference with ??? (???) in title header with view display names on and off
Inbox
X
2010-11-23 16:03:27 -08: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
Leyla Farazha 5b80dbff3a DN-211 Conference call dialog shows Conference with ??? (???) in title header with view display names on and off 2010-11-23 11:21:59 -08: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
Richard Linden 50d21a75a7 merge 2010-11-15 15:52:54 -08: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
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
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
Monroe Linden c154e4b794 Made VoiceCallsRejectAll apply to group voice invites as well as p2p and ad-hoc invites.
Fixed some code in LLIMMgr that had the incoming call dialog confused with a notification.

Reviewed by Richard.
2010-10-07 14:07:31 -07:00
Monroe Linden b285fd4d0a Fix for EXP-131 "Call dialog shown in locked position when a Resident calls a Skylight visitor"
Added the setting VoiceCallsRejectAll, which causes the viewer to silently reject all incoming voice calls.

Reviewed by Callum.
2010-10-05 16:42:24 -07: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
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
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
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
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
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
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Leyla Farazha 6f256e2d57 Merge with dessie/viewer-release 2010-08-04 15:44:45 -07:00
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00