summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2010-04-07Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-04-07fix for EXT-6619 "i" icon appears on top of accordion title in the Group ↵Yuri Chebotarev
Info panel https://codereview.productengine.com/secondlife/r/190/ reviewed mantipov --HG-- branch : product-engine
2010-04-07PE merge from pe-viewer-trunkTofu Linden
2010-04-07mergeTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-06Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-04-02Fixed normal bug EXT-6348 (SLapp world map location does not display the ↵Eugene Mutavchi
correct region) - fixed displaying the world map location for escaped SLapp urls. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/173/. --HG-- branch : product-engine
2010-04-02Partial fix for reopened EXT-6357 (SLapp for object chat does display an ↵Eugene Mutavchi
inspector) - changed the order of registering SLURLs so the LLUrlEntryObjectIM will be handled before LLUrlEntryPlace. Reviewed by Vadim Savchuk. --HG-- branch : product-engine
2010-04-02Manual merge from default branch.Vadim Savchuk
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357. --HG-- branch : product-engine
2010-04-02PE mergeTofu Linden
2010-04-02Fixed normal bug EXT-6357 (SLapp for object chat does display an inspector) ↵Eugene Mutavchi
- added new LLUrlEntry to support 'secondlife:///app/objectim/{UUID}/' SLapps. Fixed passing the SLURL to inspect_remote_object floater. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/158/ --HG-- branch : product-engine
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
Includes: DEV-45800, DEV-45803 - Grid Manager DEV-45804 - SLURL refactor DEV-45801 - Single username field (for Identity Evolution and SLE Ldap) Also, Includes Certificate Management code allowing the viewer to connect to grids not signed by a well know key (just like any web browser). Also contains secure storage for things like passwords. The security/certificate code is modular with the intention of adding modules to directly use the operating system facilities for crypto if available. (that's much more secure than we'll ever be) Also, refactor of voice to modularize it, and add a diamondware voice module. CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-01Automated MergeRoxie Linden
2010-04-01another fix for bad mergeRichard Linden
2010-04-01fix for bad mergeRichard Linden
2010-04-01added newline at eofRichard Linden
2010-04-01mergeRichard Linden
2010-04-01EXT-3531 - Ctrl-p doesn't work reliably on loginRichard Linden
moved gEditMenuHandler handling to LLEditMenuHandler destructor
2010-04-01EXT-6492 - button halign=center doesn't take into account left and right padRichard Linden
2010-04-01EXT-3606 - Script editor window: next line not indenting if current line wrapsRichard Linden
2010-04-01mergeRichard Nelson
2010-04-01fixed buildRichard Linden
2010-04-01EXT-3531 - Ctrl-P does not work reliably on loginRichard Nelson
2010-04-01Fixed windows buildDmitry Zaporozhan
--HG-- branch : product-engine
2010-04-01(work in progress) EXT-6564(major) - Fix wearable editing panelsDmitry Zaporozhan
Fixed Edit Shape panel layout: - fixed widget positioning according to spec - added gear button bar - fixed accordion positioning - fixed parameter list positioning TODO: - fix parameter panel positioning - apply changes to the rest of wearable panels Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/149/ --HG-- branch : product-engine
2010-04-01(work in progress) Update for LLAccordionCtrl arrange single expansion.Dmitry Zaporozhan
Found this issue while working on EXT-6564(Fix wearable editing panels) - Every single_expansion accordion is treated like "fit_parent" is set to "true" after changes made in 9805 : e6c5f3b23be1 (fix for EXT-5128 Groups accordions should all appear on-screen w/out scrolling (open accordion should fill space)). Updated accordion to take into account "fit_parent" property. Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/147/ --HG-- branch : product-engine
2010-04-01fixed EXT-2801 Record "object return" notification into IM history, not chat ↵Alexei Arabadji
history, * added class for LLPostponedNotification to rpovide possibility postpone adding notification to notifications system till sender avatar name will be received from cache name; * rolled back changes related to fix of EXT-4779; * avoided passing avatar id when logging 'Object Return' notification to nearby chat; eviewed by Vadim Savchuk at https://jira.secondlife.com/browse/EXT-6373 --HG-- branch : product-engine
2010-04-01Fixed normal bug EXT-6659("Ctrl+A" combination allows selecting of several ↵Eugene Mutavchi
picks) - added check that multiple selection is allowed Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/146/ --HG-- branch : product-engine
2010-03-31Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-03-30EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate classLoren Shih
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
2010-03-30Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-03-29Automated mergeRoxie Linden
2010-03-29EXT-5940 : Typedef all vector<LLUUID>'sLoren Shih
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29EXT-3075 : Remove swear words from comments across viewerLoren Shih
This bugs me in a minor way. Did a search-and-cleanup on various swear words.
2010-03-24merge from viewer-2-0Tofu Linden
2010-03-23added some comments for fix to EXT-5549Richard Linden
2010-03-23fixed line ending style where I copied from araxis merge windowRichard Nelson
2010-03-23EXT-5549 Can't select last character in chat windowRichard Nelson
2010-03-23Merge from viewer-2-0Tofu Linden
2010-03-25Fixed low bug EXT-6444 - Long notecard titles continue under Locked and Help ↵Dmitry Zaporozhan
icons on title bar. Changed the way floater title is reshaped. Calculations takes title buttons into account instead of using hardcoded values. --HG-- branch : product-engine
2010-03-24Manual merge from default branch.Vadim Savchuk
Resolved conflicts in llpanellandmarks.cpp. --HG-- branch : product-engine
2010-03-23Fixed normal bug (EXT-6340) Crash when attempting to ↵Sergei Litovchuk
getChild<LLAccordionCtrlTab>("accordion_tab_name") and "accordion_tab_name" is not found. - Added NULL pointer checks. --HG-- branch : product-engine
2010-03-23fixed EXT-4753 Just arrived avatars aren't sorted by name in VCPIgor Borovkov
added requesting a list to resort when avatar list item gets updated with avatar name from the name cache --HG-- branch : product-engine
2010-03-23Fixed low bug EXT-4081 (Lag Meter: Ctrl+W does not close floater)Paul Guslisty
- Set 'Close' text of tooltip instead of 'Close (Ctrl+W)' for close button of chrome floaters Reviewed by Mike Antipov --HG-- branch : product-engine
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-22fix for EXT-4288 Shrinking chat history window from top doesn't keep scroll ↵Yuri Chebotarev
thumb at bottom --HG-- branch : product-engine
2010-03-19Fixed bug EXT-5695 (Tabbed IM window loses focus if close any tab by Ctrl+W)Vadim Savchuk
Submitting on behalf of Paul Guslisty. Reviewed by Mike: https://codereview.productengine.com/secondlife/r/66/ --HG-- branch : product-engine
2010-03-19Updated normal task EXT-5905 - Resolving offers.Dmitry Zaporozhan
Reusable notifications are deleted when user closes IM floater(old - when user closes Viewer). --HG-- branch : product-engine
2010-03-19Merged with viewer-offersDmitry Zaporozhan
--HG-- branch : product-engine
2010-03-18Merge of PE merge with extra headKent Quirk