Commit Graph

263 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
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
Alexei Arabadji 7b2b36ec78 fixed major EXT-5746 “Voice notifications appear undocked in the top left corner of
viewport”,
made LLCallFloater and LLCallDialog force docked state when created;

--HG--
branch : product-engine
2010-02-26 10:08:03 +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 2b0752aa80 fix for EXT-5324 'You started a voice call' message appear after first text message in session
--HG--
branch : product-engine
2010-02-11 18:12:21 +02:00
Andrew Dyukov 23bc796a7f Fixed normal bug EXT-5289 ("Cancel" button is missing if call started when voice notification exists).
- Added setting "Cancel" button visible when call is started.

--HG--
branch : product-engine
2010-02-11 13:57:48 +02:00
Andrew Dyukov 7403d53e68 Fixed normal bug EXT-4566 ([BSI] private chat end floater reports incorrectly who ended the call)
- Added flag to voicechannel which is true when call is ended by agent.

- It is sent to imview via signal and used to properly customize text in outgoing call floater.

--HG--
branch : product-engine
2010-02-10 21:42:39 +02:00
Mike Antipov ac5bd9d504 Fixed normal bug EXT-5116 ( Voice notification should display on top of IM window, not under.)
- added moving notifications floaters to front in the floater view while opening.

--HG--
branch : product-engine
2010-02-09 16:31:46 +02:00
Andrew Dyukov a46a029a70 Fixed normal bug EXT-4397 (Call isn't ended after disabling voice).
- Added customizing string with notification about ending call depending on voice availability.

- Added closing of open VCP if voice is disabled.

--HG--
branch : product-engine
2010-02-05 19:06:57 +02:00
Igor Borovkov 906ee0cc63 fix for reopened EXT-4578 Noninteractive voice notifications should have close affordance
--HG--
branch : product-engine
2010-02-03 16:57:24 +02:00
Alexei Arabadji 6ebbc5edf6 fixed EXT-4764 “Forbid connecting to different voice channels at once”,
removed redundant call status notifications: ringing, connected, hang_up,
unavailable, answering;

--HG--
branch : product-engine
2010-02-03 16:15:34 +02:00
Eugene Mutavchi 7bcba326b3 Fixed major bug EXT-4798 (Voice notifications steal keyboard focus by default)
--HG--
branch : product-engine
2010-02-01 18:25:58 +02:00
Andrew Dyukov 0db7f3a783 Fixed major bug Bug EXT-4759 (Second incoming call notification doesn't appear if first call was canceled by caller).
- Bug was caused by simply closing invite floater when call becomes invalid, so pending invite wasn't removed from IM manager and later this caused failure of check on which floater is shown. Added clearPendingAgentListUpdates() and clearPendingInvitation() before closure.

--HG--
branch : product-engine
2010-01-29 21:09:28 +02:00
Vadim Savchuk db4e46e93d Mere from default branch
--HG--
branch : product-engine
2010-01-29 16:46:06 +02:00
Igor Borovkov f8bde94b9f completely got rid of Communicate floater and stuff
--HG--
branch : product-engine
2010-01-29 15:41:41 +02:00
Tofu Linden d91225b6ad CID-382
Checker: UNINIT_CTOR
Function: LLCallDialog::LLCallDialog(const LLSD &)
File: /indra/newview/llimview.cpp
2010-01-28 10:38:19 -08:00
Igor Borovkov 70b6d603ed got rid of LLFloaterIMPanel usage for EXT-1196 Stalls on startup in LLPanelFriends::refreshNames
--HG--
branch : product-engine
2010-01-28 18:30:58 +02:00
Andrew Dyukov b23a5dda5a Fixed low bug EXT-4647 ("Leaving nearby voice ..." appears when you're not connected to nearby voice channel).
- Added flag to check whether to show "Leaving ...". It is false only if voice in parcel is disabled and channel we leave is nearby.

--HG--
branch : product-engine
2010-01-27 18:19:52 +02:00