658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
b11a625e6f
Automated merge with a few fixups for code review comments
2010-03-01 15:31:04 -08:00
a2efe4bb41
automated merge
2010-02-26 19:18:15 -08:00
5352954eb6
automated merge
2010-02-26 17:34:39 -08:00
13d4257868
automated merge
2010-02-26 12:02:34 -08:00
0ac14158bc
automated merge from trunk
2010-02-25 14:12:18 -08:00
92cef0426d
automated merge from trunk
2010-02-25 11:33:56 -08:00
0bf246ed66
Automated merge
2010-02-25 00:17:42 -08:00
cb95fc1f48
No ticket. Replaced calls of LLVoiceClient::getInstance() to LLVoiceClient::instanceExists() in checks before
...
removal of voice client status observers. These checks were introduced in changeset bc6a6ab2ce54.
--HG--
branch : product-engine
2010-02-19 22:17:31 +02:00
0e035fd9b8
Fixed normal bug EXT - 5104 (Remove names from below Profile image in IM windows)
...
- removed LLTextBox containing avatar name from IM control panel(panel_im_control_panel.xml) and corresponding code in LLPanelIMControlPanel
2010-02-11 09:41:20 +02:00
a1c3d60819
No ticket. Removed unrelevant comment and added disabling call button if session doesn't exist in LLPanelChatControlPanel::updateCallButton().
...
--HG--
branch : product-engine
2010-02-03 21:48:30 +02:00
5bcf9661c5
Fixed normal bug EXT-4796 (Linux only: Call Group button blinks while Group Chat).
...
- Removed updateCallButton() call from draw() and added it to LLIMFloater::sessionInitReplyReceived() to enable "Call" button when session is initialized.
--HG--
branch : product-engine
2010-02-03 16:48:15 +02:00
ab0c9c6754
Fixed normal bugs EXT-4450 ([BSI] call buttons enabled when voice is disabled) and EXT-4313
...
(Should not be able to start a call when voice is disabled). Call buttons state now reacts on
voice changes in time.
- Added voiceWorking() method to LLVoiceClient to determine real availability of voice, because voiceEnabled()
doesn't take into account possible errors. Perhaps there is no need in two methods- some investigation will be
made and depending on its results they may become one non-static method. voiceWorking() uses state of voice
client(mState) to determine voice availability. Also some states which are not currently counted by voiceWorking()
as valid may be added if testing reveals problems.
- To enable/disable call buttons in time, LLVoiceClientStatusObserver is used. Its trigger uses states from its
enum only to skip updating button in some states(to avoid button blinking), but to determine button state
LLVoiceClient's voiceWorking() is used.
--HG--
branch : product-engine
2010-01-22 22:16:57 +02:00
7b41de5fac
Work on normal task EXT-2214 Refactor IM Control Panels
...
-- removed reference to LLSpeakerMgr from LLPanelGroupControlPanel (group text chat)
--HG--
branch : product-engine
2010-01-22 15:16:53 +02:00
1a8325f4dc
Work on normal task EXT-2214 Refactor IM Control Panels
...
-- replaced functionality to remove speacker from the list via Event timer.
-- removed calling of LLSpeakerMgr::update from LLPanelGroupControlPanel::draw() (group text chat)
For now list is updated when it is need.
--HG--
branch : product-engine
2010-01-22 14:59:12 +02:00
7f61cde331
Reducing include dependence from the "llspeakers.h" through "llimview.h" (following by the 7d600b529ee8 commit)
...
--HG--
branch : product-engine
2010-01-20 23:28:57 +02:00
a656e7bbfd
fixed EXT-3886 Group Profile button does not always show group info
...
--HG--
branch : product-engine
2010-01-14 16:38:44 +02:00
babc73682d
Fixed bug EXT-3750 (IM window min size too large):
...
* Decreased minimum IM window size.
* Removed gaps between buttons on the left.
--HG--
branch : product-engine
2010-01-05 19:38:34 +02:00
9737349a72
Fixed minor bug EXT-2955 ("Teleport" button is enabled in profile panel of offline avatar).
...
- Fixed not only "Teleport" button from profile, but also from IM (according to comment in JIRA).
--HG--
branch : product-engine
2009-12-29 19:55:23 +02:00
4cea2cac11
fixed EXT-3635 States of Call/Leave Call buttons are not properly managed when starting call using Call button in people panels
...
--HG--
branch : product-engine
2009-12-23 16:35:45 +02:00
0d6af2a01d
Additional commit for EXT-3581: the code of updating of speakers order is moved to a separate method
...
--HG--
branch : product-engine
2009-12-21 19:45:20 +02:00
50e5c4c3f3
Fixed major bug EXT-3581(Sort by Recent Speakers broken for Group Voice Call)
...
--HG--
branch : product-engine
2009-12-21 18:30:46 +02:00
40e9c253fc
additional commit to major task EXT-3509 User's own name should appear in the Group chat participant list
...
1. agent will be appear in ad-hoc conference too.
2. Disabling block/unblock yourself.
--HG--
branch : product-engine
2009-12-21 14:43:09 +02:00
b0b796cb05
implemented EXT-3512 “Add tool-tip to avatar name”;
...
--HG--
branch : product-engine
2009-12-17 18:50:59 +02:00
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
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
e88219b5e3
Work on major sub-task EXT-2790 (Complete Voice Control Panel (floater) started by Lynx (LLVoiceControlPanel))
...
-- improved logic to update Participant List for session. Now it uses current voice channel.
--HG--
branch : product-engine
2009-11-27 13:34:24 +02:00
bf6d5e9755
Work on major sub-task EXT-2790 (Complete Voice Control Panel (floater) started by Lynx (LLVoiceControlPanel))
...
-- implemented opening of the Voice Control Panel from the Group Chat
--HG--
branch : product-engine
2009-11-26 20:41:07 +02:00
81fdca151f
Merge from default branch.
...
--HG--
branch : product-engine
2009-11-26 17:46:17 +02:00
b19b63ad8c
Fixed minor bug EXT-2744 (IM window: Add Friend is disabled after removing friendship with a friends)
...
--HG--
branch : product-engine
2009-11-25 20:46:53 +02:00
24dbd81763
EXT-829 share button in profile inactive
...
refactored share code to all call LLAvatarActions::share.
Function opens an IM window if one doesn't already exist and prints an
appropriate message, as well as opening the inventory sidepanel.
Verified working in IM window, people tab, and individual's profile.
Will be post-reviewed before push.
--HG--
branch : avatar-pipeline
2009-11-23 13:23:54 -05:00
699eac4ee3
Switch some files to Unix line endings
2009-11-18 17:52:03 -08:00
30a2cf81e5
implemented normal task EXT-2519 Share button in IM should put 'Drag items from inventory here' in IM window
...
--HG--
branch : product-engine
2009-11-18 18:59:12 +02:00
3194c89177
Merging viewer2 changes into avp branch
...
--HG--
branch : avatar-pipeline
2009-11-13 19:26:20 -05:00
7af2e93265
EXT-2190 share button in IM should open sidepanel inventory
...
share button in im popup now opens sidepanel inventory.
Code reviewed by Seraph
2009-11-12 17:58:31 -05:00
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
2fd51b4c71
Manual merge.
...
Resolved conflicts in panel_bottomtray.xml and llavataractions.cpp.
--HG--
branch : product-engine
2009-11-11 21:11:54 +02:00
88f71ead30
Implemented Low sub-task EXT-2366-ALL Avatar specific buttons on IM P2P control panel should be disabled when interacting with AVALINE caller
...
--HG--
branch : product-engine
2009-11-11 17:34:08 +02:00
d5f3e6b2a8
Automated merge with file:///home/lynx/hg/general/viewer-2-0
2009-11-11 10:59:31 +00:00
162924aadf
DEV-41317 DEV-42311: Added ad-hoc voice call support.
...
You can now multiple select users in the People panel, hit Call, and
start an ad-hoc voice conference call with those users.
The most difficult part here was automatically starting the call once
the conference chat panel popped up. We have to wait for the panel to
initialize before we can start a call, so I added another callback to
LLIMModel to enable us to get notified when the panel has initialized.
This is all wrapped up behind a new LLAvatarActions::startAdhocCall()
API.
2009-11-10 18:53:07 +00:00
e292f310fb
No ticket. Cleaned up the code after last commit
...
--HG--
branch : product-engine
2009-11-10 15:35:58 +02:00
60a7a1d891
Implemented Sub-task EXT-2214-Refactor IM Control Panels
...
--HG--
branch : product-engine
2009-11-10 15:25:39 +02:00
15df55ecaf
No ticket, removed unnecessary warnings from 3d35bc1f0cc6 commit.
...
--HG--
branch : product-engine
2009-11-04 22:37:46 +02:00
8c27615aa5
Implemented normal sub-task EXT-2144 (IM P2p control panel should contain avatar name under avatar icon aligned to the left side)
...
--HG--
branch : product-engine
2009-11-04 22:17:23 +02:00
eb02d77ff5
Implemented major sub-task EXT-2131 - Output monitor contols should only be shown for Group Chat and Adhoc Chat when in a Voice Call. Added onStateChange callback support for voice channel. Added showing/hiding logic of speaking indicator.
...
--HG--
branch : product-engine
2009-11-04 21:33:14 +02:00
5ea6474aeb
Implemented low task EXT-1787 (Implement sorting of participant list)
...
--HG--
branch : product-engine
2009-11-03 17:47:20 +02:00
d4a3ccc52c
Fixed normal bug EXT-957-IM Verb button missing
...
--HG--
branch : product-engine
2009-11-02 21:27:37 +02:00
5b7f40df4e
Implemented normal sub-task EXT-1909 (Update IM Control Panels buttons according to the spec) - added 'Open Voice Controls' button. Note Teleport and Pay buttons will be implemented in EXT-957
...
--HG--
branch : product-engine
2009-11-02 19:18:24 +02:00
79738b2a65
Fixed normal bug EXT-1857-'Group Info' btn is unnecessary in Friends Conference floater
...
--HG--
branch : product-engine
2009-10-28 20:59:33 +02:00
Roxie Linden