summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-04merge from PE's viewer-trunkTofu Linden
2010-08-04merge from viewer-releaseTofu Linden
2010-08-04merge from PE's viewer-releaseTofu Linden
2010-08-04EXT-8424 FIXED ([HARD CODED] ALL LANGS: \"More\" menu option is untranslated ↵Paul Guslisty
under Advanced menu (French viewer) > Shortcuts) Set translated label from strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/831/ --HG-- branch : product-engine
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-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-03Pulled build.sh change from viewer-releaseChristian Goetze (CG)
2010-08-03Pulled build.sh change from viewer-releaseChristian Goetze (CG)
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-03fix for unit test assertsRichard Linden
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 default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-03merge from PE's viewer-trunkTofu Linden
2010-08-03merge from viewer-releaseTofu Linden
2010-08-03merge from PE's viewer-releaseTofu Linden
2010-08-02Pulled from "dessie/viewer-release"Christian Goetze (CG)
2010-08-02merge from dessie/viewer-releaseRichard Nelson
2010-08-02EXT-8545 FIX Button art and other images are positioned incorrectly when UI ↵Richard Nelson
scale != 1.0
2010-08-02Eliminate the bad merge at "2026f824953f"Christian Goetze (CG)
2010-08-02Redo the same merge as in changeset "2026f824953f", but this time with ↵Christian Goetze (CG)
feeeeling.
2010-08-02Fix the reversion imported from viewer-hotfix via: "hg pull -r 1c95812ba38b ↵Christian Goetze (CG)
../viewer-public" - reviewed by richard
2010-08-02EXT-8540 - Implement mime type override for web_browser ctrlRichard Nelson
reviewed by Monroe
2010-08-02Fixed build (unit tests linking errors).Sergei Litovchuk
--HG-- branch : product-engine
2010-08-02CT-575 WIP FR PT linguisticEli Linden
2010-08-02EXT-7676 FIXED Restored fix (47df1b3fd94e) reverted in merge 5b5cc4a8642d ↵Sergei Litovchuk
with slight modifications. - Replaced pointers passed to 'Add More' gear menu with LLHandle. - Removed storing 'Add More' panel sort order from settings because the order is changed each time the panel opens. - Replaced creating items comparator in LLPanelOutfitEdit::postBuild() with a static comparator in llwearableitemslist.cpp. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/826/. --HG-- branch : product-engine
2010-08-02EXT-5609 FIXED Avoided showing script floater undocked if it was created in ↵Andrew Dyukov
mouselook mode. Commiting on behalf of Alex Productengine. - Added check if floater is constructed in mouselook mode and added forcing dock state when floater is shown after constructing in mouselook mode. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/830/ --HG-- branch : product-engine
2010-08-02Manual merge from default branch. Resolved conflicts in ↵Vadim Savchuk
indra/newview/llfloatercamera.cpp. --HG-- branch : product-engine
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
2010-08-02Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-30Merge.Kent Quirk
2010-07-30fixed windows buildRichard Nelson
2010-07-30mergeRichard Nelson
2010-07-30optimizations in button renderingRichard Nelson
2010-07-30Automated merge with ssh://richard@hg.lindenlab.com/dessie/viewer-publicRick Pasetto
2010-07-30fix for macRick Pasetto
2010-07-30Fix mac build.Monroe Linden
2010-07-30fix for mac buildRick Pasetto
2010-07-30Fix for EXT-8533Monroe Linden
When sending the MIME type probe, tell LLCurl to allow cookies in the response. This works around an issue with some sites that will get into an infinite redirect loop when cookies are disabled.
2010-07-30Upgraded NVIDIA 120 and 220 to class 1. They're performing too well.Palmer
2010-07-30fixed windows buildRichard Nelson
2010-07-30mergeRichard Nelson
2010-07-30further UI rendering performance improvementsRichard Nelson
2010-07-30Fix for EXT-8339Monroe Linden
Added a couple of new nav states to LLViewerMediaImpl: MEDIANAVSTATE_FIRST_LOCATION_CHANGED_SPURIOUS and MEDIANAVSTATE_COMPLETE_BEFORE_LOCATION_CHANGED_SPURIOUS. These behave just like the corresponding states without the _SPURIOUS suffix, but will be used if the new navigate doesn't change the current URL of the impl. This allows us to catch cases like the repro of this issue and discard the spurious navigate events.
2010-07-30fix for DEV-52379 (viewer is not successfully caching object goemetry)Andrew Meadows
There was a typo between the files saved and those loaded. saved in sobjects_gridx_gridy.slc bload loaded from objects_gridx_gridy.slc Q will review later ;-)
2010-07-30remove useless assert and its temp variable that broke the build.Kent Quirk
2010-07-30mergeRichard Nelson
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson