summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-06-24mergeTofu Linden
2010-06-24EXT-7747 FIXED Turn on multiattachments for 2.1 as debug settingLoren Shih
This #ifdef is now keyed to MultipleAttachments debug setting
2010-06-24Automated merge with ssh://hg.lindenlab.com/q/viewer-release/Nyx (Neal Orman)
2010-06-24EXT-7838 FIX - viewer 2.1 avatars look ruth-shaped to viewer-2 usersNyx (Neal Orman)
Added a third visual param group VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT to specify visual params that are user-tweakable, but should not be sent over the network. We should have this group *only* for new user-tweakable visual parameters that should not be sent over the network. These should only be used for *new* parameters that only contribute to the generation of baked textures. Code reviewed by Richard
2010-06-24EXT-7046 FIX User profile using wrong placeholder/generic profile pic artRichard Linden
wrong image names
2010-06-24EXT-7046 FIX User profile using wrong placeholder/generic profile pic artRichard Linden
2010-06-24merge from PE's viewer-releaseTofu Linden
2010-06-24EXT-7967 FIXED Hyperlink in clothing offer dialog does nothingLoren Shih
Fixed incorrect logic for auto_open and added some comments to explain expected behavior.
2010-06-24automated mergeLoren Shih
2010-06-24EXT-7818 FIXED Click on Take Off on my shoes fro inventory doesn't remove shoeLoren Shih
Added additional logic to tell if you're in edit outfit mode, removed some bad code that was causing removed wearables to never send out an appearance update.
2010-06-24ND-47148 WIP DE translation for set 11, set 12 new filesEli Linden
2010-06-24ND-47148 DE translation for set 11, set 12, and new filesEli Linden
2010-06-24mergeRichard Linden
2010-06-24mergeYuri Chebotarev
--HG-- branch : product-engine
2010-06-24EXT-7973 FIX (additinal) make edit item visible only when one item selected ↵Yuri Chebotarev
and it is worn reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/637/ --HG-- branch : product-engine
2010-06-24EXT-8046 FIXED changed background image of Shop btn (panel outfit edit)Igor Borovkov
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/651/ --HG-- branch : product-engine
2010-06-24EXT-5339 FIXED Inventory - "Object Profile" should be "Item Profile"Loren Shih
2010-06-24EXT-7793 FIXED Implemented wearing separate wearables instead of whole ↵Andrew Dyukov
outfit when individual items are selected in list. - Added wearSelectedItems() method to LLOutfitsList which wears all items selected in outfit lists (if possible- adds, else replaces). It is called when clicking wear if there is selection of individual items(LLOutfitsList::hasItemSelected() returns true). Otherwise whole outfit is worn. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/638 --HG-- branch : product-engine
2010-06-24Comments: EXT-7158 ADDITIONAL FIX Slight changes to fix according to reviewAndrew Dyukov
Added additional check to avoid deselcting of items when filter is applied and made a couple of renames according to Mike's comments in review at https://codereview.productengine.com/secondlife/r/648/ --HG-- branch : product-engine
2010-06-24Merged from q/viewer-releaseDessie Linden
2010-06-24EXT-8014 FIXED Enabled "Take off" in My Outfits gear menu only if a worn ↵Sergei Litovchuk
item or base outfit is selected. --HG-- branch : product-engine
2010-06-24EXT-7614 FIXED (\"Shop\" button's title is overlaid with new title)Andrew Polunin
- Added member mShopBtn (which corresponds to the 'Shop' button) to the LLSidepanelInventory class. - Added code to the LLSidepanelInventory::updateVerbs() which makes this button visible and enabled by default and hides it when any other button should appear on it's place ('Wear', 'Play' or 'Teleport'). Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/630/ --HG-- branch : product-engine
2010-06-24EXT-7984 FIXED (state of \"add more\" panel should reset upon closing or ↵Andrew Polunin
re-opening outfit editor) Added code to the LLPanelOutfitEdit::onOpen which resets the state of the \"add more\" panel Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/646 --HG-- branch : product-engine
2010-06-24EXT-7578 FIXED Corrupted vertical scroll bar appears on 'Edit Outfit' panel ↵Paul Guslisty
if height of 'Add More' panel was changed - Modified LLWearableItemTypeNameComparator so that it can order BODYPART items by type Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/620/ --HG-- branch : product-engine
2010-06-24EXT-7963 FIXED Edit Outfit > Add More > Do not switch to next item type ↵Paul Guslisty
after add/replace - Added callback to wear item from Add More panel on doubleclick - To keep the list in its existing state and do not change the contents of the Add More panel to the next listed unworn item after the user wears an item, check if the item is not dummy. Dummy icons have no ids. Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/647/ --HG-- branch : product-engine
2010-06-24mergeYuri Chebotarev
--HG-- branch : product-engine
2010-06-24 EXT-7905 FIX xml fixYuri Chebotarev
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/632/ --HG-- branch : product-engine
2010-06-24EXT-7975 FIX Didn't show menu if there is no work clothing among selected itemsYuri Chebotarev
reviwed by Neal Orman at https://codereview.productengine.com/secondlife/r/635/ --HG-- branch : product-engine
2010-06-24EXT-8008 FIXED Disable (+) button when worn item is selected (including ↵Vladimir Pchelko
multi-selection). Reviewed by Neal Orman and Mike Antipov at https://codereview.productengine.com/secondlife/r/640/ --HG-- branch : product-engine
2010-06-24EXT-7962 FIXED Background color was Changed to back for layout panel ↵Vladimir Pchelko
"add_button_and_combobox". Reviewed by Neal Orman https://codereview.productengine.com/secondlife/r/639/ --HG-- branch : product-engine
2010-06-24MergeMike Antipov
--HG-- branch : product-engine
2010-06-24EXT-7961 FIXED Added possibility to show label on the back button in Edit ↵Mike Antipov
Wearables panel. Implemented behavior: * Normally Back button appears narrow without label * When wearable is changed - "Save" label is set and button gets wide. Left Border of Title is moved to the right. Note: "Save" label is shown without truncation in all languages, Title can be truncated with dots. * When changes are saved/reverted - label is removed, button shrinks, Title left border is moved to the its default place. * Added consistent tooltip for title (the same as a title). * Added tooltip for button: "Save changes if necessary and return back" Details: * added getter for button's font * implemented derived from LLButton class for Back button to enable setting necessary label's padding in xml Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/636/ --HG-- branch : product-engine
2010-06-24EXT-8007 FIXED updated heights and pads (wearables panel on panel outfit edit)Igor Borovkov
Reviwed by Neal Orman at https://codereview.productengine.com/secondlife/r/645/ --HG-- branch : product-engine
2010-06-24Reverted changes in <string> reformatting made in f7ac28b29eec.Mike Antipov
this is necessary to avoid new translate cycle for already translated strings in format <string name=""> VALUE <string/> --HG-- branch : product-engine
2010-06-24EXT-7777 FIXED reverted changes to show loading indicator for "Wear/Attach" ↵Mike Antipov
action. Because it was too hard to fix EXT-7949 having so extremly lack of time. Proper fix for EXT-7949 requires changes in different places of the code calling add/removeCOFItemLink(). Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/644/ --HG-- branch : product-engine
2010-06-24Merge with default branche.Mike Antipov
--HG-- branch : product-engine
2010-06-23mergeRichard Nelson
2010-06-23EXT-7767 FIX Outfit editor doesn't appear to have a default camera viewRichard Nelson
added some comments and cleaned up code based on review
2010-06-23Automated merge with ssh://hg.lindenlab.com/q/viewer-release/Nyx (Neal Orman)
2010-06-23EXT-7958 FIX fixed shop button in the appearance sidepanelNyx (Neal Orman)
updated icon, and fixed XUI so it displays properly. Code reviewed by Monroe
2010-06-23EXT-7767 FIX Outfit editor doesn't appear to have a default camera viewRichard Nelson
2010-06-23Fix for EXT-6954 'rendering artifact when editing an object.' Reviewed by qarljonathanwolk@149.2.168.192.in-addr.arpa
2010-06-24EXT-7158 FIXED Implemented showing of full outfit content if its name or any ↵Andrew Dyukov
item(s) inside it match current filter. - Added availability to force showing unmatched items to LLFlatListViewEx - Applied it to wearable items lists in LLOutfitsList - Changed condition for outfit accordion tab showing (because now all items are visible, so checking their number doesn't help). Used here check for a flag added in this fix, which tells whether last applied filter found any matches in the list. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/648/ --HG-- branch : product-engine
2010-06-23Automated merge with ssh://hg.lindenlab.com/q/viewer-release/Nyx (Neal Orman)
2010-06-23EXT-7988 FIX wrong highlight color for worn itemsNyx (Neal Orman)
green is too green. EmphasisColor is the new green. Reviewed by Erica
2010-06-23ND-47489 WIP FR translation for set 12Eli Linden
2010-06-23ND-47489 WIP FR translation for set 12Eli Linden
2010-06-23CT-575 WIP DA translation for set 12, new filesEli Linden
2010-06-23CT-575 WIP DA translation for set 12Eli Linden
2010-06-23Merged from q/viewer-releaseDessie Linden