summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
AgeCommit message (Collapse)Author
2010-05-28remove dos line-endings, grr.Tofu Linden
2010-05-28merge from PE's viewer-trunkTofu Linden
2010-05-27EXT-7332 WIP remove DE overrideEli Linden
2010-05-28EXT-7118 FIXED Changed text in group call invite.Andrew Dyukov
- Changed group invite string from "has joined a Voice Chat call with the group [GROUP]" to "just joined '[GROUP]' voice channel." - Added special string for group invite question saying "Would you like to leave [CURRENT_CHAT] and join the call with '[GROUP]'"? - Hooked up this string in code. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/458/ --HG-- branch : product-engine
2010-05-27MergeEli Linden
2010-05-27ND-47144 WIP ES editEli Linden
2010-05-27Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-27ND-47146 WIP JA translation for set11Eli Linden
2010-05-27ND-47146 WIP JA translation for set11Eli Linden
2010-05-27ND-47144 WIP ES translation for set11Eli Linden
2010-05-27ND-47144 WIP ES translation for set11Eli Linden
2010-05-27EXT-2260 ADDITIONAL FIX Added missing XMLAndrew Dyukov
Added xml of new widget which was occasionally not included into 19fc8b450df2. --HG-- branch : product-engine
2010-05-27EXT-2493 FIXED Changed appearance of moveview floater according to new style ↵Andrew Dyukov
guide. Replaced icons with relevant ones and changed positions of items in floater via xml. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/445/ --HG-- branch : product-engine
2010-05-27EXT-7200 FIXED Integrated art missing from appearance.Andrew Dyukov
Replaced "Shop" button text with icon, changed sizes of buttons according to comments in ticket, also changed heights of hovered and selected icons for items- made them equal to heights of panels they are used on. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/410/ --HG-- branch : product-engine
2010-05-27EXT-2260 FIXED Changed camera floater according to new styleAndrew Dyukov
- Implemented new widget- panel_camera_item, to use in camera floater. They are used inside of two panels. Their order is configurable via XML. Mouse down callbacks and images which are used for selected and and unselected items are also set in XML. - Now there are only 3 buttons instead of four at the bottom of the floater- pan and orbit are now shown simultaneously. - Implemented correct work of object view after moving from camera modes to presets list (and back). It wasn't workin completely correct in old version of floater. - Integrated new art. Reviewed by Igor Borovkov at https://codereview.productengine.com/secondlife/r/436/ --HG-- branch : product-engine
2010-05-27Merge from default branch.Mike Antipov
Incoming changes in (924d091c166c) moved SidebarCameraMovement logic out of special widget to camera setup code are reset changes in (380b2422b864) EXT-7434 FIX Worldview rect wasn't updated when "SidebarCameraMovement" variable But seems bug is not reproduced. --HG-- branch : product-engine
2010-05-26moved SidebarCameraMovement logic out of special widget to camera setup codeRichard Nelson
2010-05-26erica's layout fix for object inspectorsRichard Nelson
2010-05-26mergeRichard Nelson
2010-05-26made L$ balance non-clickableRichard Nelson
2010-05-26Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-26ND-47143 WIP FR translation for set11Eli Linden
2010-05-26ND-47143 WIP FR translation for set11Eli Linden
2010-05-26MergeEli Linden
2010-05-26EXT-7290 FIX missing translation for ITEli Linden
2010-05-26MergeDessie Linden
2010-05-26EXT-7017 FIXED Changed dialog phrasing to match recommendationDessie Linden
2010-05-26ND-46735 WIP FR JA linguisticEli Linden
2010-05-26Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-26EXT-7255 FIXED Added dragbar into edit outfit panel.Mike Antipov
Reverted changes committed by mistake in (5d420914a906). --HG-- branch : product-engine
2010-05-26EXT-7255 FIXED Added dragbar into edit outfit panel.Mike Antipov
I was going to implement dragbar via icon rendered in LLResizeBar. Layout panel marked as user_resize=true would have resize bar icon next to it. But there is an issue in layout stack when user_resize is possible only if there are more than one layout panels with user_resize=true. And applied resize icon (dragbar) is rendered where it is not necessary. See EXT-7471 for details. So, dragbar was implemented as a workaround: added an icon with dragbar into the "add to outfit" panel. Also layout of the "add to outfit" panel was updated to match spec. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/441/ --HG-- branch : product-engine
2010-05-26Merge from default branch, resolving conflict in ↵Mike Antipov
indra/newview/llinventorybridge.cpp LLObjectBridge::openItem() was concurrency modified. Applied behavior that was changed in c3220f7f7699 according to VWR-13743 FIXED Change Request: Change double click action for inventory wearables DEV-33391 FIXED Change Request: Change double click action for inventory wearables --HG-- branch : product-engine
2010-05-25Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-25mergeRichard Linden
2010-05-25DEV-50015 FIX Implement changes to the Buy L$ button in the top bar of the ↵Richard Linden
viewer
2010-05-25MergeCallum Prentice
2010-05-25Updated install.xml to point to a version of temporary version LLQtWebKit ↵Callum Prentice
that skips past SSL/Cert errors so QuickBuy functions can be tested. (Windows only) Also tweaked the QuickBuy Currency floater so scrollbars do not appear for current Web content
2010-05-25Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-25EXT-7209 EXT-7366 WIP better handling of wearable editor camera viewsNyx (Neal Orman)
Added code to get camera change to trigger on first opening a wearable editor. Also fixed a minor label issue that was causing skirt editor to fail. Code reviewed by Seraph
2010-05-25EXT-7289 FIX en_xui_changeEli Linden
2010-05-25ND-46735 WIP IT JA linguisticEli Linden
2010-05-25FIXED EXT-7469 Enabled 'fit to parent' parameter for accordionPaul Guslisty
- Enabled 'fit to parent' parameter for accordion Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/440/ --HG-- branch : product-engine
2010-05-25EXT-7471 PARTIAL FIXED Ensure bottom tray chatbar can always be resized by user.Mike Antipov
Seems, there is a problem somewhere in rendering of LLLAyoutStack children. Last visible panel marked as user_resize=true can not be resized and has no resize cursor. Because we have no time & resources to investigate this closely a workaround is implemented for bottom tray: * set user_resize for layout panel with Speak button which is always visible to user; * set user_resize=false to don't have Speak button panel resizable. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/438/ --HG-- branch : product-engine
2010-05-25EXT-7142 FIXED Upload functionality duplicated in the Build menu and Select ↵Andrew Polunin
Linked Parts menu moved up - LLPanelMainInventory::setUploadCostIfNeeded() - uncommented the line which enables retrieving of the upload cost price using LLGlobalEconomy class. - Implemented LLUploadCostCalculator event handler in the llviewermenu.cpp (the fact that it should be implemented in this file was discussed with Mike Antipov). - LLUploadCostCalculator::calculateCost() is implemented only for code readability: it's name is more descriptive than a code snippet placed directly in the constructor (LLPanelMainInventory::setUploadCostIfNeeded() works in similar way: it calculates cost_str only once). - 'Select Linked Parts' menu was moved below 'Edit Linked Parts'. - 'Upload' menu was added at the bottom, below 'Options' menu Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/425/ --HG-- branch : product-engine
2010-05-25EXT-6726 WIP Added handlers for most of Appearance SP context/gear menus.Vadim Savchuk
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/ --HG-- branch : product-engine
2010-05-24Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicXiaohong Bao
2010-05-24EXT-7467: FIXED: [DUPLICATED XUI ID] panel_preferences_graphics1.xml has ↵Xiaohong Bao
duplicated string id.
2010-05-24ND-46735 WIP IT JA linguisticEli Linden
2010-05-24automated mergeLoren Shih
2010-05-24merge from PE's viewer-trunkTofu Linden