summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-08-18mergeBrad Payne (Vir Linden)
2011-08-18mergeRichard Nelson
2011-08-18Automated merge with http://hg.secondlife.com/viewer-developmentRichard Nelson
2011-08-18EXP-1107 FIX Crash in LLFastTimer::NamedTimer::accumulateTimingsRichard Nelson
2011-08-18Backed out revision cbc793dcd3db to disable libcurl verbose logging.Logan Dethrow
2011-08-18LLProxy: Renamed a setting to better describe what it controls.Logan Dethrow
2011-08-18SH-1180 Log which nodes are problematic when loading a .dae with mirrored ↵Dave Parks
meshes and report error.
2011-08-18Automated merge with ↵Richard Nelson
bundle:D:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.uw1uld\ssh__richard@hg.lindenlab.com_richard_viewer-experience_njk05b.hg
2011-08-18Remove ShowAdvancedBuilderOptions, now always enabledBrad Payne (Vir Linden)
2011-08-17take the newlines off of the language.txt filesOz Linden
2011-08-17fix for sh-2307: crash at LLImageGL::setCategory(int) line 1890Xiaohong Bao
2011-08-17fix for SH-1069: [REGRESSION] Sometimes bumpmaps load only partiallyXiaohong Bao
2011-08-17fix for SH-1142: HUD objects do not display bumpmaps when Lighting and ↵Xiaohong Bao
Shadows are enabled.
2011-08-17storm-1562: disable multi-threaded curl to prevent crashOz Linden
2011-08-17SH-2217 Fix for large models not getting properly clampled by importer (odd ↵Dave Parks
that server seems to need 240m limit instead of 256m limit)
2011-08-17add proper license headers to files that did not have themOz Linden
2011-08-17EXP-700 FIX SLPlugin(s) takes high CPU%callum
Reviewed by Richard.
2011-08-17mergeDave Parks
2011-08-17SH-2188 Fix for generally bad vertex buffer updates for rigged attachments ↵Dave Parks
and fix for viewer always thinking meshes initially have 8 texture entries.
2011-08-17Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Nelson
2011-08-17add proper copyright and license headersOz Linden
2011-08-17fix files that do not end with a newline (warn-on-failure:copyright because ↵Oz Linden
some have both problems...)
2011-08-17convert tabs to spaces where they are forbiddenOz Linden
2011-08-17correct line endingsOz Linden
2011-08-17merge changes for storm-1546Oz Linden
2011-08-17merge changes for storm-1560Oz Linden
2011-08-17SH-1868 FIXED Support initial user-supplied metric data for uploadPaul ProductEngine
- Added initial value to the combobox
2011-08-17SH-2285 FIXED Add localization capability to mesh uploader stringsPaul ProductEngine
- Added the convex decomposition strings to the strings.xml - Added names to hardcoded strings.
2011-08-17MergePaul ProductEngine
2011-08-17STORM-793 FOLLOWUP Escape ITEM_SLURL in translations.Vadim ProductEngine
2011-08-16FIX INTL-66 translation for set26 and basic set5, for 6 languageseli
2011-08-16fix for tooltips on fast timer debug view not always updatingRichard Linden
2011-08-16merge back late beta fixesOz Linden
2011-08-16fix for SH-2023: Brightness Bump maps don't load when shadows are enabledXiaohong Bao
2011-08-17SH-2171 FIXED New prim weights added to weights detail floater.Seth ProductEngine
- Fixed detecting cross-parcel objects selection. - Various fixes in LLAccountingCostManager. - getSelectedObjectRenderCost() moved from LLFloaterTools to LLObjectSelection where it used to reside. Previous commented out implementation of this method removed.
2011-08-16EXP-1100 WIP Show tooltips when drag and drop operations are not allowedRichard Linden
unblock drag and drop tooltips
2011-08-16EXP-1083 FIX Position of Media control and volume are shifted left with ↵Richard Linden
addition of Mode selector in advanced mode
2011-08-16merging latest mesh-development.Nyx (Neal Orman)
2011-08-16FIX SH-859, SH-1274 - added fix for determining triangle count andNyx (Neal Orman)
performance tested impact of animated textures Also did some cleanup to ensure branch built and ran properly after last merge.
2011-08-16Backed out changeset 694594710de2Logan Dethrow
2011-08-16EXP-1099 FIX Cannot drag item on to empty space in outbox folderRichard Linden
2011-08-16sync with viewer-developmenteli
2011-08-16merge missing changesets for storm-1557Oz Linden
2011-08-16STORM-793 FIXED Disallowed parsing HTTP URLs in llGiveInventory ↵Vadim ProductEngine
notifications (one more case). The fix may look weird because we seem to wrap a SLURL with <nolink>...</nolink> tags. But actually there is no SLURL, there's just an object name. Investigating that goes beyond the bug scope.
2011-08-16MergePaul ProductEngine
2011-08-15Backed out rev 42d5f5df0a6a. Code was apparently needed afterall.Logan Dethrow
2011-08-15SH-2029 FIX - fix for mac build error, hopefullyBrad Payne (Vir Linden)
2011-08-15Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-mergeRichard Nelson
2011-08-15SH-2029 FIX - persist the model name in SLMBrad Payne (Vir Linden)
2011-08-15merge late 3.0.1 beta candidate fixesOz Linden