summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-08-09Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-09patching from fixes made in dessie/viewer-releasegabriel lee
2010-08-06Fixes for EXT-8563 "VWR-20156: Prim Media on HUDs has no Audio or Interactivity"Monroe Linden
Backed out changeset 1b65d0d42c67 (the fix for EXT-5205), and replaced it with a check in LLPanelPrimMediaControls::nextZoomLevel(). Made LLViewerMediaImpl::calculateInterest() not attempt to calculate distances to HUD attachments, since their global positions are invalid.
2010-08-06CT-575 WIP FR linguisticEli Linden
2010-08-06EXT-7963 FIXED (Edit Outfit > Add More > Do not switch to next item type ↵Paul Guslisty
after add/replace) - Added selected item type (in flat list view) as criterion when determining filter type in 'Add More' panel - Fixed LLAccordionCtrl::getSelectedTab() method. When 'selection_enabled = false' for LLAccordionCtrlTab, LLAccordionCtrl::getSelectedTab() returned NULL, even if some accordion tab was selected. Now it's OK. Method returns currently selected LLAccordionCtrlTab. Recovered from bad merge in 13811 Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/790/ --HG-- branch : product-engine
2010-08-06Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-08-06EXT-8447: FIXED: crash at ↵Xiaohong Bao
LLTextureCache::writeEntryToHeaderImmediately(int,LLTextureCache::Entry &,bool) [secondlife-bin lltexturecache.cpp]
2010-08-06EXT-8579 FIXED Develop.Avatar.Animation Info should not show asset IDsTofu Linden
Made it so that you only see real UUIDs if the viewer thinks you are in real godmode.
2010-08-06Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-06merge from PE's viewer-releaseTofu Linden
2010-08-05CT-575 WIP IT translation for set16 for Viewer 2.1.1Eli Linden
2010-08-05mergeTofu Linden
2010-08-05EXT-8304 FIXED [crashhunters] crash in LLKeyframeMotion::deserializeTofu Linden
Speculative bunch of robustification. Reviewed by Soft.
2010-08-05Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-08-05EXT-8309 FIXED Incorrect French date format in place profile and status bar.Vadim Savchuk
Changes: - Added support for formatting day of the month without leading zero ("sday"). - Changed date format in place profile (landmark info) and in the top status bar according to bug reporter's request. Technical details: Actually implementation of strftime() in Linux and Windows supports stripping the leading zero (with "%-d" and "%#d" respectively). But that's not supported in MacOSX, so I had to reimplement it. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/842/ --HG-- branch : product-engine
2010-08-05EXT-8553 FIXED Substituted "Object Profile" menu item label by "Item ↵Andrew Dyukov
Profile" in My Outfits. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/836/ --HG-- branch : product-engine
2010-08-05Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-05merge from PE's viewer-releaseTofu Linden
2010-08-04merge the fix of SNOW-793: memory leak in LLImageFormatted::appendDataXiaohong Bao
2010-08-04CT-575 WIP FR translation for set16 for Viewer 2.1.1Eli Linden
2010-08-04mergeBrad Payne (Vir Linden)
2010-08-04EXT-8283 FIX, EXT-8360 FIX - original fixes got broken, presumably during ↵Brad Payne (Vir Linden)
some merge
2010-08-04MergeEli Linden
2010-08-04CT-575 WIP PT translation for set16 for Viewer 2.1.1Eli Linden
2010-08-04EXT-7511 FIXED Fixed item selection cropping in Edit OutfitAndrew Dyukov
Restored changeset which was lost after merge 58571b4e704b. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/780/ --HG-- branch : product-engine
2010-08-04Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-08-04Propagate version bump to 2.1.1Christian Goetze (CG)
2010-08-04more fix for EXT-7397: decoding textures get stuck in REQ statusXiaohong Bao
2010-08-04automated mergeLoren Shih
2010-08-04EXT-8550 DONE Rewrite "You [ACTION] a [RESOLUTION] baked texture for ↵Loren Shih
'[BODYREGION]' after [TIME] seconds." for localization Split this into two messages to take out ACTION as requested.
2010-08-04EXT-8524 FIXED Non-ASCII character corruption in date.Vadim Savchuk
Convert formatted date from system charset to UTF-8 on Windows (other OSes don't require this). See http://jira.secondlife.com/browse/EXT-8318 for more details. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/834/ --HG-- branch : product-engine
2010-08-04EXT-8548 FIXED Login screen contains invisible field which blocks ↵Tofu Linden
keyboard-only login The panel_layout itself was taking focus by default (hmm).
2010-08-04MergeAimee Linden
2010-08-04DEV-52379 FIXED (Supplementary to my supplementary) Fix Linux build breakage ↵Aimee Linden
... oopsie.
2010-08-04MergeAimee Linden
2010-08-04DEV-52379 FIXED (Supplementary) Viewer is not successfully caching object ↵Aimee Linden
geometry Encapsulated building of the cache filename into a help function to prevent code duplication. Reviewed by Tofu.
2010-08-04merge from PE's viewer-releaseTofu Linden
2010-08-04EXT-8284 FIXED ('Add More' panel items aren't sorted by clothing type after ↵Paul Guslisty
it was opened by 'Replace' item of context menu) Restored from BAD MERGE at 5b5cc4a8642d Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/750/ --HG-- branch : product-engine
2010-08-03Update version to 2.1.1Kent Quirk
2010-08-03Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-08-03fix for EXT-7399: 2.0.2 with http textures loads textures slower than 1.23.5Xiaohong Bao
and EXT-7397: decoding textures get stuck in REQ status
2010-08-03CT-575 WIP DE JA ES translation for set16 for Viewer 2.1.1Eli Linden
2010-08-03EXT-8534 FIXED Fixed the 'Wear' in My Outfits being disabled for outfits ↵Vadim Savchuk
consisting of body parts only. Changed the condition to enable the "Wear" button in My Outfits and the corresponding item in the outfit context menu. They now get enabled for any outfit that isn't the base outfit and contains non-worn wearables. By the way, did a minor cleanup: moved an LLAgentWearables.isCOFChangeInProgress() call to LLAppearanceMgr::getCanAddToCOF() to avoid code duplication. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/832/ --HG-- branch : product-engine
2010-08-03CT-575 FIX linguistic work from q/viewer-release lost in ↵Eli Linden
dessie/viewer-release. Re-comitting.
2010-08-03Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-03merge from PE's viewer-releaseTofu Linden
2010-08-02Pulled from "dessie/viewer-release"Christian Goetze (CG)
2010-08-02Redo the same merge as in changeset "2026f824953f", but this time with ↵Christian Goetze (CG)
feeeeling.
2010-08-02CT-575 WIP FR PT linguisticEli Linden
2010-08-02EXT-6542 Localized the "none/none" in the About land floater.Vadim Savchuk
This is an additional fix to the one made in rev. 6788ff579917. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/828/ --HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 17:51:45 +0000