c0ff08e0b4
Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/
2009-11-12 18:03:36 +00: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
64c1146213
add Cancel button to outgoing call dialog, make it work (perhaps), make the name of the departing voice session more accurate (perhaps). WIP.
2009-11-12 15:35:08 +00:00
c2b227c939
more inching towards outgoing call popup goodness...
2009-11-12 14:28:57 +00:00
7cf3008da7
more work on the outgoing call popup...
2009-11-12 14:15:19 +00:00
095a3d4372
more mimicking of the good parts of the incoming_floater!
2009-11-12 13:33:54 +00:00
3888fed3f6
merge.
2009-11-12 11:57:28 +00:00
b38388d131
Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/
2009-11-12 09:54:07 +00:00
96286cde37
DEV-41324: Updated the Incoming Call floater.
...
This is now a dockable floater with a dock tongue. It currently floats
over the sys well, where other system messages appear. The appearance
now matches the voice spec more closely. It also tells you which voice
channel you would be leaving if you accept the call.
2009-11-12 09:53:34 +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
cc864d86ce
outgoing call dialog. doesn't do anything and is ugly/wrong, but it exists. WIP.
2009-11-11 18:06:44 +00:00
14c668bb97
fixed reopened subtask EXT-2265 IM unread messages counter should not be increased for system messages (comming from "Second Life", zero uuid)
...
now not counting messages with from = "Second Life" and from_id = receiver's uuid
--HG--
branch : product-engine
2009-11-11 19:19:07 +02:00
0d01300762
sketch-out the outgoing call dialog code. WIP.
2009-11-11 16:59:49 +00:00
6146cfc5c1
Merge from default branch
...
--HG--
branch : product-engine
2009-11-11 17:47:20 +02:00
2afc64e6fa
Fixed Normal bug EXT-1959 - [BSI] emotes difficult to see in IM/Group chat
...
--HG--
branch : product-engine
2009-11-11 13:08:02 +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
c3d9aa60a7
Merge from default branch
...
--HG--
branch : product-engine
2009-11-10 16:05:53 +02:00
cf7fdf86bf
Develop>XUI>Send Test IMs: Lets not poke fun of a resident tradition in the public beta. Also it should test a sentence that wraps. Ideally it would also test a string with double-byte characters but I dont know how to do that.
2009-11-10 11:50:01 +08:00
31cc68ecd3
Fixed normal bug EXT-2327 "Incoming call dialog crashes after logout".
...
- Added NULL pointer checks.
--HG--
branch : product-engine
2009-11-09 22:04:23 +02:00
8f679595d5
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-11-06 19:31:45 +02:00
8a4e36a9bd
fixed EXT-2295 "'Group Chat' btn makes chicklet appear only"
...
--HG--
branch : product-engine
2009-11-06 19:31:27 +02:00
a3830dee59
implement normal subtask EXT-2265 IM unread messages counter should not be increased for system messages (comming from 'Second Life', zero uuid)
...
--HG--
branch : product-engine
2009-11-06 17:03:48 +02:00
ddb42652e3
IM: minor refac., moved floater registation of llviewerfloaterreg
...
--HG--
branch : product-engine
2009-11-06 15:49:56 +02:00
bc3377c1f6
Partial implementation of EXT-1906 All speakers handling functional in old IM Floaters (Communicate) should be present in new IM Floaters/IM control panels, EXCLUDING voice related mute/moderation stuff
...
--HG--
branch : product-engine
2009-11-06 14:49:35 +02:00
49db6cd157
partly impemented EXT-700 '"Offer" notifications should be accessible via chiclet'
...
--HG--
branch : product-engine
2009-11-05 17:43:06 +02:00
265805a1b0
fixed low bug EXT-1941 'User is offline' message appears every time you performe double mouse click on avatar's while IM has been already started
...
--HG--
branch : product-engine
2009-11-02 17:33:42 +02:00
d3d53c9e41
IM: cleaned u TODO marks and completed minor TODOs.
...
--HG--
branch : product-engine
2009-11-02 16:59:43 +02:00
788b08f525
Fixed normal bug EXT-1877([BSI] Offline status not showing in IMs)
...
--HG--
branch : product-engine
2009-11-02 15:51:43 +02:00
e724fa0ab4
Implemented major task EXT-1487 (Reimplement chat history persistence using LLSD serialization).
...
Moved loading of IM history from LLIMFloater and LLFloaterIMPanel to LLModel::LLIMSession.
Implemented disabling of saving logs if it's disabled in Preferences.
--HG--
branch : product-engine
2009-10-29 20:26:56 +02:00
3a87aa6164
converted workaround to a fix for normal bug EXT-1918 (Region Messages crash the sender and anyone set busy).
...
--HG--
branch : product-engine
2009-10-29 16:33:10 +02:00
e9c83f2343
Merge
...
--HG--
branch : product-engine
2009-10-28 20:16:13 +02:00
e8e5dfeb36
Fixed critical bug EXT-1918 - [BSI] Region Messages crash the sender and anyone set busy.
...
NOTE - this is temporary workaround to fix the crash.
--HG--
branch : product-engine
2009-10-28 20:12:48 +02:00
4ca9e28f91
No ticket, just renamed mProfileButtonEnabled to mOtherParticipantIsAvatar
...
--HG--
branch : product-engine
2009-10-28 18:44:31 +02:00
a999e50a8e
Implemented major sub-task EXT-1912 ( Add handling restrictions of PSTN P2P calls in new IM Floaters )
...
--HG--
branch : product-engine
2009-10-28 16:14:52 +02:00
33af464c44
Implemented major sub-task EXT-1904 (New IM floater should handle Session Update)
...
--HG--
branch : product-engine
2009-10-28 14:21:36 +02:00
8a5d4c91f5
merge
...
--HG--
branch : product-engine
2009-10-27 18:04:17 +02:00
3eb7f84b10
IM: implemented task EXT-1905 (Add "Call" and "End Call" functionality to new IIM Floater)
...
--HG--
branch : product-engine
2009-10-27 18:01:41 +02:00
bfc9445563
Implemented major task EXT-1717 (IM related server responses processing stuff should use new IM floater along with the old one) sub-task of EXT-96 (Viewer 2009: Group IM detail).
...
--HG--
branch : product-engine
2009-10-27 14:29:18 +02:00
6222149487
IM refactoring: moved voice channel related classes to its own llvoicechannel.* files from dying llimpanel.* files
...
--HG--
branch : product-engine
2009-10-27 13:16:44 +02:00
e874fbc8f0
IM: got rid of old im floater dependency in LLIMMgr::addMessage(...)
...
--HG--
branch : product-engine
2009-10-26 18:05:00 +02:00
5892411348
merge
...
--HG--
branch : product-engine
2009-10-26 17:40:48 +02:00
e931d2d6f1
IM refac.: replaced passing copies by passing references, moved some IMModel private, added documentation
...
--HG--
branch : product-engine
2009-10-26 17:33:28 +02:00
f22f829b86
Fixed normal bugs EXT-1628 ([BSI] - New IM system isn't sending typing notifications anymore) and EXT-1629 ([BSI] - add hint in IM window when Resident is typing)
...
--HG--
branch : product-engine
2009-10-26 17:14:32 +02:00
d81b888410
IM: fixed remove session logic, got rid of "being session removed" field
...
--HG--
branch : product-engine
2009-10-26 16:41:47 +02:00
e018754f7e
IM: removed unused & empty methods and classes, added TODO marks
...
--HG--
branch : product-engine
2009-10-26 13:05:08 +02:00
b544e125a4
IM minor refactoring: removed unused LLIMMgr::isIMSessionOpen(...) - duplicate of LLIMMgr::hasSession(...)
...
--HG--
branch : product-engine
2009-10-26 08:16:20 +02:00
80b682d4b4
merge
2009-10-23 12:17:30 -07:00
b43771cad5
Merging revisions 2156-2183 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry
...
* Bugs: EXT-1590 EXT-1694 EXT-1660 EXT-1646 EXT-1694 EXT-1316 EXT-1775 EXT-1798 EXT-1799 EXT-1117 EXT-1571 EXT-1572
* Dev: EXT-1757 EXT-991 EXT-1758 EXT-1770 EXT-1192 EXT-1613 EXT-1611 EXT-1256 EXT-1758 EXT-747
2009-10-23 17:20:45 +00:00
642d368ecc
merge
2009-10-21 18:49:19 -07:00
Lynx Linden