06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
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
2d7697dfad
automated merge
2010-02-26 01:52:28 -08:00
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
2ad421cef6
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
...
Completed
-- code improvements: updated condition to store really switched on indicators for future switching off.
--HG--
branch : product-engine
2010-02-24 11:53:10 +02:00
2fc5956d9d
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
...
-- added more log information
-- session uuid can now be set only from SpeakingIndicatorManager to ensure target session is the same indicator was registered with.
-- comments cleanup
--HG--
branch : product-engine
2010-02-24 11:13:52 +02:00
022c433d53
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
...
- implemented passing of target session UUID for which registered indicator should be shown only.
--HG--
branch : product-engine
2010-02-24 10:59:52 +02:00
d5a0fd7997
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
...
- updated interfaces of LLSpeakingIndicatorManager::registerSpeakingIndicator & LLOutputMonitorCtrl::setSpeakerId
to take a target session id for which registered indicator should be shown.
--HG--
branch : product-engine
2010-02-23 13:20:43 +02:00
20e9e6b57e
Fixed normal bug EXT-4907 - Two voice indicators are displayed in chiclets bar after making second
...
voice call
--HG--
branch : product-engine
2010-02-05 11:46:34 +02:00
d5e97617c6
Fixed major bug EXT-4782 (Viewer crashes if end ad-hoc voice chat by 'End session' context commant of chiclet)
...
- reason: indicator on ad-hoc chiclets is changed its speaker UUID that leads to registering the same instances several times in the SpeakingIndicatorManager.
This leads to crash after instance is destroyed because the only one (specified by UUID in unregisterSpeakingIndicator()) is removed from the map.
So, using stored deleted pointer leads to crash. See EXT-4782.
- fix: prevent regestering the same instance of indicator by removing existing one in LLOutputMonitorCtrl::setSpeakerId.
Also added check in SpeakingIndicatorManager to prevent such situation in the future with an appropriate warning & assert.
--HG--
branch : product-engine
2010-02-01 17:48:25 +02:00
2029bf92e2
Work on major bug EXT-3976 (Voice chat speaking indicators should only display when users are in the same voice channel)
...
-- improvements: added more comment for LLOutputMonitorCtrl::switchIndicator
--HG--
branch : product-engine
2010-01-14 17:35:57 +02:00
44e1f34f96
Work on major bug EXT-3976 (Voice chat speaking indicators should only display when users are in the same voice channel)
...
-- refactoring: implemented processing of switching indicator on/off in the same way
--HG--
branch : product-engine
2010-01-14 17:29:56 +02:00
f606a5b300
Work on major bug EXT-3976 (Voice chat speaking indicators should only display when users are in the same voice channel)
...
-- fixed bug: "Indicator does not appear if two indicators are visible for the same avatar on second switching to the same voice channel"
--HG--
branch : product-engine
2010-01-14 17:14:43 +02:00
86769b40aa
Work on major bug EXT-3976 (Voice chat speaking indicators should only display when users are in the same voice channel)
...
-- implemented functionality to have voice indicator visible only for avatars in the same voice channel with agent
All speacking indicators should be registered in LLSpeakingIndicatorManager to be provcessed for the voice channel.
They should implement switchIndicator(bool) as reaction on voice state changing
--HG--
branch : product-engine
2010-01-14 16:48:06 +02:00
a9634391d9
Moved parameters to xml so they don't overwrite outputmonitor's parameters in default widgets.
...
--HG--
branch : product-engine
2009-12-26 17:06:59 +02:00
08c5a509d3
Fixed normal bug EXT-3542 (Avatar blocked "by text" looks confusing)
...
-- implemented reaction of Speaker indicator only on voice blocking
--HG--
branch : product-engine
2009-12-17 19:06:21 +02:00
08f1e05552
fixed major bug EXT-1984 Speak button light should not disable when voice channel is open
...
--HG--
branch : product-engine
2009-11-02 21:51:39 +02:00
20e56a6925
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1992 https://svn.aws.productengine.com/secondlife/pe/stable-2@2004 -> viewer-2.0.0-3
...
* Bugs: EXT-1091 EXT-1418 EXT-996 EXT-1150 EXT-1188 EXT-1417 EXT-1181 EXT-1058 EXT-1397 EXT-836 EXT-1437 EXT-1379
* Dev: EXT-1291 EXT-1255 EXT-992 EXT-96 EXT-1157
2009-10-13 16:25:48 +00:00
1713a3552b
merge -r 1879-1884 https://svn.aws.productengine.com/secondlife/pe/stable-2
...
* Major Bugs: EXT-1248 EXT-1127 EXT-844 EXT-1160
* Changes: EXT-1139 (places context menu)
2009-10-01 17:52:30 +00:00
606b381c9f
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3
...
JIRAS:
EXT-96 EXT-204 EXT-312 EXT-334 EXT-479 EXT-498 EXT-514 EXT-637 EXT-647 EXT-746 EXT-748 EXT-749 EXT-757 EXT-789 EXT-794 EXT-808 EXT-817 EXT-823 EXT-831 EXT-834 EXT-837 EXT-844 EXT-848 EXT-862 EXT-876 EXT-896 EXT-897 EXT-898 EXT-899 EXT-910 EXT-912 EXT-918 EXT-921 EXT-925 EXT-926 EXT-928 EXT-930 EXT-931 EXT-935 EXT-938 EXT-939 EXT-952 EXT-985 EXT-986 EXT-992 EXT-994 EXT-995 EXT-996 EXT-997 EXT-998 EXT-1001 EXT-1004 EXT-1010 EXT-1012 EXT-1016 EXT-1018 EXT-1020 EXT-1028 EXT-1041 EXT-1044 EXT-1051 EXT-1052 EXT-1061 EXT-1069 EXT-1071 EXT-1074 EXT-1075 EXT-1076 EXT-1078 EXT-1080 EXT-1081 EXT-1082 EXT-1083 EXT-1085 EXT-1092 EXT-1093 EXT-1099 EXT-1100 EXT-1101 EXT-1104 EXT-1106 EXT-1111 EXT-1113 EXT-1114 EXT-1115 EXT-1116 EXT-1118 EXT-1119 EXT-1129 EXT-1132 EXT-1135 EXT-1138 EXT-1142 EXT-1161 EXT-1162 EXT-1178 EXT-1180
* NEW DEVELOPMENT:
* EXT-898 - Add dock/undock support for camera and movement controls
* Avatar list changes
* Bottom bar changes: menu, docking, visibility
* Camera changes
* Camera & Movement Floaters
* Dockable Floaters (LLDockableFloater)
* Removed LLListCtrl
* Toast / Notification changes: signal / destruction changes, ordering
* Nearby chat input should display active voice indicator
QA NOTES:
* Message Well Window is ready to be tested for regression & matching the spec.
* Verify Group List Item L&F
* Verify All tabs in People Panel
* Verify that Picks behavior is not changed
2009-09-29 19:37:05 +00:00
7df79382a0
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
...
* Bugs: EXT-888 EXT-866 EXT-861 EXT-858 EXT-864 EXT-875 EXT-884 EXT-718 EXT-786 EXT-885 EXT-910 EXT-845 EXT-312 EXT-823 EXT-868
* New Development: EXT-748 EXT-863 EXT-835
QA: Please test Recent List to verify it has no troubles.
2009-09-11 23:50:59 +00:00
eb853f55c0
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-08-04 01:12:59 +00:00
8f7ec64899
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
...
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-27 17:56:26 +00:00
ff52ac089f
DEV-34822 viewer 1.23 merge
...
DEV-32649 Merge the diamondware/vivox voice code
-r124876
-r125220
2009-07-15 21:50:42 +00:00
91f9835176
DEV-35118 Converted voice volume feedback icon on bottom tray to use real artwork. Converted LLOutputMonitorCtrl to use ParamBlocks to specify art. Added output_monitor.xml to specify art. Bottom bar gives volume feedback even when triggering voice with middle-mouse or keyboard binding. Reviewed with Richard.
2009-07-10 00:23:41 +00:00
52aeaa3284
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
...
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +00:00
d6101558a1
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
...
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Oz Linden