summaryrefslogtreecommitdiff
path: root/indra/newview/lloutputmonitorctrl.cpp
AgeCommit message (Collapse)Author
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-03-01Automated merge with a few fixups for code review commentsRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-24Automated merge up from viewer 2.0 trunk.Roxie Linden
Some llvoiceclient changes duplicated changes that had already been made in the voice modularization refactor, so the refactor versions were used.
2010-02-24Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat ↵Mike Antipov
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-24Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat ↵Mike Antipov
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-24Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat ↵Mike Antipov
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-23Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat ↵Mike Antipov
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-05Fixed normal bug EXT-4907 - Two voice indicators are displayed in chiclets ↵Dmitry Zaporozhan
bar after making second voice call --HG-- branch : product-engine
2010-02-01Fixed major bug EXT-4782 (Viewer crashes if end ad-hoc voice chat by 'End ↵Mike Antipov
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-01-14Work on major bug EXT-3976 (Voice chat speaking indicators should only ↵Mike Antipov
display when users are in the same voice channel) -- improvements: added more comment for LLOutputMonitorCtrl::switchIndicator --HG-- branch : product-engine
2010-01-14Work on major bug EXT-3976 (Voice chat speaking indicators should only ↵Mike Antipov
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-14Work on major bug EXT-3976 (Voice chat speaking indicators should only ↵Mike Antipov
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-14Work on major bug EXT-3976 (Voice chat speaking indicators should only ↵Mike Antipov
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
2009-12-26Moved parameters to xml so they don't overwrite outputmonitor's parameters ↵Dmitry Zaporozhan
in default widgets. --HG-- branch : product-engine
2009-12-17Fixed normal bug EXT-3542 (Avatar blocked "by text" looks confusing)Mike Antipov
-- implemented reaction of Speaker indicator only on voice blocking --HG-- branch : product-engine
2009-11-02fixed major bug EXT-1984 Speak button light should not disable when voice ↵Denis Serdjuk
channel is open --HG-- branch : product-engine
2009-10-13merge ↵Steven Bennetts
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-01merge -r 1879-1884 https://svn.aws.productengine.com/secondlife/pe/stable-2Steven Bennetts
* Major Bugs: EXT-1248 EXT-1127 EXT-844 EXT-1160 * Changes: EXT-1139 (places context menu)
2009-09-29merge ↵Steven Bennetts
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-11merge ↵Steven Bennetts
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-08-04svn merge -r 128442:129343 ↵Richard Nelson
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-07-27Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ↵James Cook
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-15DEV-34822 viewer 1.23 mergeRoxanne Skelly
DEV-32649 Merge the diamondware/vivox voice code -r124876 -r125220
2009-07-10DEV-35118 Converted voice volume feedback icon on bottom tray to use real ↵James Cook
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-07Merge skinning-14 to viewer-2, including refactoring many floaters to ↵James Cook
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-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also ↵James Cook
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-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 21:32:44 +0000