Commit Graph

25101 Commits (8db983fb8095f25873b8317fd1f4764abce4a31b)

Author SHA1 Message Date
Dave Parks 8db983fb80 MAINT-1270 Fix for flexi prims showing up as discs when first loading.
Reviewed by Stinson.
2012-11-20 16:50:23 -06:00
Dave Parks f5b4a0af64 MAINT-1841 Fix for mac/linux build 2012-11-19 18:30:13 -06:00
Dave Parks 7709b76469 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2012-11-19 17:41:30 -06:00
Dave Parks 7491fbd677 MAINT-1841 Use NVAPI to force NVIDIA GPU power management mode to prefer max performance
Reviewed by Simon.
2012-11-19 17:40:43 -06:00
Kelly Washington ace013d26c MAINT-1942 Increase maximum animation length from 30 seconds to 60 seconds
reviewed with Simon
2012-11-16 16:22:17 -08:00
Maestro Linden a567c425ca MAINT-536 MAINT-1913 Added missing URL scheme filtering to the Linux viewer, changed URL scheme whitelist. Reviewed by Callum. 2012-11-14 02:24:58 +00:00
Dave Parks a1d60fc219 MAINT-1311 Thread safe handling of retries on mesh loading failures. 2012-11-09 14:43:25 -06:00
Dave Parks ccad8c9411 Automated merge with http://bitbucket.org/lindenlab/viewer-lion 2012-11-08 14:23:34 -06:00
Dave Parks 460002b134 MAINT-1311 Followup on logging and assertions of mesh loading errors 2012-11-08 13:54:28 -06:00
Dave Parks c431ddf629 Automated merge with http://bitbucket.org/lindenlab/viewer-development 2012-11-08 13:05:29 -06:00
Oz Linden b76b81ff81 merge changes for DRTVWR-240 2012-11-08 11:47:29 -05:00
Oz Linden 7af15aaa5e tag merge of DRTVWR-240 2012-11-08 11:47:23 -05:00
eli 18175874bf INTL-46 massive Chinese translation update for set28--set34, including new files 2012-11-07 14:31:03 -08:00
eli b51401e26c sync with viewer-development (for 1 DE file) 2012-11-07 14:29:59 -08:00
Oz Linden fc3d27bef6 merge changes for 3.4.2-beta2 2012-11-07 12:59:37 -05: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 d35c4f4c9d merge changes for DRTVWR-223 2012-11-06 14:54:27 -05:00
Oz Linden ca76f9aaf8 tag merge of DRTVWR-223 2012-11-06 14:51:04 -05:00
Oz Linden 18002a54be merge changes for DRTVWR-208 2012-11-06 14:47:32 -05:00
Oz Linden 19658c71f7 tag merge of DRTVWR-208 2012-11-06 14:47:27 -05:00
Oz Linden bf6d167075 pull back DRTVWR-217 and tag for 3.4.2-beta1 2012-11-05 17:20:42 -05: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 5f4d1d8046 increment version to 3.4.3 2012-11-05 14:54:50 -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
simon@Simon-PC.lindenlab.com 2126cdb9a2 MAINT-1560 : Make Slow Motion Animations affect all avatars. Added new menu.
Reviewed by Kelly
2012-10-31 15:05:52 -07: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
simon@Simon-PC.lindenlab.com 58a73b4fc1 MAINT-1791 : Parcel media clear list crash. Reviewed by Kelly 2012-10-29 13:10:37 -07:00
Dave Parks b8e14ad2b2 MAINT-1709 Fix for >> that should have been > > 2012-10-26 15:55:58 -05:00
Dave Parks 7f639cb715 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2012-10-26 11:17:36 -05:00
Dave Parks 002634a41b MAINT-1311 Add some logging and assertions to help track down mesh loading errors. 2012-10-26 11:17:06 -05:00
Kelly Washington 0cdff2817b Merge 2012-10-25 16:13:39 -07:00
Kelly Washington b014d949d7 MAINT-1275 [SECURITY] Web session tokens saved in SecondLife.log
reviewed with Simon
2012-10-25 10:53:58 -07:00