summaryrefslogtreecommitdiff
path: root/indra/newview/llbottomtray.cpp
AgeCommit message (Collapse)Author
2010-02-25automated mergeRoxie Linden
2010-02-25automated merge from trunkRoxie Linden
2010-02-25automated 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.
2009-12-04Work on normal task EXT-3081 (Separate Message Well on Notifications Well ↵Mike Antipov
and IM Well) -- removed member pointer to Notification Well Icon from the LLBottomTray -- placed Well counter over the Icon, made center-aligned --HG-- branch : product-engine
2009-12-04Work on normal task EXT-3081 (Separate Message Well on Notifications Well ↵Mike Antipov
and IM Well) Refactored toggle interaction between Notification Well and Notification Well Window: -- set "Button.SetDockableFloaterToggle" init callback to Notification Well -- remove deprecated functionality in code -- update interaction with screen channels to work properly. --HG-- branch : product-engine
2009-12-03Work on task EXT-3081 (Separate Message Well on Notifications Well and IM Well)Mike Antipov
Initial commit -- added two floater classes derived from LLSysWellWindow to work with Notification Well & IM Well -- register two floaters in place of previous sys_well (but with the same xml file) -- replace using of LLSysWellWindow with LLNotificationWellWindow in the out code (except of in LLScreenChannel::updateShowToastsState) -- rename member variable in bottom tray used for Notification Well --HG-- branch : product-engine
2009-12-03fix for low EXT-3090 "Select All" item should be disabled if there is no ↵Yuri Chebotarev
text in nearby chat's input field --HG-- branch : product-engine
2009-12-02mergeYuri Chebotarev
--HG-- branch : product-engine
2009-12-02fix for EXT-2886 Context menu for Nearby chat text field should look like ↵Yuri Chebotarev
context menu for any text editor, should include such items as (cut,copy, paste etc) --HG-- branch : product-engine
2009-11-30Linker optimization - use "extern template" for commonly regenerated templatesJames Cook
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer. Reviewed with Ambroff
2009-11-28Use extern template for common singletons to reduce code bloat/link time.James Cook
2009-11-25mergerichard
2009-11-25Backed out changeset: c94fdea670e5richard
2009-11-25merge in changes from viewer-2-0, manually fixed conflict in ↵James Cook
llviewermessages.cpp
2009-11-25commented out spam that was slowing side tray openingrichard
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-24Removed llnotifications.h from all headers by adding llnotificationsptr.hJames Cook
Fixed many more includes
2009-11-20No ticket. Code to resize bottom tray is refuctored after the latest fix for ↵Mike Antipov
EXT-2616: - Removed unused param while extending bottom tray - Moved some debug messages --HG-- branch : product-engine
2009-11-20Fixed normal bug EXT-2616 ("Speak" button isn't narrowed and has title when ↵Mike Antipov
width of window is 800px) - updated resize behavior to shrink Snapshot button: only speaker is shown in this case. - updated LLSpeakButton to hide/show its labels - updated talk_button widget (talk_button.xml) to have correct follows attributes - also fixed bug with calculating necessary updates for children while extending bottom tray --HG-- branch : product-engine
2009-11-17Fixed low bug EXT-2501(Hidden Gesture button appears after viewer restart)Eugene Mutavchi
--HG-- branch : product-engine
2009-11-17Completed major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
- added possibility to shrink/extend buttons (gestures, move, view) while resizing - I had to add LLLayoutStack::getPanelMinSize interface to validate width of Layout panels with these buttons --HG-- branch : product-engine
2009-11-16Work on major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
- code cleaned up, removed commented out & unused code Functionality was not changed --HG-- branch : product-engine
2009-11-13Work on major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
Fixed issue: "Snapshort button can appear first due to its the least width while Bottom Bar extending" - implemented ordering in which buttons can be shown: Gesture, Move, View, Snapshot. --HG-- branch : product-engine
2009-11-13Work on major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
Improved functionality to process Buttons showing via context menu - added new alert dialog ("BottomTrayButtonCanNotBeShown") in case when there is no enough space to show button For now it contains a such message: "Selected button can not be shown right now. The button will be shown when there is enough space for it." It should be reviewed by XUI team --HG-- branch : product-engine
2009-11-13Work on major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
Implemented functionality to process Buttons hidden/shown via context menu 1. hidden buttons are not processed while resizing 2. setTrayButtonVisibleIfPossible() is implemented: * If it is impossible to show required button via context menu due to there is no enough room in bottom tray * it will no be shown. * Method also stores resize state to be processed while future bottom tray extending: * - if hidden while resizing button should be hidden it will not be shown while extending; * - if hidden via context menu button should be shown but there is no enough room for now * it will be shown while extending. --HG-- branch : product-engine
2009-11-13mergeYuri Chebotarev
--HG-- branch : product-engine
2009-11-13Work on major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
Implemented functionality to process shrink after bottom tray min width is reached --HG-- branch : product-engine
2009-11-12Merge with product-engineSteve Bennetts
2009-11-12mergeJames Cook
2009-11-12Work on major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
Code refuctored: - moved code to process Borrom Bar shrinking into separate method - unified code to process a hiding of the Bottom Tray's buttons Code is ready to process shrink after min width is reached & be synchronized with user hidden buttons --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-11Work on major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
Code refactored: - moved code to process width increasing into separate method --HG-- branch : product-engine
2009-11-11Work on major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
Code refactored: - processShowButton() now gets type of buttons should be shown instead of object - removed unnecessary code --HG-- branch : product-engine
2009-11-11Work on major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
Code refactored: - move calculating of buttons_required_width inside processShowButton(); - remove changing of delta_width out of processing each button while increasing width --HG-- branch : product-engine
2009-11-11Work on major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
- refactored logic increasing of width - fixed bug with incorrect work in some cases --HG-- branch : product-engine
2009-11-10EXT-2338 Move button tooltips to strings the viewer translation tool can parse.James Cook
Also moved mSpeakBtn from llnearbychatbar to llbottomtray, because the bottom tray is its parent.
2009-11-10Work on major sub-task EXT-991 (Update bottom bar behavior on resize)Mike Antipov
- update min width for chiclet panel - move showing of hidden buttons to place where resize strategy is determined --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: - cleaning - Imroved logic while resizing of bottom tray --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-09mergerichard
2009-11-09Central-source the authoritative state of mic openness.Tofu Linden
2009-11-05refactored top level ui into main_view.xmlrichard
2009-11-04LLTalkButton -> LLSpeakButton, 'cos that's what it is.Tofu Linden
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-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-19Merging revisions 2046-2068 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253 EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231 * Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476 * IM changes
2009-10-09merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1943 https://svn.aws.productengine.com/secondlife/pe/stable-2@1958 -> viewer-2.0.0-3 * Bugs: EXT-1148 EXT-1330 EXT-990 EXT-1259 EXT-1184 EXT-1327 EXT-1389 EXT-1276 EXT-1390 EXT-1396 EXT-1050 EXT-1094 EXT-1166 EXT-1137 EXT-1327 EXT-782 EXT-1137 EXT-1394 EXT-1326 EXT-917 EXT-1262 * New Dev: EXT-1292 EXT-1139
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)