summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-03-10back out STORM-2011 due to conflictOz Linden
2014-03-06merge changes for storm-2010Oz Linden
2014-03-06merge changes for storm-68Oz Linden
2014-03-06STORM-68 mergeJonathan Yap
2014-03-06STORM-68 Adjusted Build->Options menuJonathan Yap
2014-03-06merge changes for storm-2008Oz Linden
2014-03-06merge changes for codesign workaroundOz Linden
2014-03-06merge changes for 3.7.2-releaseOz Linden
2014-03-04merge changes for storm-2015Oz Linden
2014-03-03merge changes for codesign workaroundOz Linden
2014-03-03merge changes for 3.7.2-releaseOz Linden
2014-03-03merge changes for 3.7.2-releaseOz Linden
2014-03-03merge changes for storm-2008Oz Linden
2014-03-03merge changes for open-203Oz Linden
2014-02-26Merged lindenlab/viewer-release into defaultJames Johnson
2014-02-24increment viewer version to 3.7.3Oz Linden
2014-02-24STORM-2015 Region restart sound alerts from all users on a STORM-1980 ↵Jonathan Yap
enabled viewer play inworld - should be local only.
2014-02-21changed variable names and errors to more accurately reflect the operation ↵JJ Linden
being performed
2014-02-19duplicated the workaround added for darwin codesigning onto the windos ↵JJ Linden
codesigning
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-14OPEN-203 dummy commit to satisfy mercurialDrake Arconis
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-01-31merge workaround for Mac codesign errors in build farmOz Linden
2014-01-31merge changes for storm-2011Oz Linden
2014-01-30fix odd editor artifactOz Linden
2014-01-30Another build triggerMonty Brandenberg
2014-01-29FITMESH-6: correct bounds checkingOz Linden
2014-01-29STORM-2010: fix to AutoAcceptNewInventoryOz Linden
2014-01-29another trigger editMonty Brandenberg
2014-01-28STORM-2011: Group member lists not loading properlyAnsariel
2014-01-27Trivial edit to stimulate a new build.Monty Brandenberg
2014-01-24merge fix to the codesign fixOz Linden
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 codesign failuresOz Linden
2014-01-24merge workaround for build farm Mac code signing failuresOz Linden
2014-01-24merge changes for MAINT-3187Oz Linden
2014-01-23FITMESH-6, FITMESH-20 Fix for some objects disappearing when hardware ↵Dave Parks
skinning enabled and ALM disabled.
2014-01-23correct coding style problems, add contribution creditOz Linden
2014-01-23merge changes for 3.6.13-releaseOz Linden
2014-01-22merge changes for storm-1972Oz Linden
2014-01-22add retries around OSX codesign to try to work around frequent build farm ↵Oz Linden
failures
2014-01-21MAINT-3187: Name list controls do not properly resolve avatar namesAnsariel
2014-01-18Fixed: BUG-4413LanceCorrimal
2014-01-09Merge. Refresh from viewer-release after 3.6.13 release.Monty Brandenberg
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-08merge changes for 3.6.13-releaseOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 17:48:38 +0000