summaryrefslogtreecommitdiff
path: root/indra/newview/llchiclet.cpp
AgeCommit message (Collapse)Author
2009-11-12Fixed major bug EXT-2400-Viewer crashes on right button click upon IM P2P ↵Eugene Kondrashev
chiclet. Removed call to non-existing child --HG-- branch : product-engine
2009-11-12mergeIgor Borovkov
--HG-- branch : product-engine
2009-11-12no ticket, fixed IM message counting and firing new message balloonIgor Borovkov
--HG-- branch : product-engine
2009-11-12final fix forDmitry Oleshko
(EXT-989) IM chiclets should expand to show active voice indicator (EXT-988) Change indication of unread messges in chiclets fixed chiclets' behavior in the Message Well Window --HG-- branch : product-engine
2009-11-11Manual merge.Vadim Savchuk
Resolved conflicts in panel_bottomtray.xml and llavataractions.cpp. --HG-- branch : product-engine
2009-11-11mergeMike Antipov
--HG-- branch : product-engine
2009-11-11Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2009-11-11Work on major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
Code cleaned up: - removed test code to show background in chiclet panel --HG-- branch : product-engine
2009-11-11fixed EXT-2341 "Add Friend notification not shown", EXT-2351 "Friendship andAlexei Arabadji
Teleport offers no longer pop toast notifications"; suppresed IM-floater on incoming offer and registerd offer handler in chiclet counter updater; --HG-- branch : product-engine
2009-11-10Merge changes from product-engineSteve Bennetts
2009-11-10Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/Alexei Arabadji
--HG-- branch : product-engine
2009-11-10fixed EXT-2275 "[BSI] New incoming IM or Group IM pushes all existing (andAlexei Arabadji
new) chiclets off the right end of the chiclet bar." --HG-- branch : product-engine
2009-11-10Work on major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
Initial refactoring of functionality: - Re-Fixed bug with visibility of chiclet panel of the min size - updated bottomtray xml to make buttons identical to each other - Imroved logic while resizing of bottom tray (changing width of chiclet & nearby panels, hide/show buttons) --HG-- branch : product-engine
2009-11-10Fixed line endings from 4df44e70aa9dAndrew Dyukov
--HG-- branch : product-engine
2009-11-09Fixed EXT-2104 (Chiclets overflow buttons overlap lower tray elements)-Andrew Dyukov
in this changeset and in 4466:3ad0401e16a5. Here I changed height of buuttons. --HG-- branch : product-engine
2009-11-09Fixed normal bug EXT-2103 (There are no arrow icons on the Chiclets overflow ↵Andrew Dyukov
buttons), but Erica will have to set appropriate icon. --HG-- branch : product-engine
2009-11-09partial implementation for the major task (EXT-989) IM chiclets should ↵Dmitry Oleshko
expand to show active voice indicator --HG-- branch : product-engine
2009-11-05LLChiclet cleans up its connection to LLTransientFloaterMgr nowrichard
and panel_stand_stop_flying is visible by default while its contents are not
2009-11-05Merge from https://hg.aws.productengine.com/secondlife/viewer-2-0/Steve Bennetts
2009-11-05partial fix for a normal Sub-task (EXT-988) Change indication of unread ↵Dmitry Oleshko
messges in chiclets --HG-- branch : product-engine
2009-11-05Merge from viewer2voiceparity, conflicts resolved, and I fixed the 'speak' ↵Tofu Linden
button which is broken on trunk.
2009-11-04Merge changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/Steve Bennetts
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-11-04split code.Tofu Linden
2009-11-04implemented a normal Sub-task (EXT-988) Change indication of unread messges ↵Dmitry Oleshko
in chiclets --HG-- branch : product-engine
2009-11-04Implemented normal subtask EXT-1516 - Implement chiclet for ad-hoc chat.Eugene Kondrashev
--HG-- branch : product-engine
2009-11-03fixed normal EXT-1131 Message Well counts non-interactive notifications ↵Igor Borovkov
however chiclet-window is opened --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-30fixed normal bug (EXT-1934) [BSI] Revert EXT-543 - Notification chiclet ↵Dmitry Oleshko
should not count IM/Group messages --HG-- branch : product-engine
2009-10-29IM: cleaned up includes of old im floater stuff llimpanel.hIgor Borovkov
--HG-- branch : product-engine
2009-10-28Partial implementation of normal priority task EXT-1096 (Implement recent ↵Vadim Savchuk
time in recent people list). - Implemented display of last interaction time (e.g. 5m, 3d, 10w). - Removed dead code for displaying avatar away/busy status. TODO: i18n, visual fixes. --HG-- branch : product-engine
2009-10-23Merging revisions 2156-2183 of ↵Steven Bennetts
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-22Merging revisions 2129-2144 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry * Bugs: EXT-1293 EXT-1611 EXT-1613 EXT-1176 EXT-1724 EXT-1186 EXT-1662 EXT-1760 EXT-1720 * Dev: EXT-1575 EXT-1770 EXT-1232 EXT-1234
2009-10-21Merging revisions 2112-2128 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-1605 EXT-1506 EXT-1663 EXT-1616 EXT-1599 EXT-1587 * Dev: EXT-748 EXT-1447 * IM Cleanup
2009-10-21Merging revisions 2094-2099 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-1612 EXT-1604 EXT-1163 EXT-1163 EXT-1167 * Dev: EXT-1516
2009-10-14merge -r 2014-2032 https://svn.aws.productengine.com/secondlife/pe/stable-2 ↵Steven Bennetts
-> viewer-2.0.0-3 * Bugs: EXT-1005 EXT-1488 EXT-320 EXT-1236 EXT-1236 EXT-1002 EXT-1030 * New Dev: EXT-1293 EXT-1416
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new ↵James Cook
tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-01merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 * Bugs: EXT-1111 EXT-915 EXT-1131 EXT-1200 EXT-1202 EXT-1201 EXT-1205 EXT-1212 EXT-1173 EXT-1229 EXT-1218 EXT-1164 EXT-996 EXT-821 EXT-1030 EXT-1031 EXT-816 * Major Bugs: EXT-1142 (timeout during login due to processing group IMs) * Changes: EXT-1216 (minimize message well)
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-22EXT-331 Speak button uses the "Pressed" state and not the ↵James Cook
"Active/Selected/On" state. Speak button was hard-coded to segmented-button art -- removed hard-coding so it uses normal button params. Also changed walk-mode and camera-mode icons to use green backgrounds, which emphasizes the radio-button aspect of the controls. Reviewed with Erica.
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-09-10merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 ↵Steven Bennetts
-> viewer-2.0.0-3 Fixes: EXT-825 EXT-893 EXT-889 EXT-88
2009-09-09merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 ↵Steven Bennetts
-> viewer-2.0.0-3 Fixes: EXT-839 EXT-859 EXT-868 EXT-795 EXT-861 EXT-678 EXT-848 EXT-873
2009-09-09merge merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1581 https://svn.aws.productengine.com/secondlife/pe/stable-2@1585 -> viewer-2.0.0-3 * Bugs: EXT-838 EXT-815 EXT-872 * New Dev: IM Floater Docking
2009-09-09merge -r132032-132812 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-09-07merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3 * Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790 * New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788 * EXT-272 - Draggable Landmarks * EXT-715 - Block List Panel * EXT-782 - Implement advanced place information accordions
2009-09-02merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3 * Bugs: EXT-622 EXT-702 EXT-626 EXT-638 EXT-600 EXT-543 EXT-656 EXT-801 * New Dev: EXT-282 EXT-782 EXT-694 EXT-797 EXT-798 EXT-799 EXT-453
2009-08-26svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3 EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
2009-08-18merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1378 https://svn.aws.productengine.com/secondlife/pe/stable-1@1386 -> viewer-2.0.0-3 EXT-357 EXT-370 EXT-385 EXT-409 EXT-472 EXT-479 EXT-513 EXT-532 EXT-541 EXT-544 EXT-546
2009-08-14svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3 EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496