summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-08-19merging in latest mesh-developmentNyx (Neal Orman)
2011-08-19FIX SH-862 SH-1246 SH-1565 SH-1566 Update render cost algorithmNyx (Neal Orman)
render cost algorithm triangle count is now scaled to be more balanced vs texture/particle count. In addition added factors for light-emitting and media texture primitives. Algorithm should be near "final" at this point.
2011-08-19mergeBrad Payne (Vir Linden)
2011-08-19MergeSeth ProductEngine
2011-08-18merging in latest mesh-developmentNyx (Neal Orman)
2011-08-18BUILDFIX SH-1246 fixed a bug in the ARC computations, and texture cost ↵Nyx (Neal Orman)
computations in build tools Minor bug in ARC display computations, where wrong numbers were being used for child prims Feature enhancement to not double-count textures reused within a linkset.
2011-08-18mergeDave Parks
2011-08-18mergeBrad Payne (Vir Linden)
2011-08-18SH-1180 Log which nodes are problematic when loading a .dae with mirrored ↵Dave Parks
meshes and report error.
2011-08-18Remove ShowAdvancedBuilderOptions, now always enabledBrad Payne (Vir Linden)
2011-08-17take the newlines off of the language.txt filesOz 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-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-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-16FIX INTL-66 translation for set26 and basic set5, for 6 languageseli
2011-08-16merge back late beta fixesOz Linden
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-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-16sync with viewer-developmenteli
2011-08-16merge missing changesets for storm-1557Oz Linden
2011-08-16MergePaul ProductEngine
2011-08-15SH-2029 FIX - fix for mac build error, hopefullyBrad Payne (Vir Linden)
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
2011-08-15correct tabs for coding policy conformanceOz Linden
2011-08-15merge changes for storm-1557Oz Linden
2011-08-15mergeBrad Payne (Vir Linden)
2011-08-15EXP-1081 FIX add search auth token as cookie instead of query paramRichard Nelson
fixed search url
2011-08-15EXP-1081 FIX add search auth token as cookie instead of query paramRichard Nelson
moved all parameters other than search query to base64 encoded llsd
2011-08-15MergePaul ProductEngine
2011-08-15SH-2147 Clarify and quiet log spam on mesh LoD unzip failure.Dave Parks
2011-08-15merging latest viewer-mesh into nyx's sidebranchNyx (Neal Orman)
2011-08-15increment viewer version to 3.0.1Oz Linden
2011-08-15merge changes for storm-632Oz Linden
2011-08-15merge changes for VWR-25588Oz Linden
2011-08-12STORM-632 ADDITIONAL_FIX Use non-greedy regexp match to enable multiple ↵Vadim ProductEngine
<nolink>...</nolink> clauses in a single textbox.
2011-08-11EXP-1080 FIX Console gets spammed with VertexShaderEnable messages making ↵Richard Linden
the viewer unusable converted LL_WARNS to LL_WARNS_ONCE
2011-08-11EXP-1079 FIX User is not logged out immediately inworld when selecting to ↵Richard Linden
change modes and restart while logged in used requestQuit instead of forceQuit
2011-08-11merge back late beta fix for storm-1060Oz Linden