Commit Graph

263 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Alexei Arabadji a5180babef EXT-3783 “System messages displayed in nearby chat”,
added missing floater_call_info.xml;
avoided recreation of LLCallInfoDialog with the same message;

--HG--
branch : product-engine
2010-01-27 13:10:31 +02:00
Alexei Arabadji 43bb3d00ec fixed EXT-4643 “IM toasts don't appear after few teleport offers were sent to that avatar”
corrected checking opened active IM session;
corrected restoring active IM session after logging IM notification;

--HG--
branch : product-engine
2010-01-26 18:25:42 +02:00
Alexei Arabadji 4fec1fb665 fixed EXT-3783 “System messages displayed in nearby chat”,
made voice status messages displayed in pop-out window;

--HG--
branch : product-engine
2010-01-26 15:36:41 +02:00
Igor Borovkov e3e4a301ab implemented EXT-4567 [BSI] private voice floaters do not contain standard X buttons
--HG--
branch : product-engine
2010-01-25 18:06:01 +02:00
Igor Borovkov a2105d1702 implemented EXT-4523 Log for all Ad-Hoc conferences is stored in one file
* for outgoing ad-hoc sessions chat history is saved into new file for every distinct set of initial participants
format: ["Ad-hoc Conference" "hash"<md5 hash of sorted participants' UUIDs>.txt]
ex: Ad-hoc Conference hash77a0ff26-614d-0dbd-ce19-5da9108f141a.txt

* for incoming ad-hoc sessions, chat history of each session is saved into a separate file:
format: [<ad-hoc session name> <timestamp> <4 first symbols of session id>.txt]
ex: Igor ProductEngine Conference 2010_01_22 07_41 2752.txt

--HG--
branch : product-engine
2010-01-22 18:10:07 +02:00
Mike Antipov 69c803fec5 cleanning include list. rearrange the list in imview.cpp
--HG--
branch : product-engine
2010-01-20 21:02:41 +02:00
Mike Antipov a719c3631a Fixed major bug EXT-4364 ( Crash clicking "View IM & Chat" when someone else joins group call)
- disabled processing of Incoming dialog buttons' clicks after viewer is disconnected

--HG--
branch : product-engine
2010-01-20 16:25:26 +02:00
Ychebotarev ProductEngine 82de841c52 merge
--HG--
branch : product-engine
2010-01-19 17:13:21 +02:00
Igor Borovkov 00c05a885f fixed EXT-3609 IM Floater that Opens Upon Friendship Acceptance Shows Accepting Av as Offline When They Aren't
--HG--
branch : product-engine
2010-01-19 16:42:55 +02:00
Ychebotarev ProductEngine f28778b8b8 work on EXT-4322 Remove the Communicate floater
leave some LLFloaterChat usages commented for later review...

--HG--
branch : product-engine
2010-01-18 17:50:19 +02:00
angela 82b073be87 Automated merge with ssh://angela@hg.lindenlab.com/james/gooey 2010-01-14 11:40:58 +08:00
angela 433eb89473 EXT-3795 First run messages still display (click & drag on map, Build tools open, movement controlled, etc) 2010-01-14 09:38:46 +08:00
Mike Antipov 628b892a66 Completed low task EXT-3759 (NOTFORBETA0: Phone numbers for AvaLine calls should be human readable)
- implemented formatting of avaline Number in the "Leaving call" notification

--HG--
branch : product-engine
2010-01-12 19:57:17 +02:00
Eugene Mutavchi 13148203a4 Fixed normal bug EXT-3672 (OSX specific: Notification "calling to ..." doesn't disappear after the voice call has been accepted)
--HG--
branch : product-engine
2010-01-11 22:07:14 +02:00
Yuri Chebotarev 4f1d776da7 fix for major EXT-3999 (nobody) appears in the Recent tab after receiving system notification
--HG--
branch : product-engine
2010-01-06 17:18:01 +02:00
Yuri Chebotarev 71c0973a1e more work on EXT-1649 Groups you chatted in recently show up in the Recent People tab
previous place for adding recent people was wrong...move this to LLIMSession.

--HG--
branch : product-engine
2010-01-05 17:56:13 +02:00
Mike Antipov 5d3c4cd23b merge
--HG--
branch : product-engine
2010-01-05 14:33:58 +02:00
Yuri Chebotarev eb880b2a55 fix for low EXT-1649 Groups you chatted in recently show up in the Recent People tab
--HG--
branch : product-engine
2010-01-05 14:30:16 +02:00
Mike Antipov b499fabab8 Completed low task EXT-3759 (NOTFORBETA0: Phone numbers for AvaLine calls should be human readable)
-- for now phone number is split on parts by two digits from right to left. The first left part can have 2 or 3 digits, i.e. +44-33-33-44-55-66 or 12-34-56-78-90.

--HG--
branch : product-engine
2010-01-05 14:20:07 +02:00
Mike Antipov e673fdea3f Fixed low bug EXT-3897 ( Turn off log spam: "LLIMModel::getSpeakerManager: session 00000000-0000-0000-0000-000000000000does not exist" from Voice Client)
-- added check of session UUID to null before calling LLIMModel::getSpeakerManager (implemented for the EXT-3544 bug)

--HG--
branch : product-engine
2010-01-04 15:33:56 +02:00
Alexei Arabadji 8b93a0d83d fixed EXT-2787 “Outdated voice chat invitation never hides itself”,
corrected check is invite from group or ad-hoc call to avoid hide incoming
call dialog for that cases;

--HG--
branch : product-engine
2009-12-30 16:05:59 +02:00
Mike Antipov e9f9a19ecc Work on low task EXT-3682 (Dedicated icon is required for AvaLine callers in the VCP)
-- improved changes for bug EXT-3684 ("Default" icon is used always for group calls in the voice notifications instead of group icon) to process avaline calls

--HG--
branch : product-engine
2009-12-28 12:24:47 +02:00
Mike Antipov 70e6b5a7f7 Fixed low bug EXT-3684 ("Default" icon is used always for group calls in the voice notifications instead of group icon)
-- implemented LLGroupIconCtrl to show group icon for passed group UUID.
-- added  LLGroupIconCtrl to incoming and outgoing dialogs

--HG--
branch : product-engine
2009-12-26 18:56:19 +02:00
Igor Borovkov daed86bbb0 implemented EXT-3682 Dedicated icon is required for AvaLine callers in the VCP
--HG--
branch : product-engine
2009-12-26 16:58:05 +02:00
Mike Antipov 91a8410757 Fixed normal bug EXT-3544 (Voice icon doesn't become "muted" in the voice controls panel after muting a resident)
--added updating of speakers in speaker manager when LLVoiceClient::participantUpdatedEvent and
LLViewerChatterBoxSessionAgentListUpdates::post events come.

--HG--
branch : product-engine
2009-12-25 16:31:52 +02:00
Alexei Arabadji 7eea562e8a Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
2009-12-25 13:18:20 +02:00
Alexei Arabadji 0d0f10441b moved to base class LLCallDialog method draw();
added check to draw LLCallDialog if floater has dock control;

--HG--
branch : product-engine
2009-12-25 13:17:53 +02:00
Dmitry Oleshko 404f164b5c implemented normal task (EXT-2211) Add textual indication (IM messages) about incoming voice calls and reactions on them (All types of IMs)
- added textual indications about call starters for Group and AdHoc calls

--HG--
branch : product-engine
2009-12-24 16:29:38 +02:00
Dmitry Oleshko 315c6dec06 fixed normal bug (EXT-2787) Outdated voice chat invitation never hides itself
- P2P and AVALINE invitationswill hide now if a call is not valid anymore
- GROUP and ADHOC invitations will stay on a screen

--HG--
branch : product-engine
2009-12-23 17:25:49 +02:00
Igor Borovkov d07fd64b6f finished EXT-1912 Add handling restrictions of PSTN P2P calls in new IM Floaters
chiclets for avaline calls are not spawned anymore

--HG--
branch : product-engine
2009-12-23 14:40:52 +02:00
Yuri Chebotarev 633c15570a merge
--HG--
branch : product-engine
2009-12-23 10:00:41 +02:00
Igor Borovkov 191e5f9ca0 merge
--HG--
branch : product-engine
2009-12-22 17:49:35 +02:00
Igor Borovkov 304e321f89 implemented EXT-3515 Click on IM button for multiple selected Avatars each time creates new IM session
--HG--
branch : product-engine
2009-12-22 16:39:56 +02:00
Eugene Mutavchi 33d76f152e Fixed low bug EXT-3430(Accept/reject voice call dialog appears in wrong place for several moments)
--HG--
branch : product-engine
2009-12-22 15:35:06 +02:00
Yuri Chebotarev 4d9762eb84 work on EXT-3463 - Ambiguity: some system messages are shown as sent from avatar and others are shown as sent from SL
--HG--
branch : product-engine
2009-12-22 12:26:06 +02:00
Andrew Polunin e03a2beeb6 fixed normal bug EXT-3562 MissingString(message) appears instead of warning about blocked text chat
--HG--
branch : product-engine
2009-12-21 17:56:10 +02:00
Igor Borovkov ae405adbfe merge
--HG--
branch : product-engine
2009-12-18 18:04:41 +02:00
Dmitry Oleshko ced655cbff partial implementation for major task (EXT-2211) Add textual indication (IM messages) about incoming voice calls and reactions on them (All types of IMs)
- added notifications for group/adhoc calls

--HG--
branch : product-engine
2009-12-18 17:56:49 +02:00
Igor Borovkov b28de65a8b corrected outgoing call dialog
--HG--
branch : product-engine
2009-12-18 17:27:58 +02:00
Dmitry Oleshko fd83b1fa11 fixed normal bug (EXT-3540) Wrong VOICE CHAT names in the "Calling to ..." and "Connecting to ..." voice notifications
--HG--
branch : product-engine
2009-12-17 16:14:49 +02:00
Dmitry Oleshko 05b840d6b7 fixed normal bug (EXT-3435) All voice notifications should look similar and according to the Voice UI Spec
- added new voice notification that replaced notification toasts
- now LLOutgoingCallDialog manages visibility of its controls on its own

--HG--
branch : product-engine
2009-12-17 13:53:59 +02:00
Mike Antipov 0ec2bacfac Work on EXT-3431 Implement 'mute/unmute everyone else' moderation in the voice control panel
-- changed behavior of 'mute/unmute everyone else' action to disable/enable voice chat and allow/disallow selected participant
  Improvements to have more intellectual processing of several following requests is necessary

--HG--
branch : product-engine
2009-12-16 18:14:15 +02:00
Vadim Savchuk a0ddd6877b Un-hardcoded a couple of strings.
--HG--
branch : product-engine
2009-12-16 17:08:03 +02:00
Igor Borovkov 9dd2b29031 fixed EXT-2884 Initiation of a voice call should not bring text chat (p2p, ad-hoc, group)
Added flag to an LLIMSession which indicated whether it has been created for a voice call.

--HG--
branch : product-engine
2009-12-16 15:30:33 +02:00
Igor Borovkov a137125afd fixed build
--HG--
branch : product-engine
2009-12-14 18:03:41 +02:00
Igor Borovkov c1b31cd97a merge
--HG--
branch : product-engine
2009-12-14 17:11:15 +02:00
Igor Borovkov 222dfaef0a fixed EXT-3372 [BSI] Typing notification in IM displayed although Resident isn't typing
Added explicit resetting of IM floater's title as it was done in 1.23

--HG--
branch : product-engine
2009-12-14 16:43:34 +02:00
Dmitry Oleshko ee7683f631 fixed normal bug (EXT-3246) Do not show "Calling to..." notification dialog for incoming group and ad-hoc calls
now is is able to get a direction of calls through the voice channel's signal for its state changing
also choosing of type of IMSession was fixed and was moved from a separate function to the constructor

--HG--
branch : product-engine
2009-12-11 19:53:19 +02:00
Vadim Savchuk a3ee1dda20 Merge from default branch.
--HG--
branch : product-engine
2009-12-11 16:31:36 +02:00
Igor Borovkov 178ce6df01 merge
--HG--
branch : product-engine
2009-12-11 15:15:41 +02:00
Igor Borovkov 12fb5d3a2d fixed EXT-3152 (Group Voice chat Notification and Invitation should include group's name) and corrected titles of Voice Control Panel
--HG--
branch : product-engine
2009-12-11 14:54:48 +02:00
Alexei Arabadji 4fc7b91a79 implemented EXT-2323 “Get rid from obsolete notification widgets”;
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
Steve Bennetts f6a1858884 Merge with product-engine 2009-12-10 10:14:17 -08:00
Igor Borovkov f11c604456 fixed EXT-3247 (There is no title in Ad-hoc IM window, and only "To" is shown if user accepts Ad-hoc conference)
sometimes a session name received from a server is empty,
added generating a correct session name in such a case

--HG--
branch : product-engine
2009-12-10 18:45:36 +02:00
Lynx Linden 9b4d09471c DEV-41317 DEV-42311: Improved auto-call implementation.
Improved the implementation for auto-connecting an adhoc call. This
involved having the controller (LLIMMgr) set a flag in the model
(LLIMModel) to autoconnect on initialize. Now all of the view code
(LLPanelChatControlPanel) and the signal/callback infrastructure that
I added earlier can be removed as it violated MVP separation. Ah!
Much nicer. Thanks to PE folk for the suggestion.
2009-12-10 14:05:17 +00:00
Eugene Mutavchi a85812d93f Partial fix of normal bug EXT-2788 (Confusing message after accepting outdated voice chat)
--HG--
branch : product-engine
2009-12-08 22:15:27 +02:00
Andrew Dyukov 4db25f9e02 Fixed normal bug EXT-2776 (Notification toasts of group chat pop up when group chat is
open but not in focus).

--HG--
branch : product-engine
2009-12-08 21:15:28 +02:00
Dmitry Oleshko 09f0b98e14 additional fix for outgoing voice notification
now only "NO ANSWER" notification closed after specified timeout

--HG--
branch : product-engine
2009-12-08 18:55:36 +02:00
Dmitry Oleshko 8b6b55e079 work on normal tasks:
(EXT-2803) Create notifications and dialogs to negotiate P2P voice chat (shown over the Speak button)
(EXT-2806) Create notification windows and dialogs to negotiate Group Voice Chat (docked to Speak button's chevron)
(EXT-2802) Create notifications and dialogs to negotiate AvaLine calls (shown over Speak button)
(EXT-2805) Create notifications and dialogs to negotiate Ad-Hoc calls (shown over Speak button)

- "NO ANSWER" notification gets closed after specified timeout
- added possibility to check direction of call (but it doesn't work for group and ad-hoc calls yet)
- adjusted layout for the incoming call dialog

--HG--
branch : product-engine
2009-12-08 17:19:09 +02:00
Roxie Linden 1147cb1afb Automated merge from trunk 2010-03-01 18:09:04 -08:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Roxie Linden a2efe4bb41 automated merge 2010-02-26 19:18:15 -08:00
Roxie Linden 13d4257868 automated merge 2010-02-26 12:02:34 -08:00
Roxie Linden 2d7697dfad automated merge 2010-02-26 01:52:28 -08:00
Roxie Linden 5c73a90835 automated merge 2010-02-25 21:20:45 -08:00
Roxie Linden 9b05fecbf6 automated merge from trunk 2010-02-25 18:24:07 -08:00
Roxie Linden 0ac14158bc automated merge from trunk 2010-02-25 14:12:18 -08:00
Roxie Linden 92cef0426d automated merge from trunk 2010-02-25 11:33:56 -08:00
Roxie Linden c6163fafaa automated merge 2010-02-25 01:34:52 -08:00
Roxie Linden c2ca71322b automated merge
Don't wanna fix all windows EOL issue here
warn-on-failure:unix-eol
2010-02-24 19:10:43 -08:00
Roxie Linden 6bb43e1369 Automated merge up from viewer 2.0 trunk.
Some llvoiceclient changes duplicated changes that had already been
made in the voice modularization refactor, so the refactor versions
were used.
2010-02-24 17:04:48 -08:00
Mike Antipov 660d818348 Work on normal task EXT-3148 (Implement updating of the IM Well message counter)
-- added new member in session stored count of unread messages from real participant and its updating
 -- added new method to IM Manager to caclculate total count of unread messages from real participants in all stored sessions
 -- added updating count of unread messages in IM Well counter

--HG--
branch : product-engine
2009-12-07 13:40:57 +02:00
Dmitry Oleshko 63cebc3ae0 partial implementation for the following tasks
(EXT-2803) Create notifications and dialogs to negotiate P2P voice chat (shown over the Speak button)
(EXT-2806) Create notification windows and dialogs to negotiate Group Voice Chat (docked to Speak button's chevron)
(EXT-2802) Create notifications and dialogs to negotiate AvaLine calls (shown over Speak button)
(EXT-2805) Create notifications and dialogs to negotiate Ad-Hoc calls (shown over Speak button)

implemented: invitations, displaying of notifications according to the state of current voice chat session

--HG--
branch : product-engine
2009-12-04 15:05:42 +02:00
Alexei Arabadji ebdb78ef3b Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
2009-12-03 18:59:57 +02:00
Alexei Arabadji 8d2752c3a6 fixed 'accept' of voice group chat
--HG--
branch : product-engine
2009-12-03 18:59:23 +02:00
Sergei Litovchuk ec48cc1a40 No ticket. Fixed using LLVoiceChannel::setStateChangedCallback() in IM Panel and IM View.
- Added disconnecting signal in destructor.

--HG--
branch : product-engine
2009-12-03 15:52:48 +02:00
Igor Borovkov dd262a7a36 implemented EXT-2582 (Save IM chat history as plain text file)
updated 1.23 chat log format - in multilined messages subsequent lines are prepended with a space
multilined messages of an old format are not supported, each line is considered as a separate message
the parser depends on current used date and time format

--HG--
branch : product-engine
2009-12-01 19:01:42 +02:00
Mike Antipov f5e64315e2 Work on EXT-2985 (Implement Avaline calls processing in Voice Control Panel)
-- updated reaction to accepting incoming call: added session URI argument. For now avaline caller is shown in the voice controls.

--HG--
branch : product-engine
2009-12-01 17:04:47 +02:00
Alexei Arabadji 7c0eac93e7 mplemented EXT-2891 “Group notices should be recorded into group IM history”;
--HG--
branch : product-engine
2009-11-30 21:41:17 +02:00
Alexei Arabadji 5ed4c70156 implemented EXT-2962 “Implement adding messages into IM history w/o spawning
chiclet”

--HG--
branch : product-engine
2009-11-30 19:59:44 +02:00
Alexei Arabadji 9a37144a3c removed unused method LLIMModel::addMessageSilently;
--HG--
branch : product-engine
2009-11-30 18:23:59 +02:00
Mike Antipov a334ae22e4 Work on major sub-task EXT-2790 (Complete Voice Control Panel (floater) started by Lynx (LLVoiceControlPanel))
-- Added updating of the speakers list for P2P call

--HG--
branch : product-engine
2009-11-30 11:45:00 +02:00
Alexei Arabadji f0426b924f implemented EXT-2889 "Incoming "grant modify rights" message should trigger
notify toast and adding record to IM history";
fixed avatar icon in IM-floater when message added to IM-session;
avoided popup of IM-tast when message added to IM-session;

--HG--
branch : product-engine
2009-11-28 17:43:21 +02:00
Dmitry Oleshko 8b802a69c7 implemented normal sub-task (EXT-2800) Voice calls notification windows and dialogs should be shown/docked over the speak button's chevron
changed dock-control from the SysWell to the SpeakButton for outgoing and incoming voice dialogs

--HG--
branch : product-engine
2009-11-27 14:53:38 +02:00
Dmitry Oleshko 00fe55c9b6 fix linux build (no default section in switch)
--HG--
branch : product-engine
2009-11-27 13:25:08 +02:00
Dmitry Oleshko ca1d0c82ed partial fix for major sub-task (EXT-2211) Add textual indication (IM messages) about incoming voice calls and reactions on them (All types of IMs)
implemented "Started a voice call" and "Joined the voice call" IM notifications for p2p voice chat.

--HG--
branch : product-engine
2009-11-27 12:49:05 +02:00
James Cook 957055396d merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp 2009-11-25 12:31:24 -08:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
James Cook 0e351bedb6 Removed llnotifications.h from all headers by adding llnotificationsptr.h
Fixed many more includes
2009-11-24 22:55:56 -08:00
Eugene Mutavchi 3d2fbad4ca Fixed normal bug EXT-2570 (There is no connecting/leaving spatial voice chat notifications in the nearby chat)
--HG--
branch : product-engine
2009-11-24 20:57:41 +02:00
Steve Bennetts 884a9887a7 Changes to IM Logging, includes preference changes 2009-11-18 21:42:27 -08:00
Bryan O'Sullivan 699eac4ee3 Switch some files to Unix line endings 2009-11-18 17:52:03 -08:00
James Cook 81eca4a782 merge 2009-11-18 15:05:04 -08:00
Mike Antipov 753e482b3f No ticket. Remove unnecessary including of "llchiclet.h" in a header file.
--HG--
branch : product-engine
2009-11-18 14:51:09 +02:00
richard b38ca5ec32 fix for UI scale != 1.0 breaking edit tools, web browser, world view rect, etc. 2009-11-16 15:47:45 -08:00
Tofu Linden 7722105e4e set the outgoing call window's dock point in postBuild() instead of onOpen() to avoid it being in the wrong place for a frame. 2009-11-13 19:38:13 +00:00
Tofu Linden 1b0b439c23 make the outgoing call dialog appear and disappear smarter.
this is sort of less like the spec but more like... reality...
2009-11-13 17:53:12 +00:00
Steve Bennetts 92cacc5581 Merge with product-engine 2009-11-12 16:47:15 -08:00
Lynx Linden c0ff08e0b4 Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/ 2009-11-12 18:03:36 +00:00
Lynx Linden a4375f8a30 DEV-41324 DEV-41331: Improvements to the Avaline voice workflow.
Don't show the "Start IM" button in the incoming call request for an
Avaline call. And display the phone number of the incoming call as the
avatar name, instead of "(???) (???)".
2009-11-12 15:46:51 +00:00