Commit Graph

24831 Commits (8aadd6c529c1b29cbfe4e2ecf1faa26f0f0f7b3e)

Author SHA1 Message Date
William Todd Stinson 8aadd6c529 Renaming the floater stinson files to be floater debug materials. 2012-10-02 16:59:27 -07:00
William Todd Stinson 79deb8c735 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-09-25 16:51:28 -07:00
Oz Linden cb5a0a5686 pull back 3.4.1-beta1a tag 2012-09-25 13:04:14 -04:00
Oz Linden 52975c7efa pull back 3.4.1-beta1a tag 2012-09-25 12:59:50 -04:00
Oz Linden 55d7310d96 Added tag 3.4.1-beta1a for changeset b3f74858a1c8 2012-09-24 23:42:14 -04:00
Oz Linden 729dd11938 tag merge of DRTVWR-179 2012-09-24 16:12:18 -04:00
Oz Linden f0ac86211f tag merge of DRTVWR-219 2012-09-24 16:08:46 -04:00
William Todd Stinson c6a2ac0489 Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179. 2012-09-20 19:43:54 -07:00
William Todd Stinson 29cdf94e95 Correcting dynamic allocation issues with classes that have aligned data members. 2012-09-20 18:48:15 -07:00
Dave Parks 5ec24ecd69 reapply a577ec5b3e5f: Fix for linux build (skip llhttpclient unit tests that post to google.com) 2012-09-20 10:13:45 -04:00
Dave Parks 7fc702dc49 reapply 04fdf7945708: MAINT-775 Fix for particle index pool corruption on teleport. 2012-09-20 10:00:58 -04:00
simon@Simon-PC.lindenlab.com 60cf43bad9 reapply 51dcb8c70f33: MAINT-442: [PUBLIC]Unable to change parcel restrictions for a scripts-disabled
parcel in a damage-enabled region.  Reviewed by Kelly
2012-09-20 10:00:58 -04:00
simon@Simon-PC.lindenlab.com e756a1523c reapply 72c9af4eec84: MAINT-840 VWR-28604 DEV-2548: [PUBLIC]Object by multiple creators shows creator
as "(unknown)" in Inventory.   Now shows "(unknown / multiple)".  Reviewed by Kelly
2012-09-20 10:00:57 -04:00
Dave Parks b5e71964e5 reapply c77cea5c6e41: MAINT-646 Cleanup some warnings from previous changes. 2012-09-20 10:00:56 -04:00
Dave Parks 683c43c2e0 reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing. 2012-09-20 10:00:55 -04:00
simon@Simon-PC.lindenlab.com 8d3885f3bd reapply 8a625610cd5d: MAINT-1161: non standard sea level not correctly rendered around private islands.
Reviewed by Kelly
2012-09-20 10:00:54 -04:00
Dave Parks b4c8a982fc reapply fde2ac0276e2: MAINT-646 Get rid of a hotspot in LLViewerObjectList::update, fix for error in llpolymorph 2012-09-20 10:00:53 -04:00
Dave Parks 898e58987e reapply b0148737d316: MAINT-646 Optimize LLVolumeImplFlexible::doIdleUpdate() 2012-09-20 10:00:32 -04:00
Dave Parks 6d5381d012 reapply 4a8388c13e56: MAINT-646 Enable /fp:fast in Visual Studio 2012-09-20 09:56:37 -04:00
Dave Parks c2d0531a0e reapply 71673401390a: MAINT-646 Knock out some extraneous performance timers 2012-09-20 09:56:36 -04:00
Dave Parks 55e1557b8a reapply 668dcacd6e76: MAINT-646 Vectorize LLPolyMesh 2012-09-20 09:54:49 -04:00
Dave Parks 28b43b7832 reapply b895285ab0de: MAINT-646 Don't spend so much time fetching avatar physics params. 2012-09-20 09:48:57 -04:00
Dave Parks 6a09bc187c reapply 0f20bb7cb9ee: MAINT-1147 Don't rebuild volume meshes on region crossing. 2012-09-20 09:48:56 -04:00
Dave Parks 4127f3e7fc reapply efcec3eb374f: MAINT-646 Factor std::vector out of lloctree 2012-09-20 09:48:56 -04:00
Dave Parks cf98064700 reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree 2012-09-20 09:48:55 -04:00
Dave Parks f80d16808d reapply 15b05dc53770: MAINT-646 Profile based optimization -- add a lookup map for joints to remove hotspot in LLJoint::findJoint 2012-09-20 09:48:54 -04:00
Dave Parks 9bf49903ed reapply 230c111ab816: Add some timers. 2012-09-20 09:48:53 -04:00
Dave Parks 5c3c556e94 reapply 4f8ca653a394: Fix for linux build. 2012-09-20 09:48:52 -04:00
Dave Parks 1ba00693c7 reapply 38b7779af5f9: MAINT-646 Faster traversal of render batch lists. 2012-09-20 09:48:51 -04:00
Oz Linden 737e61293e Added tag 3.4.1-beta1 for changeset 5adb2b8f96c3 2012-09-20 09:25:35 -04:00
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 ae10e78d97 Added some initial basic decoding of the material value per face. 2012-09-14 17:56:42 -07:00
William Todd Stinson 42a50551b5 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development. 2012-09-14 16:25:54 -07: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 ae127dc01a increment version to 3.4.2 2012-09-12 18:37:11 -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