summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-09-20reapply b895285ab0de: MAINT-646 Don't spend so much time fetching avatar ↵Dave Parks
physics params.
2012-09-20reapply 0f20bb7cb9ee: MAINT-1147 Don't rebuild volume meshes on region crossing.Dave Parks
2012-09-20reapply efcec3eb374f: MAINT-646 Factor std::vector out of lloctreeDave Parks
2012-09-20reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctreeDave Parks
2012-09-20reapply 15b05dc53770: MAINT-646 Profile based optimization -- add a lookup ↵Dave Parks
map for joints to remove hotspot in LLJoint::findJoint
2012-09-20reapply 230c111ab816: Add some timers.Dave Parks
2012-09-20reapply 4f8ca653a394: Fix for linux build.Dave Parks
2012-09-20reapply 38b7779af5f9: MAINT-646 Faster traversal of render batch lists.Dave Parks
2012-09-20Added tag 3.4.1-beta1 for changeset 5adb2b8f96c3Oz Linden
2012-09-19pull back beta7 hotfix merge and new 3.4.0-release tagOz Linden
2012-09-19Added tag 3.4.0-release for changeset 97977c67245fOz Linden
2012-09-19merge beta7 pathfinding hotfixesOz Linden
2012-09-18SWAT-711: Create Mac app bundle symlinks only for .dylib files that exist.Nat Goodspeed
Previous viewer_manifest.py unconditionally created Mac symlinks for all expected .dylib files. Recent change to revert to statically linking llcommon means we no longer build libllcommon.dylib, therefore we no longer copy it, therefore any symlink to that library will be broken by definition. Change to create symlinks for .dylib files that were successfully copied.
2012-09-17pull back fixes from 3.4.0-beta7Oz Linden
2012-09-14Added tag 3.4.0-beta7 for changeset 733ceac77583William Todd Stinson
2012-09-14tag merge of DRTVWR-215William Todd Stinson
2012-09-14Added tag 3.4.1-beta1 for changeset baa627938dbbOz Linden
2012-09-14merge fixes for alignment testOz Linden
2012-09-13Port over Simon's fix for alignment testDave Parks
2012-09-13MAINT-1561: BUGFIX Another target omega fix for an issue detected with a ↵William Todd Stinson
clock pendulum.
2012-09-12MAINT-1456,MAINT-1519,PATH-879: BUGFIX Correcting behavior for objects moved ↵William Todd Stinson
by scripts so that the drawable is properly updated with the updated location.
2012-09-12re-merge changes to disable tcmallocOz Linden
2012-09-12merge increment of version numberOz Linden
2012-09-12increment version to 3.4.2Oz Linden
2012-09-12Added tag 3.4.0-release for changeset d02759655d6bOz Linden
2012-09-12Automated merge with http://bitbucket.org/oz_linden/viewer-beta-notcmallocDave Parks
2012-09-12MAINT-1503 Minimal set of changes needed to safely disable tcmallocDave Parks
2012-09-12Fixing merge conflicts related to restoring DRTVWR-167 changesBrad Payne (Vir Linden)
2012-09-12initial attempt to restore changes that make removing tcmalloc possible; not ↵Oz Linden
tested
2012-09-11Resync steam/xui/*/strings.xml with default/xui/*/strings.xml.Nat Goodspeed
The steam/xui/*/strings.xml files are intended only to override a single string (create_account_url). But until the strings.xml C++ code supports fallback to the default skin, we must manually keep them synchronized except for that one string.
2012-09-11Merge up to http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-09-11Added tag 3.3.4-beta6 for changeset 62b07aa81b19Oz Linden
2012-09-11merge changes for DRTVWR-213Oz Linden
2012-09-11tag merge of DRTVWR-213Oz Linden
2012-09-11merge changes for DRTVWR-212Oz Linden
2012-09-11tag merge of DRTVWR-212Oz Linden
2012-09-10Fixed line endings from DOS to UNIX.Baker Linden
2012-09-10FIX INTL-104 Translation of Set34 in 8 languages, including Steam contenteli
2012-09-10FIX INTL-106 French linguistic fixeseli
2012-09-10inconsequential change to force new buildOz Linden
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-08DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
cmake and other files didn't get moved over, do it by hand.
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
Cmake files not merged correctly and had to be done by hand. New memory allocation made some memory usage tests in the llcorehttp integration tests no longer valid. Would like to work on LLLog sometime and get it to be consistent. Special flags needed for windows build of example program.
2012-09-07DRTVWR-209 Additional merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
Restore original deleteRequest/removeRequest implementation removing a small race. Remove a short-lived additional timeout scheme on requests which really isn't appropriate as originally implemented as we can have very long-lived requests on big regions.
2012-09-07Automated merge with file:///Users/nat/linden/davep-viewer-development-rebasedNat Goodspeed
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
This was yet another refresh from v-d because of significant changes to lltexturefetch that would not have been resolvable by casual application of any merge tool. There are still a few questions outstanding but this is the initial, optimistic merge.
2012-09-07MAINT-1491 Fix for L&S never being enabled by default on XP/Linux/OS XDave Parks
2012-09-06Automated merge with file:///Users/nat/linden/davep-viewer-development-rebasedNat Goodspeed
2012-09-06Do the proper fix this time...Baker Linden
2012-09-06Added explicit casting for Linux build, hopefully making it work.Baker Linden