summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-06-16Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-06-16mergeBrad Payne (Vir Linden)
2010-06-16EXT-6571 FIX - avoid removing links to missing wearables, which fixes a ↵Brad Payne (Vir Linden)
problem with ordering in multi-wearables
2010-06-16automated mergeLoren Shih
2010-06-16EXT-7735 FIXED When receiving a folder, "Show" (or hotlink) doesn't do anythingLoren Shih
Fixed highlight and open item code to work for both categories and items (was previously only working for items).
2010-06-16ext-7834 fixed corruption of menu item vectorgabriel lee
reviewed by richard
2010-06-16EXT-7834 fixed corruption of menu item vectorsgabriel lee
reviewed by Richard
2010-06-16fix for broken rear view cameraRichard Nelson
2010-06-16merge from PE's viewer-releaseTofu Linden
2010-06-16EXT-7576 FIXED 'Add to Outfit:' panel should shrink the top 'Edit Outfit' ↵Paul Guslisty
list to 1/3 the vertical height - Increased height of 'Add to Outfit' panel and set animate for layout stack. Animate attrubute was set to true to force proper calculation of layout panels size when one of the layout panels can dynamically change its visibility Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/588/ --HG-- branch : product-engine
2010-06-16EXT-7667 FIXED There is much unnecessary empty space from the right side in ↵Paul Guslisty
the Group profile information - Increased width of layout panel and its accordion Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/589/ --HG-- branch : product-engine
2010-06-16Automated merge with https://hg.productengine.com/secondlife/viewer-release/Alexei Arabadji
--HG-- branch : product-engine
2010-06-16EXT-7763 FIXED Made text editor of script error window as read only.Alexei Arabadji
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/594/ --HG-- branch : product-engine
2010-06-16mergeYuri Chebotarev
--HG-- branch : product-engine
2010-06-16EXT-7790 FIX Reset inventory filter when showing original item in inventoryYuri Chebotarev
reviwed by Loren Shih at https://codereview.productengine.com/secondlife/r/575/ --HG-- branch : product-engine
2010-06-15mergeRichard Linden
2010-06-15EXT-7090 WIP STRG(CTRL)+SHIFT+S in Mouselook doesnt make a snapshotRichard Linden
made world view extend to where menu bar would normally be when in mouselook
2010-06-15EXT-7468 FIXED Remove all 2.1 COF debugging codeLoren Shih
#ifdef'd a couple more llinfos spam to not show up in release mode.
2010-06-15EXT-7870 - Turn down footstep volumeRichard Linden
2010-06-15automated mergeLoren Shih
2010-06-15EXT-7468 FIXED Remove all 2.1 COF debugging codeLoren Shih
#ifdef'd a bunch of llinfos spam to not show up in release mode. Removed some other legacy comments.
2010-06-15EXT-7651 FIXED Take out hack in isLocalTextureDataFinal for TextureDiscardLevelsLoren Shih
Removed hack (this was just used for debugging avatar rez times).
2010-06-15mergeBrad Payne (Vir Linden)
2010-06-15EXT-6953 FIX - enable new walk/run by defaultBrad Payne (Vir Linden)
2010-06-15mergeRichard Linden
2010-06-15EXT-6953 WIP fixed walk cycle foot slip feedback to not speed up animation ↵Richard Linden
so much also, made camera default target and offset live-settable for debugging reviewed by vir
2010-06-15EXT-7758 FIXED Take out "Change FolderType" for viewer2.1.Loren Shih
Change folder type is now keyed off of SUPPORT_ENSEMBLES versus being available in non-release viewers.
2010-06-15EXT-7829 FIXED Corrupted graphics in inventory side panel (gray box)Loren Shih
Took out ensemble folder icon use, replaced with default icons.
2010-06-15mergeBrad Payne (Vir Linden)
2010-06-15EXT-7639 FIXED added shop button which reacts according to the ticket ↵Andrew Polunin
description - Added method LLAccordionCtrl::getExpandedTab() which search for the first expanded accordion tab. This method is a bit of hacking, but I discussed it with Vadim Savchuk. - LLAccordionCtrlTab::isExpanded() is made 'const'. This is necessary to call it from getExpandedTab() which is also 'const'. - Added all provided Marketplace URLs (taken from EXT-7257) to the settings.xml. So URLs can be configured without recompilation. - Added method LLCOFWearables::getSelectedItems() which can be used to get ALL selected items (not only one). - Class LLShopURLDispatcher is implemented in the llpaneloutfitedit.cpp. - Added callback LLPanelOutfitEdit::onShopButtonClicked() which calls LLShopURLDispatcher to send user to the correct URL. - Added shop button (shop_btn) widget in panel_outfit_edit.xml. It has invalid icon for now. After review I'm going to reassign the ticket to someone who will provide correct icons. Reviewed by Vadim Savchuk and Mike Antipov at https://codereview.productengine.com/secondlife/r/569/ --HG-- branch : product-engine
2010-06-15mergeBrad Payne (Vir Linden)
2010-06-15Fix for EXT-7414 (Jumping to a specific time in a video stream does not work ↵Monroe Linden
in Viewer 2.) This was a race condition. In the repro case, LLViewerMediaImpl::seek() was getting called before the media source got a chance to be loaded (since the load is now delayed at least 1 frame due to the priority calculations), so the seek command was being dropped. The fix is to save the seek time in mPreviousMediaTime in this case, and rearrange the code in LLViewerMediaImpl::loadURI() so that it gets used whenever it's non-zero. I've also added similar code in LLViewerMediaImpl::pause() and LLViewerMediaImpl::start() to set mPreviousMediaState. (If there are any cases where content wants parcel media to start out paused, they would have had a similar issue.) Reviewed by Callum and Richard at http://codereview.lindenlab.com/2478002 .
2010-06-15mergeRichard Linden
2010-06-15EXT-7808 FIXED Renamed the "Wear" context menu item to "Replace" in My ↵Vadim Savchuk
Outfits and Add Wearable panels. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/582/ --HG-- branch : product-engine
2010-06-15mergeBrad Payne (Vir Linden)
2010-06-15EXT-7776 FIXED Button label was renamed.Vladimir Pchelko
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/578/ --HG-- branch : product-engine
2010-06-15fix minor xml barf.Tofu Linden
2010-06-15merge fix in unrelated file.Tofu Linden
2010-06-15final(?) merge to revert snapshot floater to 2.0.1 level.Tofu Linden
2010-06-15Backed out changeset 1acc14a5e7acTofu Linden
2010-06-15merge backout.Tofu Linden
2010-06-15Backed out changeset 388c6d09894aTofu Linden
2010-06-15merge backout.Tofu Linden
2010-06-15Backed out changeset b447707f20f5Tofu Linden
2010-06-15merge backout.Tofu Linden
2010-06-15Backed out changeset 1c66b34b7fbeTofu Linden
2010-06-15merge backout.Tofu Linden
2010-06-15Backed out changeset c9dd9852d76bTofu Linden
2010-06-15merge backout.Tofu Linden
2010-06-15Backed out changeset d632626f9b11Tofu Linden