Commit Graph

339 Commits (c67d2d6eea930a1db07d5de7d4e961fe8d99e87a)

Author SHA1 Message Date
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
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
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
Leyla Farazha 0e06dc8964 Merge from dessie/viewer-release 2010-07-27 14:13:07 -07:00
Richard Nelson 76a9c1214f merge 2010-07-30 10:07:14 -07:00
Richard Nelson 566e3969f9 deprecated LLPanel::child*() methods 2010-07-30 10:02:30 -07:00
Mike Antipov e730c67749 EXT-8429 FIXED Added a workaround to localize server hardcoded "Conference" string for incoming ad-hoc chats.
Added a new string "conference-title-incoming" to strings.xml
For now the "Conference" word is localized wherever this session name is shown:
 * IM window title
 * Voice notifications

Further Localization is out of scope of this ticket and will be done in a separate localization cycle.

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

--HG--
branch : product-engine
2010-07-29 10:29:23 +03:00
Leyla Farazha d603085c03 Merge with dessie/viewer-release 2010-07-19 17:22:12 -07:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Mike Antipov d8e26b7b73 EXT-8246 FIXED Disabling an adding of items into Recent People list in case of incoming ad-hoc chat.
REASON: it was implemented in EXT-5694 to add all ad-hoc participants when user send a message to session created himself.
Participants IDs are known in this case.

But in case of incoming ad-hoc chat those IDs are not known. Container used to get IDs contains only Ad-hoc Session ID.
So, (???) is expected in this case in Recent People Panel.

FIX: disabling adding of items into Recent People list in case of incoming ad-hoc chat.

Note: participants will be added to the list once they send a message to chat.

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

--HG--
branch : product-engine
2010-07-12 11:28:51 +03:00