dfdf6aed23
fix for SH-1765: palm tree model fails to load in viewer
2011-06-07 18:22:09 -06:00
81af06c954
Fix for crash on clicking cancel while a model is still loading.
2011-06-07 00:22:49 -05:00
b90bc83f3d
merge
2011-06-07 00:10:39 -05:00
faf9693be3
Make basehull assert even more forgiving (only error out on 10% over bounds).
2011-06-07 00:10:24 -05:00
edeb1fcc2d
Automated merge with https://bitbucket.org/davep/mesh-asset-deprecation
2011-06-06 23:05:24 -06:00
a3842d9637
fix for SH-588: Uploading a mesh crashes viewer
2011-06-06 23:04:48 -06:00
d58c560e72
merge
2011-06-06 19:28:10 -05:00
a58e70261e
SH-101 Fix for asset when uploading some models.
2011-06-06 19:27:47 -05:00
5cfc4764db
merge
2011-06-06 19:13:08 -05:00
b3fbb12f15
SH-1589 Fix for some meshes showing up in non mesh enabled regions.
2011-06-06 19:12:52 -05:00
c4b7728f0e
merge
2011-06-06 18:20:25 -05:00
aa21ad59aa
Fix for crash when viewing asset with "NoGeometry"
2011-06-06 18:20:07 -05:00
86d6c3f196
automated merge
2011-06-06 15:36:24 -07:00
c24a5a3fb5
automated merge
2011-06-06 15:35:52 -07:00
5f2f532aaa
merge
2011-06-06 17:05:31 -05:00
9793f6c51d
Add "NoGeometry" identifier support to viewer.
2011-06-06 16:54:15 -05:00
325c2b2169
Removed the old mesh asset upload pipeline. Fixed a problem with spamming MissingString MacLocale warnings. Reviewed by Dave
2011-06-06 21:27:29 +00:00
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
Xiaohong Bao