Commit Graph

24543 Commits (6c3ccf5d4e85307d43b4e7251e0693665ebd6fe9)

Author SHA1 Message Date
Oz Linden 6c3ccf5d4e pull back beta7 hotfix merge and new 3.4.0-release tag 2012-09-19 13:53:33 -04:00
Oz Linden 075e55c458 Added tag 3.4.0-release for changeset 97977c67245f 2012-09-19 13:40:53 -04:00
Oz Linden 1a461cf120 merge beta7 pathfinding hotfixes 2012-09-19 13:40:25 -04:00
Oz Linden f44bde8a8f pull back fixes from 3.4.0-beta7 2012-09-17 14:54:35 -04:00
William Todd Stinson 29aace5692 Added tag 3.4.0-beta7 for changeset 733ceac77583 2012-09-14 14:38:56 -07:00
William Todd Stinson 9e166b6291 tag merge of DRTVWR-215 2012-09-14 14:36:28 -07:00
Oz Linden 5374732db2 Added tag 3.4.1-beta1 for changeset baa627938dbb 2012-09-14 12:07:24 -04:00
Oz Linden 688a0b9fc2 merge fixes for alignment test 2012-09-14 08:46:21 -04:00
Dave Parks 8f7bb8f6d5 Port over Simon's fix for alignment test 2012-09-13 20:31:22 -05:00
William Todd Stinson 225a3984cb MAINT-1561: BUGFIX Another target omega fix for an issue detected with a clock pendulum. 2012-09-13 12:22:09 -07:00
Oz Linden 3f71d3b41c re-merge changes to disable tcmalloc 2012-09-12 18:44:30 -04:00
Oz Linden a11cc73736 merge increment of version number 2012-09-12 18:39:42 -04:00
Oz Linden 46a8d67a90 Added tag 3.4.0-release for changeset d02759655d6b 2012-09-12 18:34:11 -04:00
Dave Parks 3a36e3c6a8 Automated merge with http://bitbucket.org/oz_linden/viewer-beta-notcmalloc 2012-09-12 15:45:12 -05:00
Dave Parks 9ec263d2f1 MAINT-1503 Minimal set of changes needed to safely disable tcmalloc 2012-09-12 15:44:36 -05:00
Brad Payne (Vir Linden) d52c1c1c68 Fixing merge conflicts related to restoring DRTVWR-167 changes 2012-09-12 16:37:13 -04:00
Oz Linden 97d969a338 initial attempt to restore changes that make removing tcmalloc possible; not tested 2012-09-12 14:36:37 -04:00
Oz Linden 094dc91d0d Added tag 3.3.4-beta6 for changeset 62b07aa81b19 2012-09-11 11:13:51 -04:00
Oz Linden 1dd256f7a8 merge changes for DRTVWR-213 2012-09-11 10:20:06 -04:00
Oz Linden fbfef6d0c5 tag merge of DRTVWR-213 2012-09-11 10:20:03 -04:00
Oz Linden 5eb6614913 merge changes for DRTVWR-212 2012-09-11 08:47:33 -04:00
Oz Linden 2aadccd308 tag merge of DRTVWR-212 2012-09-11 08:47:31 -04:00
William Todd Stinson a766e26db4 Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository. 2012-09-10 10:37:02 -07:00
Oz Linden 8189b28d22 merge changes for 2012-08-31 16:28:24 -04:00
William Todd Stinson 2efd8c99ef Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-08-31 11:48:37 -07:00
Oz Linden 7f0b247d4b Added tag 3.3.4-release3 for changeset 351eea5f9dc1 2012-08-31 09:01:09 -04:00
Oz Linden 2ba33302f5 tag merge of DRTVWR-207 2012-08-31 08:53:58 -04:00
Oz Linden dab915c1d2 Added tag 3.4.0-beta5 for changeset 573e863be2f2 2012-08-30 17:15:02 -04:00
callum e4230e640a MAINT-1455 FIX Media Texture not visually updated correctly
Reviewed by me. (Bao created)
2012-08-29 11:16:22 -07:00
William Todd Stinson 7d54c71aeb MAINT-1480: Ensuring that the new angular velocity is remembered for later comparison to the previous angular velocity. 2012-08-27 19:26:58 -07:00
Todd Stinson 839799c262 PATH-868: Ensuring that walkability values are reset to a previous value if the empty string is entered. 2012-08-27 16:35:34 -07:00
Todd Stinson fc09a016a0 MAINT-1480: Clearing the angular velocity accummulation when the updated angular velocity is set to zero. 2012-08-27 13:31:07 -07:00
Todd Stinson 3091af7aee Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-08-22 17:40:56 -07:00
Todd Stinson 866c9d0639 PATH-864: Altering the minimum linksets floater size to smaller to allow fitting to 1024 width screens. 2012-08-22 15:49:14 -07:00
Oz Linden fcfc686d9c Added tag 3.4.0-beta4 for changeset 84fb70dfe344 2012-08-22 17:08:49 -04:00
Oz Linden 5c4babf0fd merge changes for DRTVWR-201 2012-08-22 11:12:55 -04:00
Oz Linden 0e4fa75e64 tag merge of DRTVWR-201 2012-08-22 11:12:53 -04:00
Oz Linden e4b553075e merge changes for 2012-08-22 10:51:52 -04:00
Oz Linden 822dc1c580 storm-1906: correct cmake error when using precompiled llphysicsextensions_tpv 2012-08-21 09:30:55 -04:00
Oz Linden e7b378f0f1 Added tag 3.4.0-beta3 for changeset 182a9bf30e81 2012-08-20 15:22:32 -04:00
Oz Linden d381a1a4cf tag merge of DRTVWR-200 2012-08-20 15:22:05 -04:00
Oz Linden 173364ed5d Added tag 3.3.4-release2 for changeset 7c9102fb9988 2012-08-20 10:43:45 -04:00
Oz Linden 36fa95058a tag merge of DRTVWR-199 2012-08-20 10:04:38 -04:00
Todd Stinson 6df52172c1 MAINT-1439: BUGFIX Correcting Kart 1.0 issue with physical objects using angular velocity. 2012-08-17 15:43:13 -07:00
Oz Linden 2d28bc112a Added tag 3.4.0-beta2 for changeset b1dbb1a83f48 2012-08-16 21:28:23 -04:00
Oz Linden a0be18bd2e merge changes for DRTVWR-197 2012-08-16 21:27:50 -04:00
Oz Linden 331a76afaa tag merge of DRTVWR-197 2012-08-16 21:27:31 -04:00
Todd Stinson 2d51298641 PATH-852: Attempting to fix the format of the BMP cursors for linux. 2012-08-16 12:43:41 -07:00
Oz Linden 75a3183ad7 merge changes for DRTVWR-198 2012-08-15 20:13:00 -04:00
Oz Linden d7017add55 tag merge of DRTVWR-198 2012-08-15 20:12:39 -04:00