73bbcfb07b
automated merge
2011-06-06 12:55:21 -07:00
c32b0122ab
Merge
2011-06-03 23:58:58 +00:00
7dbf6ebb74
Automated merge with file:///Users/Leslie/work/mesh-development
2011-06-03 16:52:04 -07:00
ffab1eef57
Mac build fixes.
...
Reviewed by davep.
2011-06-03 16:24:07 -07:00
bc014c2e9e
automated merge
2011-06-03 14:34:00 -07:00
357062a196
Added build params for mesh-asset-deprecation
2011-06-03 19:46:34 +00:00
f4722b3905
merge
2011-06-03 00:15:56 -05:00
b0a04b08f7
SH-1744 Add havok's degenerate triangle check to importer. Highlight degenerate triangles in physics mesh and block upload when degenerate triangles are present.
2011-06-03 00:13:50 -05:00
b77e027fcc
Remove some unused variables.
2011-06-02 23:46:26 -05:00
837dd6e943
merge
2011-06-02 22:59:18 -05:00
de5f93ca52
SH-1732 Add streaming cost calculation for mesh objects.
2011-06-02 22:58:57 -05:00
535842211f
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-02 12:07:14 -06:00
71658a024e
fix for SH-1691: [crashhunters] crash at LLVolumeImplFlexible::doFlexibleUpdate() [secondlife-bin llflexibleobject.cpp]
2011-06-02 12:05:45 -06:00
d4e09e81ca
Linux build fix.
...
Unused local varible removed.
2011-06-02 17:03:51 +03:00
faef58a9b9
SH-1666 Remove "Mesh" stitching type from sculpt combo box.
2011-06-02 01:36:28 -05:00
c8ea9476ad
merge
2011-06-01 23:55:06 -05:00
d78ecc6c28
SH-812 Fix for rigged meshes not showing up as rigged until LoD switch.
2011-06-01 23:54:49 -05:00
6992dbc1e3
SH-1682 Use GL_ARB_map_buffer_range to mitigate impact of mapping larger vertex buffer objects. Limit number of textures per batch to 6 (prevents frame stalls on NVIDIA).
2011-06-01 23:46:04 -05:00
e881ee54d0
Unused variable.
2011-05-31 15:34:05 -05:00
9da4007f85
merge
2011-05-31 14:42:17 -05:00
ece32418e7
SH-1682 Dynamically adjust the number of texture channels to use for indexed texture rendering based on available hardware.
2011-05-31 14:35:59 -05:00
fa76b8992c
SH-1592 FIXED Advanced model uploader needs an IP checkbox like the wizard uploader has
2011-05-30 16:49:43 -04:00
69391625eb
SH-1677 FIXED [REGRESSION] Bulk uploads do not adhere to default permissions
...
no idea how this ever worked before, as the code since 1.23 has been using the wrong keyword ("everyone_mask" instead of "new_everyone_mask"). I suspect something changed on the sim side?
2011-05-30 13:53:49 -04:00
522a28d127
Fix for classic clouds being busted.
2011-05-30 02:22:01 -05:00
504e0a2522
unused variable
2011-05-30 01:53:56 -05:00
89473b2dc3
merge
2011-05-30 01:26:27 -05:00
eca17c8993
SH-1682 Full integration if indexed texture rendering to improve batch size.
2011-05-30 01:25:55 -05:00
57725bd6a1
SH-1682 indexd diffuse fragment shader for deferred rendering
2011-05-29 00:41:28 -05:00
1fd46831f0
SH-1682 Work in progress on using texture indexes to improve batch size (wow, super fast so far)
2011-05-29 00:40:57 -05:00
31e850d048
transplant fix for SH-1467
...
viewer now uses simulatorfeatures to check whether to show
UI elements for mesh or not
2011-05-27 11:50:39 -07:00
8c5fde7ae4
Automated merge up from viewer-development into mesh-development
2011-05-27 09:35:08 -04:00
35c4635dca
merge
2011-05-26 20:37:39 -05:00
53e890f4fd
SH-1359 General octree tune-up -- increase maximum capacity of an octree node and rework requested octree node sizes for minimum triangles per frame and maximum triangles per drawing call.
2011-05-26 20:37:15 -05:00
51bc6c01c1
merge
2011-05-26 18:27:15 -04:00
01c5e12853
SH-1492 WIP
2011-05-26 18:22:14 -04:00
79c0a9bfa9
merge
2011-05-26 13:57:07 -04:00
8b552a25c4
SH-1492 WIP - include face info even if textures not being uploaded
2011-05-26 13:56:12 -04:00
dc9aa56f66
STORM-1283 - merge changes for VWR-25039, VWR-25044, VWR-25052, INTL-46
2011-05-26 11:40:25 -04:00
99bd9bb56b
Automated merge up from viewer-development into mesh-development
2011-05-26 10:42:45 -04:00
a6fa155725
Make avatars use same shadow offset magic as prims.
2011-05-25 19:23:57 -05:00
3a2c3a45aa
Remove unused variable.
2011-05-25 19:23:41 -05:00
9b3a9beb40
merge
2011-05-25 18:45:41 -05:00
3a409e6edc
SH-1603 Replace every occurrence of "WTF" with something more appropriate.
2011-05-25 18:45:21 -05:00
7cf1d0714b
merge
2011-05-25 18:19:00 -05:00
9ef81de6e1
SH-1527 Fix for black alpha objects with lighting and shadows enabled and no lights around.
2011-05-25 18:18:34 -05:00
d9c1797612
merge
2011-05-25 18:36:51 -04:00
081ba71f96
SH-1492 WIP
2011-05-25 18:36:01 -04:00
e3782b5633
SH-1644 Don't default avatar hardware skinning to off on all ATI cards.
2011-05-25 17:21:48 -05:00
354f0e84eb
SH-1537 Make mesh importer use physics shape for bounding hull (again).
2011-05-25 16:09:32 -05:00
dbefd976ed
merge
2011-05-25 15:53:45 -05:00
Roxie Linden