Shyotl
|
550fa0a160
|
Merge branch 'future' of https://github.com/AlericInglewood/SingularityViewer.git into V2Mesh
Conflicts:
indra/newview/llspatialpartition.cpp
|
2011-08-05 19:40:35 -05:00 |
|
Shyotl
|
b75a28ec15
|
Cleanup. Applied http://hg.secondlife.com/mesh-development/changeset/3031f266784a
|
2011-08-05 01:18:27 -05:00 |
|
Siana Gearz
|
6cfaecf972
|
GCC buildfixes
|
2011-08-01 20:42:06 +02:00 |
|
Shyotl
|
b258b71e07
|
Flipped the MESH_ENABLED switch. Added missing components and updated stuff to be closer to mesh-development head.
|
2011-07-30 20:30:07 -05:00 |
|
Shyotl
|
1e92e734d8
|
Bulk of mesh. Excluded via #if MESH_ENABLED. LLModel still needs updated for strided vbos, Collada SDK needs to be wrangled, and misc pieces need to be found and brought over. Skipping inventory stuff until meshes are at least displayable.
|
2011-07-23 03:26:30 -05:00 |
|