af142618f9
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-06-23 11:35:14 -07:00
6c5ae7f6ab
Fix for linux build failure, hopefully
2011-06-16 17:00:12 -04:00
8114464a72
merge
2011-06-16 15:58:55 -04:00
6532d5db2d
SH-1166 WIP
2011-06-15 18:38:30 -04:00
47b9f588df
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-15 16:28:12 -06:00
0bb7bcc96c
fix for SH-1788: Assert in texture load when uploading textured mesh model
...
and beyond: fixed the thread-safe and highest texture resolution flaws in the mesh texture uploading flow.
2011-06-15 16:20:33 -06:00
b07f51b4c7
SH-1773 FIX
2011-06-15 16:55:26 -04:00
eb6b75eb90
SH-1796 FIX
2011-06-13 18:46:51 -04:00
66bdc13b44
merge
2011-06-09 19:23:01 -05:00
cf9596c7f9
SH-1804 Make it damn obvious that there are degenerate triangles in the physics shape preview render.
2011-06-09 19:22:46 -05:00
0d5da61313
Added log spam for mesh upload responses
2011-06-09 16:22:13 -07:00
fa4d4469dd
Automated merge with https://bitbucket.org/davep/mesh-asset-deprecation
2011-06-09 17:08:17 -06:00
7322601455
partial fix for SH-1804: viewer crashes when uploading "Messerschmitt KR200.dae"
...
eliminated crashing, but still failed to upload it.
2011-06-09 17:07:51 -06:00
557c9be005
SH-1773 WIP
2011-06-09 12:52:44 -04:00
cb6d4437b4
SH-1773 WIP
2011-06-09 10:31:50 -04:00
73d807bd89
change the color specifier to 'diffuse_color' in the
...
mesh upload blobs
2011-06-08 16:46:29 -07:00
fe67bd7cfa
Automated merge with https://bitbucket.org/davep/mesh-asset-deprecation
2011-06-08 15:27:32 -06:00
776353b4a6
fix for SH-1651 and SH-1652: Viewer Crash in Display:RenderUI when uploading skpfile.dae model with High LOD selected as Physics shape
2011-06-08 15:25:59 -06:00
d9dfa9b870
SH-1777 Fix for "Prim" physics shape type not showing up on meshes with convex decompositions.
2011-06-08 14:31:22 -05:00
f1784209d5
merge
2011-06-07 14:42:54 -05:00
690f18c948
merge
2011-06-07 13:59:40 -05:00
b3fbb12f15
SH-1589 Fix for some meshes showing up in non mesh enabled regions.
2011-06-06 19:12:52 -05:00
c24a5a3fb5
automated merge
2011-06-06 15:35:52 -07: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
bc014c2e9e
automated merge
2011-06-03 14:34:00 -07: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
d78ecc6c28
SH-812 Fix for rigged meshes not showing up as rigged until LoD switch.
2011-06-01 23:54:49 -05:00
0c360c5223
merge changes for storm-1210
2011-05-27 15:33:46 -04: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
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
99bd9bb56b
Automated merge up from viewer-development into mesh-development
2011-05-26 10:42:45 -04: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
d9c1797612
merge
2011-05-25 18:36:51 -04:00
081ba71f96
SH-1492 WIP
2011-05-25 18:36:01 -04:00
354f0e84eb
SH-1537 Make mesh importer use physics shape for bounding hull (again).
2011-05-25 16:09:32 -05:00
9d80bee277
merge
2011-05-25 16:09:46 -04:00
d79468057c
SH-1492 WIP
2011-05-25 16:08:21 -04:00
cb797532c0
Automated merge with http://hg.secondlife.com/mesh-development
2011-05-24 17:37:21 -06:00
f5726a094d
fix for
...
SH-712:Asset error given on upload of duck.dae using High LOD for physics shape - Analyze seems to not complete;
SH-889: Viewer crash when analyzing physics LOD;
SH-890: Viewer crash on Exit after analyzing physics layer which never seems to complete
2011-05-24 17:36:06 -06:00
a8470df2c4
merge
2011-05-24 16:08:36 -04:00
79131e8a48
separating meshes from instances
2011-05-24 16:07:19 -04:00
3f182d2200
SH-1492 WIP
2011-05-23 18:08:21 -04:00
302ec5586d
SH-1492 WIP
2011-05-23 17:21:05 -04:00
0ef1364063
STORM-1275 FIX viewer gets caught in infinite loop for decompstub
...
Fixed setting the initialized flag for the decomposition stub case
(for OS builds) so that the viewer doesn't hang when initializing the stub.
Note that initialized will be set to true even when instance will return NULL.
2011-05-23 16:56:06 -04:00
7b51aa0ba2
Another fix for build failure - unused variable warning
2011-05-23 14:50:18 -04:00
Richard Linden