Commit Graph

24928 Commits (93995ada0561e75efdf3f532cf638fbcb1d2ee69)

Author SHA1 Message Date
William Todd Stinson 93995ada05 MAINT-1894: FIX This *should* fix a crash in the LLVolume::resizePath() method. The callstacks indicated that the std library was throwing a length exception on the std::vector::resize() call. Most likely cause was that the recent changes for flexi-prims were causing the mRenderRes to become negative. And thus, the 1<<mRenderRes calculation was generating a really large value for num_render_sections. 2012-11-12 15:27:56 -08:00
Oz Linden 8a3384adaf Added tag 3.4.2-beta3 for changeset 710785535362 2012-11-09 16:16:03 -05:00
Oz Linden a1270b0ba2 tag merge of DRTVWR-242 2012-11-09 09:25:56 -05:00
William Todd Stinson 45336ca20d MAINT-1228, MAINT-1668: Deleting code that had been originally deleted to fix these issues, but then was accidentally re-introduced during a bad merge. 2012-11-08 17:37:01 -08:00
Oz Linden 42b9001e97 Added tag 3.4.2-beta2 for changeset e664473c16df 2012-11-07 11:33:13 -05:00
Oz Linden 2f7ef7e63e tag merge of DRTVWR-216 2012-11-07 10:28:58 -05:00
William Todd Stinson 6291762bc4 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-06 12:13:45 -08:00
Oz Linden bfd6a0c6b9 Added tag 3.4.2-beta1 for changeset 704bbae7b182 2012-11-05 17:14:19 -05:00
Oz Linden 200f39e6a7 merge changes for DRTVWR-217 2012-11-05 16:27:20 -05:00
Oz Linden 21de2d948c tag merge of DRTVWR-217 2012-11-05 16:26:48 -05:00
Oz Linden 2698c2012a pull back release tag 2012-11-05 14:50:59 -05:00
Oz Linden f8749ec9bd Added tag 3.4.1-release for changeset e59ffd3fe083 2012-11-05 14:46:38 -05:00
Oz Linden 02afdef369 merge back fixes from 3.4.1-beta12 2012-11-02 16:48:56 -04:00
Oz Linden 1f305e8624 Added tag 3.4.1-beta12 for changeset 3f9be82de642 2012-11-02 14:58:18 -04:00
Oz Linden dd55b600e5 whitespace change to force new build number 2012-11-02 14:58:09 -04:00
Oz Linden e00d2c8744 Added tag 3.4.1-beta12 for changeset b6b68f3c2c6d 2012-11-02 14:03:22 -04:00
Oz Linden fcb393f108 Added tag 3.4.1-beta12 for changeset 853a20242639 2012-11-01 20:50:20 -04:00
Oz Linden 6cd60fced2 tag merge of DRTVWR-237 2012-11-01 19:59:01 -04:00
Dave Parks 9ff687218a Automated merge with http://bitbucket.org/lindenlab/viewer-beta 2012-11-01 11:29:03 -05:00
Dave Parks 44a024d2f5 MAINT-646 Fix for leak introduced by optimizations. 2012-10-31 16:00:56 -05:00
Oz Linden 1a872c7bf8 pull back changes from 3.4.1-beta11 2012-10-30 14:34:05 -04:00
Oz Linden e4df3c1ca8 Added tag 3.4.1-beta11 for changeset 18498afcdb83 2012-10-30 14:02:49 -04:00
Oz Linden 31a7a7ac02 merge changes for DRTVWR-236 2012-10-30 13:54:31 -04:00
Oz Linden d6e96021c8 tag merge of DRTVWR-236 2012-10-30 13:54:27 -04:00
Oz Linden 5d20dc4782 merge changes for DRTVWR-235 2012-10-30 10:32:27 -04:00
Oz Linden e680af5e5d tag merge of DRTVWR-235 2012-10-30 10:32:17 -04:00
Dave Parks b8e14ad2b2 MAINT-1709 Fix for >> that should have been > > 2012-10-26 15:55:58 -05:00
Kelly Washington 0cdff2817b Merge 2012-10-25 16:13:39 -07:00
Oz Linden 5db84f89d3 pull back changes (enable tcmalloc) from 3.4.1-beta10 2012-10-24 17:48:12 -04:00
Oz Linden 1743e6a813 Added tag 3.4.1-beta10 for changeset 4e0d84e92132 2012-10-24 14:31:05 -04:00
Oz Linden 4f3395a744 disable tcmalloc again 2012-10-24 13:19:41 -04:00
callum_linden 682d7355fd whitespace change to force new build in TC 2012-10-22 15:51:07 -07:00
Dave Parks 4827b7160b Enable tcmalloc 2012-10-22 14:39:29 -05:00
callum_linden ece80f722e Trying original version of GBP with new scripts/code- revert corresponding cpp code 2012-10-22 11:20:24 -07:00
callum_linden 08b7f100f6 Trying original version of GBP with new scripts/code 2012-10-22 11:03:34 -07:00
Don Kjer 486f80aae6 Removing build.sh darwin symbols hack. Adding '-g' to both CFLAGS and CXXFLAG to have cmake generation debug symbols in xcode. 2012-10-20 19:47:36 +00:00
Don Kjer 73cc2c6a7a Adding expanded searching for symbols during google breakpad symbol scan 2012-10-20 09:46:59 +00:00
Don Kjer 6dee3e638a Trying explicitly turning on debug symbols for all mac configurations 2012-10-19 23:54:41 +00:00
callum_linden e18d97782f Turn off configs and tests for testingg 2012-10-19 16:45:40 -07:00
callum_linden 15cde616b9 Update to BuildParams var 2012-10-19 16:14:11 -07:00
callum_linden 2d7eb08852 Turn off cleaning up post build for testing 2012-10-19 12:13:18 -07:00
Oz Linden 1b0ea26ecb merge back late fix for MAINT-1753 2012-10-19 14:19:22 -04:00
Oz Linden f2a674274f Added tag 3.4.1-beta9 for changeset 637fe8bbee5e 2012-10-19 14:07:05 -04:00
Oz Linden 246d2b9476 merge changes for DRTVWR-233 2012-10-19 14:06:55 -04:00
Oz Linden 04a16d2836 tag merge of DRTVWR-233 2012-10-19 14:06:50 -04:00
Oz Linden 1d3487e2ea pull back changes from 3.4.1-beta9 2012-10-19 13:38:57 -04:00
Oz Linden c8fcb6c798 Added tag 3.4.1-beta9 for changeset 9c4519aa5c70 2012-10-19 11:33:24 -04:00
Oz Linden f71d2a649b tag merge of DRTVWR-231 2012-10-19 10:31:11 -04:00
William Todd Stinson 11017315e6 MAINT-1753: Correcting behavior of ll_aligned_realloc_16() on Linux to avoid 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-18 17:36:57 -07:00
Don Kjer 64912f9e49 Removing GCC_GENERATE_DEBUGGING_SYMBOLS=NO from xcode project 2012-10-18 16:31:24 -07:00