summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
AgeCommit message (Collapse)Author
2010-06-02merge from viewer-publicTofu Linden
2010-06-02EXT-6726 WIP Added missing menu items to the Appearance SP.Vadim Savchuk
- Hooked up Wear / Take off / Rename / Delete items in the My Outfits gear menu. - Added "Create new..." to body part / clothing context menu in Edit Outfit. - Added "Create new..." submenus to the Edit Outfit gear menu. - Disabling the "Take Off" menu item of the clothing context menu in the Edit Outfit panel when it's irrelevant. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/494/ --HG-- branch : product-engine
2010-06-02EXT-6726 WIP Added more menus to the Appearance SP.Vadim Savchuk
Done: - Implemented creating new wearables via My Outfits gear menu. - Implemented renaming/removing/editing an outfit via My Outfits context menu. - Implemented "Attach to..." / "Attach to HUD..." context submenus. - Now disabling (instead of hiding) irrelevant wearable context menu items. - Added "Take Off / Detach" context menu item that's shown for clothes and attachments. Useful if you selected a bunch of items and want to take them all off. - Fixed taking off an outfit (not all wearables were taken off because of a wrong inventory collector). - Fixed crash when editing a skirt (reference to a missing string). - In LLWearableItemsList::ContextMenu::updateItemsVisibility renamed variables and introduced MASK_UNKNOWN per Nyx's request. Known issues: - "Attach to..." context menus may be displayed partially off-screen (there is the same bug in the inventory panel). - The way we invoke wearable editing panel after the wearable gets created is currently a hack. TODO: - Wear / take off / rename / delete an outfit via My Outfits gear menu (currently not implemented because of missing selection support in My Outfits). - Add "Create new..." to body part / clothing context menu in Edit Outfit. - Add "Create new..." submenus to the Edit Outfit gear menu. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/466/ --HG-- branch : product-engine
2010-06-02EXT-7288 FIXED Fixed text flow in Land Info>covenant tabPaul Guslisty
- Increased size of the TextBox Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/477/ --HG-- branch : product-engine
2010-06-02EXT-7469 FIXED Enabled for accordion 'fit to parent' parameterPaul Guslisty
- Enabled for accordion 'fit to parent' parameter Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/440/ --HG-- branch : product-engine
2010-06-02EXT-7314 FIXED Localized \"Estate / Full Region\" and \"Mainland / Full ↵Paul Guslisty
Region\" strings - Added hardcoded \"Estate / Full Region\" and \"Mainland / Full Region\" to the strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/483/ --HG-- branch : product-engine
2010-06-02mergeYuri Chebotarev
--HG-- branch : product-engine
2010-06-02EXT-7550 FIX fix floater height and minimap position right after start.Yuri Chebotarev
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/497/ --HG-- branch : product-engine
2010-06-02EXT-7402 FIXED Made 'Ok'('mute all') as default action.Alexei Arabadji
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/484/ --HG-- branch : product-engine
2010-06-02EXT-7532 FIXED (Improve discoverability of sidebar Back button)Andrew Polunin
- New art was added in the textures.xml. - New art was applied to the back button in the following panels: panel_profile_view.xml panel_block_list_sidetray.xml panel_classified_info.xml panel_edit_classified.xml panel_pick_info.xml panel_edit_pick.xml panel_edit_wearable.xml panel_group_info_sidetray.xml panel_landmark_info.xml panel_outfit_edit.xml panel_place_profile.xml sidepanel_item_info.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/487/ --HG-- branch : product-engine
2010-06-02EXT-7528 FIX fix typoYuri Chebotarev
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/491/ --HG-- branch : product-engine
2010-06-01EXT-7527 FIXED repositioned "Add more..." button (panel edit outfit)Igor Borovkov
- relocated Add button (required substantial layout_stacks repositioning) - got rid of switch/shop buttons - reverted addition of adaptors for (accordion tabs/list view) inline button bars * failed to get rid of an empty space above bottom bars when "add wearables panel" is invisible (due to bug in the layout stack, when border is still drawn below layout panel which is only one visible) https://jira.secondlife.com/secure/attachment/39854/empty+space+.jpg Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/481/ --HG-- branch : product-engine
2010-06-01EXT-7087 ADDITIONAL FIX Style changes regarding image_flash attributeAndrew Dyukov
Removed default "FlashIconAbsent" value of image_flash button attribute. Changed check for presence of thic icon in code accordingly. --HG-- branch : product-engine
2010-06-01EXT-7255 COMMENTS Updated comments about implementation details.Mike Antipov
--HG-- branch : product-engine
2010-06-01EXT-6710 FIXED Added inventory items sharing confirmation and modified alert ↵Alexei Arabadji
about non-copy objects sharing. Current behavior: * user will be prompted about sharing items regardless is it one or more items; * user will be prompted about trying to share one ore more non-copy items; * in case user tries to share non-copy items among with copy items — copy tems will be shared and user will be prompted about sharing non-copy items reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/475/ --HG-- branch : product-engine
2010-06-01EXT-7516 FIXED Completely removed bottomtray's "Sidebar" button and related ↵Mike Antipov
settings/functionality Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/474/ --HG-- branch : product-engine
2010-06-01merge from viewer-publicTofu Linden
2010-06-01EXT-7379 FIXED Add save_visibility=true to search floater to enable ↵Mike Antipov
interaction with Search button Also added reset of floaters visibility on exit to emulate save_visibility=false Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/463/ --HG-- branch : product-engine
2010-05-31EXT-7087 FIXED Added flashing icons for im tabs and hooked them up in codeAndrew Dyukov
Added new attribute image_flash to button.xml which sets an image used for button icon when button is flashing. Pointer to this image is stored in member mImageFlash from LLButton and is used in LLButton::draw(). There are two ways an image can flash now - by making changes in color according to flash_color attribute or by changing icon from current to the one specified in image_flash. Second way is used only if the name of flash icon is different from "FlashIconAbsent" which is there by default. First way is used otherwise. Used new selfmade orange icons for flashing tabs. --HG-- branch : product-engine
2010-05-31EXT-7201 FIXED Removed extra gear menu button.Sergei Litovchuk
- Removed extra gear button bar from "Edit Outfit" panel. - Added one more dummy icon to "Add Wearable" panel button bar to chose the right dummy depending on the "Add Wearable" panel visibility. Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/473/ --HG-- branch : product-engine
2010-05-29merge from viewer-publicTofu Linden
2010-05-28EXT-7498 WIP Hide share to web button until the code behind it is complete.Aimee Linden
2010-05-29EXT-7198, EXT-7491 FIXED Added mutli-selection support for outfit items and ↵Sergei Litovchuk
outfit tabs selection support. - Added selecting multiple items from more than one accordion tab. - Integrated context menus from Vadim's patch for EXT-6726 Appearance SP menus (WIP tier 2). - Added selection to accordion control to use it instead of accordion tab focus in cases when focus is lost and outfit tab should stay selected. - Changed "Wear" button behavior: "Wear" puts on currently selected outfit (as the tooltip reads "Wear selected outfit"). There is always an outfit selected when the accordion is focused so for now there are no cases when only some items are selected. Separate items can be worn from context menu. - Added moving accordion tab selection with right click. Fixed (EXT-7491) Right click on an accordion title should move selection to it. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/437/ --HG-- branch : product-engine
2010-05-31merge; fixed gcc buildVadim Savchuk
--HG-- branch : product-engine
2010-05-31Manual merge from default branch.Vadim Savchuk
Semi-automatically resolved conflicts in: * indra/newview/llappearancemgr.cpp * indra/newview/llappviewer.cpp * indra/newview/llcofwearables.cpp * indra/newview/llinventoryfunctions.cpp * indra/newview/llpaneloutfitedit.cpp * indra/newview/skins/default/xui/en/strings.xml * indra/newview/skins/default/xui/ja/strings.xml --HG-- branch : product-engine
2010-05-31EXT-7485 FIXED Updated 'save as new' button on inventory outfit pane to fit ↵Alexei Arabadji
spec. * moved logic related to combo button from LLPanelOutfitEdit to LLSaveOutfitComboBtn class; * used LLSaveOutfitComboBtn class in LLPanelOutfitsInventory; reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/459/ --HG-- branch : product-engine
2010-05-31EXT-7208 FIXED repositioned tattoo pickers to match the updated specIgor Borovkov
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/460 --HG-- branch : product-engine
2010-05-28automated mergeLoren Shih
2010-05-28EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
Code cleanup. Some minor changes in logic for when low res texture is used. Added more metrics to notifications and texture debug output.
2010-05-28merge from viewer-publicTofu Linden
2010-05-28EXT-7466 - [BROKEN STRING] the word "administrator" is broken in strings.xml ↵Roxie Linden
in 2 places Simple fix
2010-05-28automated mergeRoxie Linden
2010-05-28EXT-7013 FIX time formatting function didn't work for some parameters for ↵Yuri Chebotarev
Japanise (like weekdays). reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/457/ --HG-- branch : product-engine
2010-05-28automated mergeLoren Shih
2010-05-28mergeTofu Linden
2010-05-28remove dos line-endings, grr.Tofu Linden
2010-05-28mergeIgor Borovkov
--HG-- branch : product-engine
2010-05-28EXT-7208 PARTIAL FIXED fixed tattoo texture pickers, repositioned tattoo ↵Igor Borovkov
color picker - assigned callbacks for tattoo texture pickers - repositioned tattoo color picker Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/453/ --HG-- branch : product-engine
2010-05-28merge from viewer-publicTofu Linden
2010-05-28merge from PE's viewer-trunkTofu Linden
2010-05-27automated mergeRoxie Linden
2010-05-27EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
EXT-7526 FIXED Add baked texture information to texture view First attempt at low res textures after timeout. Added debug setting to control whether low res texture timeout is used. Added baked texture load information to texture view debug display. Trivial name changes to some variables.
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-27Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
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 viewer-publicTofu Linden
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