Commit Graph

279 Commits (affefe2361ee73eee60bca42e3edb41c65ffa95d)

Author SHA1 Message Date
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
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -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
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
Igor Borovkov 8e7fd534aa EXT-8065 FIXED added hiding Start IM button on a group call invitation dialog
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/675/

--HG--
branch : product-engine
2010-06-30 18:46:25 +03:00
Igor Borovkov 2112f333bd EXT-4872 FIXED hiding Start IM button for ad-hoc call invitation
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/658/

--HG--
branch : product-engine
2010-06-25 19:43:03 +03:00
Alexei Arabadji 129da72326 EXT-6710 FIXED Corrected 'ItemsShared' notification message and provided logging of 'item shared' message instead of spawning IM session and add message to it.
Details:
1 Corrected 'ItemsShared' notification message.
2 Avoided spawning session on item shared event.
3 Provided logging of item shared message.
4 Provided logging of 'IMSystemMessageTip' notification without opened related IM session.

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/612/

--HG--
branch : product-engine
2010-06-18 17:52:54 +03:00
Andrew Dyukov a1b973fc2a EXT-7118 FIXED Changed text in group call invite.
- Changed group invite string from "has joined a Voice Chat call with the group [GROUP]" to "just joined '[GROUP]' voice channel."

- Added special string for group invite question saying "Would you like to leave [CURRENT_CHAT] and join the call with '[GROUP]'"?

- Hooked up this string in code.

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

--HG--
branch : product-engine
2010-05-28 00:03:08 +03:00
Sergei Litovchuk 09a58b804b EXT-7158 FIXED Moved lltextutil from newview to llui library.
Reviewed by Richard Nelson and Mike Antipov at https://codereview.productengine.com/secondlife/r/363/

--HG--
branch : product-engine
2010-05-19 01:20:39 +03:00
Roxie Linden a11ec0c89f Automated merge 2010-05-04 16:09:14 -07:00
Andrew Dyukov e8540593e6 Fixed low bug EXT-6776 ([FRAGMENTATION] Call strings need change).
- Removed string fragmentation by changing concatenation of name and action to whole-sentence strings.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/328

--HG--
branch : product-engine
2010-04-28 14:48:16 +03:00
Andrew Dyukov c540ef450a Fixed normal bug EXT-6893 (Corrupted 'Connecting to conference' notification is shown while connecting to ad-hoc voice chat).
Bug consisted of two problems- showing empty outgoing call floater and corrupted text in outgoing call floater. First was ad-hoc and group call specific and was caused by not showing appropriate text for STATE_READY voice channel state. Second was caused by too small space between "Connecting to..." and "Leaving..." textboxes, which enden in their collision for long names.

- First problem was fixed by adding STATE_READY case into appropriate switch where textboxes are made visible.

- Second was solved by placing "Leaving..." textbox lower

Reviewed by Vadim Sachuk at https://codereview.productengine.com/secondlife/r/310/

--HG--
branch : product-engine
2010-04-23 21:40:41 +03:00
Roxie Linden 5b9da4e8d9 Automated merge 2010-04-21 18:17:11 -07:00
Mike Antipov ea64706e79 Fixed normal bug EXT-6909 ('Mute/unmute' moderation options remain enaibled after moderator left group call)
Reason: session's Speaker Manager was not updated when voice call ended. Speakers had incorrect voice related state.

Fix: update speakers' state when voice call is finished.
   Also VCP now uses LLIMMgr::endCall to perform "Leave Call" action.

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

--HG--
branch : product-engine
2010-04-21 10:24:56 +03:00
Roxie Linden 6823879c1a CR Changes from Aimee 2010-04-19 12:52:43 -07:00
Tofu Linden 3f10caafc0 merge from viewer-hotfix 2010-04-17 12:13:59 +01:00
Mike Antipov cda29adca1 Fixed major bug EXT-6869 (Viewer crashes when switching between group voice sessions)
The reason: LLCallDialogManager did not disconnect from "voice channel state changed" signal on channel in previous session.
    Thus when old channel changes state from STATE_HUNG_UP to STATE_CALL_STARTED there is invalid pointer to session in connected LLCallDialogManager::onVoiceChannelStateChanged callback before current voice channel is changed and pointer to session becames valid.

Fix: add storing of connection to signal in voice channel from previous session and disconnect it before connecting to channel in current session.

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

--HG--
branch : product-engine
2010-04-16 15:14:07 +03:00
Roxie Linden d66c242fea DEV-48904 - p2p acceptance dialog vanishes too quickly
DEV-48903 - malformed names in p2p dialogs for Diamondware
In the merge there were some changes that didn't get propagated that resulted in some failures with
respect to diamondware name processing.  THe determination as to whether a p2p session was with
an avatar or with an alcatel (pbx) wasn't propagated into the diamondware code.

I fixed that by merging the changes to the vivox module with respect to that into the diamondware module.

Also, the acceptance dialog was vanishing too quickly as the determination as to whether there was still
a p2p invite pending was not updated when the calling code was updated.
The calling code initially was changed to look into vivox state which isn't really valid.  that was changed in
the 'trunk' to another mechanism, but that still assumed visibility into the voice code.

I fixed that by creating an API call to ask whether a call was pending.

CR: Karina
2010-04-14 17:21:44 -07:00
Roxie Linden 8d8f167a4e automated merge with trunk 2010-04-19 16:24:05 -07:00
Andrew Dyukov 93317037ee Fixed low bug EXT-5844 (Group chat invite appears when voice is disabled because connection problem).
- Added additional check for client's voice working properly before inviting to session.

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

--HG--
branch : product-engine
2010-04-13 21:51:18 +03:00
Andrew Dyukov cf9af33a1a Fixed normal bug EXT-6319 (Rejected voice call says "user Joined the voice call").
- Removed names from strings containing info about other user joining or ending the call to make them more general. See comment to JIRA ticket for more info.

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

--HG--
branch : product-engine
2010-04-09 18:29:32 +03:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden 9523c70f9d DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunk
Includes: DEV-45800, DEV-45803 - Grid Manager
DEV-45804 - SLURL refactor
DEV-45801 - Single username field (for Identity Evolution and SLE Ldap)
Also,
Includes Certificate Management code allowing the viewer to connect to
grids not signed by a well know key (just like any web browser).  Also
contains secure storage for things like passwords.
The security/certificate code is modular with the intention of adding modules
to directly use the operating system facilities for crypto if available.
(that's much more secure than we'll ever be)

Also, refactor of voice to modularize it, and add a diamondware voice module.
CR:  Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-02 02:03:21 -07:00
Roxie Linden aa0a129b67 Automated Merge 2010-04-01 21:47:22 -07:00
Mike Antipov bba457e889 Merge from default branch
--HG--
branch : product-engine
2010-03-31 10:08:50 +03:00
Loren Shih b0d2cd38f0 EXT-6634 : INFRASTRUCTURE: Generic header file / #include cleanup
LLAgent.* cleanup
Also took out some constants from llagent.cpp that aren't being used.
2010-03-30 15:21:53 -04:00
Vadim Savchuk 3e23c04c9b Merge from default branch
--HG--
branch : product-engine
2010-03-30 18:19:56 +03:00
Loren Shih 114e5ca083 EXT-5940 : Typedef all vector<LLUUID>'s
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
Mike Antipov 3f3c9c7e25 Fixed normal bug EXT-5116 (Voice notification should display on top of IM window, not under.)
Replaced sending voice notifications to front (in floater view) with adding them to popup view.
In this case Voice Notifications are shown on top even IM window has focus. And Resident can continue enter the text when Voice notification is shown.

Reviewad by Vadim at https://codereview.productengine.com/secondlife/r/120/

--HG--
branch : product-engine
2010-03-26 17:08:32 +02:00
Vadim Savchuk d3a606f832 Manual merge from default branch.
Resolved conflicts in llpanellandmarks.cpp.

--HG--
branch : product-engine
2010-03-24 18:04:26 +02:00
Roxie Linden 18b7ab0018 Weekly automated merge from viewer 2.0 2010-03-22 16:12:41 -07:00
Alexei Arabadji 2d0ca224ea fixed EXT-6472 “No indication about new message/offer if IM window is open but not in focus”,
allowed to increment IM message counter when IM window is opened but doesn't have focus and reset IM counter when IM window get focus;
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/76/

--HG--
branch : product-engine
2010-03-19 17:27:54 +02:00
Vadim Savchuk d374d2f317 merge
--HG--
branch : product-engine
2010-03-12 19:38:58 +02:00
Igor Borovkov 9757cd64e1 fixed EXT-4872 'Loading...' message remains in ad-hoc IM floated opened by 'Start IM' button
added timing out of session initialization (after 30 seconds)

--HG--
branch : product-engine
2010-03-10 14:04:36 +02:00
Alexei Arabadji 33133d4d7c fixed EXT-5910 “Offers logging”,
replaced interactive system message marker with correct from string value;

--HG--
branch : product-engine
2010-03-09 14:05:09 +02:00
Roxie Linden 20379fecd9 automated merge 2010-03-08 21:39:38 -08:00
Alexei Arabadji 2f9cc80c2e fixed EXT-5910 “Offers logging”,
fixed IM message counter when received interactive notification(offer);
corrected logging to file of offer notification;
enabled logging for FRIENDSHIP_ACCEPTED notification;

--HG--
branch : product-engine
2010-03-05 17:53:32 +02:00
Eugene Mutavchi c222c6c08a Fixed normal EXT-4798 (Voice notifications steal keyboard focus by default)
--HG--
branch : product-engine
2010-03-04 13:41:04 +02:00
Ychebotarev ProductEngine 5351688b9d fix for major EXT-5694 Only first recepient from ad-hoc conference is added to recent speakers
--HG--
branch : product-engine
2010-03-01 15:32:22 +02:00