Commit Graph

30114 Commits (9185f1e25602bb9bc4c2bf7923f2743effa281fa)

Author SHA1 Message Date
Oz Linden 9185f1e256 merge changes for storm-2008 2014-03-06 08:30:47 -05:00
Oz Linden 1040c5fdda merge changes for codesign workaround 2014-03-06 08:30:23 -05:00
Oz Linden a40c6faf2e merge changes for 3.7.2-release 2014-03-06 08:29:55 -05:00
Oz Linden ef794e7ffc merge changes for storm-2015 2014-03-04 11:55:42 -05:00
Oz Linden 55ceeae752 merge changes for storm-2008 2014-03-03 15:29:32 -05:00
Oz Linden dfbc6c65f6 merge changes for open-203 2014-03-03 15:08:20 -05:00
James Johnson 556506278a Merged lindenlab/viewer-release into default 2014-02-26 10:16:07 -08:00
Oz Linden de8fea1362 increment viewer version to 3.7.3 2014-02-24 14:50:35 -05:00
Oz Linden 7910c686ca Added tag 3.7.2-release for changeset b842534cb4d7 2014-02-24 14:50:35 -05:00
Jonathan Yap 199e65a6c5 STORM-2015 Region restart sound alerts from all users on a STORM-1980 enabled viewer play inworld - should be local only. 2014-02-24 10:57:53 -05:00
JJ Linden 0abdab7848 changed variable names and errors to more accurately reflect the operation being performed 2014-02-21 11:59:17 -08:00
JJ Linden 251bf8ceca duplicated the workaround added for darwin codesigning onto the windos codesigning 2014-02-19 14:40:27 -08:00
Monty Brandenberg acb265a394 Merge. Refresh from viewer-release after 3.7.1 release. 2014-02-14 18:49:33 -05:00
Oz Linden ce7e19d33a increment viewer version to 3.7.2 2014-02-14 16:00:45 -05:00
Oz Linden cb9e53414d Added tag 3.7.1-release for changeset dcb4981ce255 2014-02-14 16:00:45 -05:00
Drake Arconis 254728e00d OPEN-203 dummy commit to satisfy mercurial 2014-02-14 12:21:07 -05:00
Monty Brandenberg 7443819560 Merge. Refresh from viewer-release after 3.7.0 release 2014-02-11 13:41:31 -05:00
Cho 8d0f7fe571 Hack to fix ACME-1317 2014-02-11 00:09:59 +00:00
Oz Linden 413be91cf5 increment viewer version to 3.7.1 2014-02-10 16:00:37 -05:00
Oz Linden b236cdbe8c Added tag 3.7.0-release for changeset 5d746de933a9 2014-02-10 16:00:37 -05:00
Oz Linden 8312517857 merge changes for storm-2011 2014-01-31 16:21:50 -05:00
Oz Linden 9bb2bc6099 fix odd editor artifact 2014-01-30 14:18:58 -05:00
Monty Brandenberg 80ee8a8ca3 Another build trigger 2014-01-30 13:17:17 -05:00
Oz Linden 32880362fe merge fixes for recording the packages installed in the build 2014-01-29 18:36:01 -05:00
Oz Linden 7b1e1e4e35 FITMESH-6: correct bounds checking 2014-01-29 18:25:03 -05:00
Monty Brandenberg 636953b7d7 another trigger edit 2014-01-29 16:27:59 -05:00
Ansariel 86676ec34b STORM-2011: Group member lists not loading properly 2014-01-28 19:45:50 +01:00
Monty Brandenberg dae8c4158a Trivial edit to stimulate a new build. 2014-01-27 16:21:56 -05:00
Oz Linden 03d0d46e6f merge fix to the codesign fix 2014-01-24 16:57:55 -05:00
Oz Linden cabd5867b7 merge fix to the codesign fix 2014-01-24 16:41:16 -05:00
Oz Linden e6de3616c7 merge fix to the codesign fix 2014-01-24 16:39:52 -05:00
Oz Linden cec62b7872 fix error message python boo-boo 2014-01-24 16:39:00 -05:00
Oz Linden e3b449e396 merge workaround for build farm Mac codesign failures 2014-01-24 15:58:52 -05:00
Oz Linden eb6bfb9aca merge workaround for build farm Mac code signing failures 2014-01-24 15:06:33 -05:00
Oz Linden d8cc2476b3 merge changes for MAINT-3187 2014-01-24 15:00:52 -05:00
Dave Parks 476e317c8b FITMESH-6, FITMESH-20 Fix for some objects disappearing when hardware skinning enabled and ALM disabled. 2014-01-23 17:55:03 -06:00
Oz Linden b2cc4feed2 correct coding style problems, add contribution credit 2014-01-23 13:41:52 -05:00
Oz Linden b45effe6da merge changes for OSX signature fix 2014-01-23 13:23:00 -05:00
Oz Linden c241bb2af8 merge changes for storm-1972 2014-01-22 17:14:13 -05:00
Oz Linden cdec438683 add retries around OSX codesign to try to work around frequent build farm failures 2014-01-22 16:44:34 -05:00
Oz Linden 6c28e65b12 record installed packages for each build 2014-01-22 11:12:22 -05:00
Ansariel 316bf51482 MAINT-3187: Name list controls do not properly resolve avatar names 2014-01-21 15:11:10 +01:00
LanceCorrimal 2af19a91d5 Fixed: BUG-4413 2014-01-18 17:28:34 +01:00
Monty Brandenberg 883c0773f3 Merge. Refresh from viewer-release after 3.6.13 release. 2014-01-09 15:26:02 -05:00
Monty Brandenberg b2fe32e572 SH-4667 HTTP Viewer reports network error instead of a misnamed joint on 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-09 15:18:54 -05:00
Oz Linden f1bb5c5ada merge changes for 3.6.13-release 2014-01-08 18:47:21 -05:00
Oz Linden d8a81b240e increment viewer version to 3.6.14 2014-01-08 18:46:23 -05:00
Oz Linden 19a41cc243 Added tag 3.6.13-release for changeset 0d9b9e50f1a8 2014-01-08 18:45:48 -05:00
Oz Linden fcac9fdadd merge changes for Snowstorm fall contributions 2014-01-07 15:15:59 -05:00
Oz Linden a25bcb8523 merge changes for storm-1980 2014-01-07 13:44:22 -05:00