summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-02-26fixed mispelling of generateOutgoingAdHocHashRichard Linden
2014-02-26MAINT-3448 FIX: Timestamps disappear from conversation log after viewer restartRichard Linden
2014-02-24merge with releaseRichard Linden
2014-02-24increment viewer version to 3.7.3Oz Linden
2014-02-19Merge with releaseRichard Linden
2014-02-14Merge. Refresh from viewer-release after 3.7.1 release.Monty Brandenberg
2014-02-14increment viewer version to 3.7.2Oz Linden
2014-02-12add two debug settings: "SceneLoadLowMemoryBound" and "SceneLoadHighMemoryBound"Xiaohong Bao
2014-02-12Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2014-02-12reduce peak memory usage to fix SH-4574: Interesting: viewer crash in ↵Xiaohong Bao
LLJoint::setScale
2014-02-12merge with releaseRichard Linden
2014-02-11Merge. Refresh from viewer-release after 3.7.0 releaseMonty Brandenberg
2014-02-11Hack to fix ACME-1317Cho
2014-02-10increment viewer version to 3.7.1Oz Linden
2014-02-06accidentally left _CrtCheckMemory defined in non-Windows buildsRichard Linden
2014-02-06MergeRichard Linden
2014-02-06added LL_TRACE_ENABLED to allow disabling of lltraceRichard Linden
2014-02-06more fix for a memory crash caused by accessing deleted pointers.Xiaohong Bao
2014-02-05more fix for a non-finite number assertion in llvolumeXiaohong Bao
2014-02-05fix a memory crash caused by accessing deleted pointers.Xiaohong Bao
2014-02-04fix crash at line 2207: llassert(dst->isFinite3()) in llvolume.cppXiaohong Bao
2014-01-31fix some compiling errorsXiaohong Bao
2014-01-31Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2014-01-31fix some flaws for memory corruptionXiaohong Bao
2014-01-30fix for heap corruption crash on shutdownRichard Linden
don't set stopped flag until recorder object has been deleted
2014-01-30fix odd editor artifactOz Linden
2014-01-30Another build triggerMonty Brandenberg
2014-01-29FITMESH-6: correct bounds checkingOz Linden
2014-01-29another trigger editMonty Brandenberg
2014-01-27Trivial edit to stimulate a new build.Monty Brandenberg
2014-01-24merge fix to the codesign fixOz Linden
2014-01-24fix error message python boo-booOz Linden
2014-01-24merge workaround for build farm Mac code signing failuresOz Linden
2014-01-23FITMESH-6, FITMESH-20 Fix for some objects disappearing when hardware ↵Dave Parks
skinning enabled and ALM disabled.
2014-01-22add retries around OSX codesign to try to work around frequent build farm ↵Oz Linden
failures
2014-01-10added some defensive asserts in lltrace to make cases of misuse more obvious ↵Richard Linden
when it crashes
2014-01-09Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2014-01-09fix for SH-4659:crash at LLOcclusionCullingGroup::doOcclusion line 1150Xiaohong Bao
2014-01-09Merge. Refresh from viewer-release after 3.6.13 release.Monty Brandenberg
2014-01-09merge with releaseRichard Linden
2014-01-09MergeRichard Linden
2014-01-09SH-4667 HTTP Viewer reports network error instead of a misnamed joint on ↵Monty Brandenberg
mesh upload Tried to add consistent mesh upload retries in the HTTP work but a combination of bad status choices in the upload service and the one-shot nature of the upload capabilities means that status information can be lost. For now, retain the wonderful manual retry logic. At some future point, we might fix the services or add application-level retry.
2014-01-09fixed unit tests being generated as Windows GUI projects instead of console ↵Richard Linden
projects
2014-01-08merge changes for 3.6.13-releaseOz Linden
2014-01-08increment viewer version to 3.6.14Oz Linden
2014-01-08trivial: convert to unix line endings.Xiaohong Bao
2014-01-07merge changes for Snowstorm fall contributionsOz Linden
2014-01-07merge changes for storm-1980Oz Linden
2014-01-06fix a compiling error for mac and linux.Xiaohong Bao
2014-01-06fix for SH-4656: crash at LLVOCacheEntry::updateParentBoundingInfo() line 510Xiaohong Bao