summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
AgeCommit message (Collapse)Author
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-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-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-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-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-28Merged from ssh://hg.lindenlab.com/dessie/viewer-privateAimee Linden
2010-05-28automated mergeLoren Shih
2010-05-28EXT-7138 FIXED Merge Voice Morphing from aimee/viewer-trunk_voice-featuresAimee 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 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-7138 WIP Indicate unsubscribed Voice Morphs with (Unsubscribed) in the ↵Aimee Linden
expiry date column.
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-27Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicAimee Linden
2010-05-27EXT-7138 WIP Changed UI text to use "Voice Morph" everywhere instead of ↵Aimee Linden
"Voice Effect". Revised wording in preview floater (DEV-50573). Added tool-tip for Voice Morphing control in Nearby Voice (DEV-50608).
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-26Add new mechanism for getting a unique machine id.karina
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-26EXT-7017 FIXED Changed dialog phrasing to match recommendationDessie 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-26Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicAimee Linden
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 17:39:23 +0000