summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-11-13Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-13merge changes for DRTVWR-238Oz Linden
2012-11-13merge changes for DRTVWR-209Oz Linden
2012-11-09pull back 3.4.2-beta3 fixesOz Linden
2012-11-08MAINT-1228, MAINT-1668: Deleting code that had been originally deleted to ↵William Todd Stinson
fix these issues, but then was accidentally re-introduced during a bad merge.
2012-11-08merge changes for DRTVWR-240Oz Linden
2012-11-08merge up to viewer-developmentOz Linden
2012-11-07INTL-46 massive Chinese translation update for set28--set34, including new fileseli
2012-11-07sync with viewer-development (for 1 DE file)eli
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
Two fairly simple conflicts: dead stats sending code in the texture fetch code (new llcorehttp library) and the cleanup code in llappviewer was moved around in 3.4.x.
2012-11-07merge changes for 3.4.2-beta2Oz Linden
2012-11-06Simple change to force a new codeticket number.William Todd Stinson
2012-11-06Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-06Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-06merge changes for DRTVWR-223Oz Linden
2012-11-06merge changes for DRTVWR-208Oz Linden
2012-11-06pull back changes from 3.4.2-beta1Oz Linden
2012-11-05pull back DRTVWR-217 and tag for 3.4.2-beta1Oz Linden
2012-11-05merge changes for DRTVWR-217Oz Linden
2012-11-05increment version to 3.4.3Oz Linden
2012-11-05merge up to latest viewer-developmentOz Linden
2012-11-02merge back fixes from 3.4.1-beta12Oz Linden
2012-11-01NORSPEC-8: Adding ability to parse GET data over multiple frames to avoid ↵William Todd Stinson
viewer timeout and crash on regions with large numbers of materials.
2012-11-01Converting request logic over to both send and received zipped binary data ↵William Todd Stinson
from the materials cap service.
2012-11-01Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-01Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-10-31MAINT-646 Fix for leak introduced by optimizations.Dave Parks
2012-10-30pull back changes from 3.4.1-beta11Oz Linden
2012-10-30merge changes for DRTVWR-236Oz Linden
2012-10-30merge changes for DRTVWR-235Oz Linden
2012-10-26MAINT-1709 Fix for >> that should have been > >Dave Parks
2012-10-25MergeKelly Washington
2012-10-24pull back changes (enable tcmalloc) from 3.4.1-beta10Oz Linden
2012-10-24disable tcmalloc againOz Linden
2012-10-22LLDrawable::destroy: Illegal deletion of LLDrawable!Nicky
2012-10-23correct faulty mergeOz Linden
2012-10-22Enable tcmallocDave Parks
2012-10-22Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-10-22Trying original version of GBP with new scripts/code- revert corresponding ↵callum_linden
cpp code
2012-10-20Removing build.sh darwin symbols hack. Adding '-g' to both CFLAGS and ↵Don Kjer
CXXFLAG to have cmake generation debug symbols in xcode.
2012-10-20Adding expanded searching for symbols during google breakpad symbol scanDon Kjer
2012-10-19merge back late fix for MAINT-1753Oz Linden
2012-10-19merge changes for DRTVWR-233Oz Linden
2012-10-19pull back changes from 3.4.1-beta9Oz Linden
2012-10-18MAINT-1753: Correcting behavior of ll_aligned_realloc_16() on Linux to avoid ↵William Todd Stinson
memory corruption in the case that the new memory size requested is smaller than the old memory size. Also, adding check to ensure that the aligned malloc returns a non-null value before memcopying.
2012-10-18Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development.William Todd Stinson
2012-10-18Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-10-18Removing -g flag from mac buildsDon Kjer
2012-10-17Adding '-g' to mac buildsDon Kjer
2012-10-17MAINT-1527 Fix for crash on exit when VBO disabledDave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 19:15:12 +0000