summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-06-30Automated merge with ssh://hg.lindenlab.com/q/viewer-release/Nyx (Neal Orman)
2010-06-30EXT-8115 FIX outfits saved under 2.0 load with "unsaved changes"Nyx (Neal Orman)
Added code to save order information to outfits on loading / reverting them. Order information is updated not only in COF, but also in base outfit folder. This is only safe to do when we are explicitly loading a saved outfit, as the COF may have deviated from the saved outfit. This will also help fix order discrepencies in saved outfits that have been manually modified through inventory operations. Fix will only be effective after server 1.40 has rolled out. Tested results on Aditi to verify effectiveness. Code Reviewed by Seraph
2010-06-30merge from PE's viewer-releaseTofu Linden
2010-06-30EXT-7979 FIX always reset "dirty" flag after applying changesYuri Chebotarev
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/663/ --HG-- branch : product-engine
2010-06-29DEV-35247 - Update CA.pem according to instructions from MarkFKent Quirk
2010-06-29I got 99 problems, and a merge ain't one.Palmer
2010-06-29Merging in Davep's code for EXT-7835 which should help ext-8076Palmer
2010-06-29ND-46735 WIP JA and ES (vendor) translation for set 13Eli Linden
2010-06-29ND-46735 WIP JA and ES (vendor) translation for set 13Eli Linden
2010-06-29ND-47581 WIP IT translation for set 13Eli Linden
2010-06-29ND-47581 WIP IT translation for set 13Eli Linden
2010-06-29EXT-8133 - fix to gpu table to make it detect "NVIDIA Corporation" properlyPalmer
2010-06-29Made accordion headers 3px taller.Andrew Dyukov
- Increased height off all accordion headers by 3 pixels by changing HEADER_HEIGHT constant from llaccordionctrltab.cpp. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/667/ --HG-- branch : product-engine
2010-06-29EXT-7711 FIXED Changed string for maturity help topic to "maturity_rating".Vladimir Pchelko
Now clicking on help topic for location input goes onto correct help page. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/662/ --HG-- branch : product-engine
2010-06-29EXT-7962 FIXED Background color for "add more button / filter dropdown ↵Vladimir Pchelko
panel" was changed to the sidetray color (i.e. background rendering was disabled). Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/639/ --HG-- branch : product-engine
2010-06-29EXT-7648 FIXED Added handler for "PreferredMaturity" property which updates ↵Vladimir Pchelko
visibility and values for mature/adults check_box/icon/label. Reviewed by Sergey Litovchuk and Mike Antipov at https://codereview.productengine.com/secondlife/r/633/ --HG-- branch : product-engine
2010-06-29ND-47582 WIP PT translation for set 13Eli Linden
2010-06-29ND-47582 WIP PT translation for set 13Eli Linden
2010-06-29ND-47580 WIP FR translation for set 13Eli Linden
2010-06-29ND-47580 WIP FR translation for set 13Eli Linden
2010-06-29mergeYuri Chebotarev
--HG-- branch : product-engine
2010-06-29EXT-8045 FIX shift ScreenChannel rect when "SidebarCameraMovement" change.Yuri Chebotarev
reviewed by Mike Antipov, Alexei Arabadji at https://codereview.productengine.com/secondlife/r/654/ --HG-- branch : product-engine
2010-06-29mergeVadim Savchuk
--HG-- branch : product-engine
2010-06-29EXT-7976 FIXED The panel with Gear and Trash button was moved into ↵Vladimir Pchelko
panel_outfits_list.xml and (without trash button) panel_outfits_wearing.xml. Note: MY OUTFITS and WEARING controls size/positions were corrected to be similar to Places and Inventory. Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/650/ --HG-- branch : product-engine
2010-06-28Hear them doggies merginPalmer
2010-06-28EXT-8111 - gpu table settings added. No code changedPalmer
2010-06-28Line endings.Dave Parks
2010-06-28Porting VBO changes from davep/viewer-release.Dave Parks
Better usage of LLVertexBuffer::sEnableVBOs. Added RenderUseStreamVBO debug setting for controlling usage of VBOs for particles/avatars/etc.
2010-06-28CT-575 WIP DA translation for set 13Eli Linden
2010-06-28CT-575 WIP DA translation for set 13Eli Linden
2010-06-28MergeAimee Linden
2010-06-28VWR-7054 FIXED Flycam movement in build mode is reduced.Aimee Linden
Removed hard coded scaling of movements when in build mode, made it a debug setting defaulted to 1 to disable it.
2010-06-28MergeLeyla Farazha
2010-06-28EXT-8030 Can't edit worn Tattoos - Texture and Color pickers won't openLeyla Farazha
EXT-8029 Edit Wearable > Skirt, Jacket, Socks - Can't open texture or color picker, texture appears as gray X EXT-7770 Revert on shirt edit doesn't revert the fabric or color/tint icons back to their originals fixes color swatch/texture ctrl disabled issue and "undo changes" not reverting textures on avatar does not fix grey tattoo preview issue reviewed by Nyx
2010-06-28automated mergeLoren Shih
2010-06-28EXT-8033 FIXED Selecting multiple inventory items can give incorrect ↵Loren Shih
right-click context menus EXT-8093 FIXED No "open" or "properties" items for gestures Re-added open/properties to gestures Fixed right-click inventory selection so that it does something logical & consistent for multiple items. Had to add a "getLastVisible" to LLView to support this.
2010-06-25Fix for EXT-8025 ('+' button on My Appearance > Edit Outfit panel does nothing)Monroe Linden
Button now gets disabled in the early-exit case in LLPanelOutfitEdit::onInventorySelectionChange(). onInventorySelectionChange() also uses the new predicate get_can_item_be_worn(), which both checks whether the item is already being worn and whether it's of a type that could be worn. Reviewed by Nyx at http://codereview.lindenlab.com/2451030 .
2010-06-25Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseAndrew A. de Laix
2010-06-25Fix EXT-8074: unregister floater as message handler on destruction to ↵Andrew A. de Laix
prevent race from user closing dialog and receiving price message.
2010-06-25Fix for EXT-8089 (Log spam from SLPlugin about "autoreleased with no pool in ↵Monroe Linden
place - just leaking") Added slplugin-objc.mm. Made SLPlugin do the cocoa setup during initialization, and create/delete an autorelease pool each time through its main loop. This should make plugin code that's using autorelease correctly not leak. Fixed a bug in the version of setupCocoa() used in the viewer (it was never setting its "inited" variable).
2010-06-25EXT-7914 FIXED Current outfit can be removed via My Inventory -> Trash buttonLoren Shih
Now disabling remove if an outfit is linked in the COF.
2010-06-25Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseAndrew A. de Laix
2010-06-25Fix EXT-8075: close signal connection on destruction to prevent callbacks ↵Andrew A. de Laix
after LLInspectToast is, well, toast.
2010-06-25MergeEli Linden
2010-06-25ND-47583 WIP DE translation for set 13Eli Linden
2010-06-25ND-47583 WIP DE translation for set 13Eli Linden
2010-06-25mergeRichard Nelson
2010-06-25EXT-7957 - clothing editor does not open when editing clothesRichard Nelson
reviewed by nyx
2010-06-25removed some parsing error spam due to invalid attributesRichard Nelson
2010-06-25MergeEli Linden