summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathanLinden <none@none>2010-10-26 10:31:48 -0700
committerJonathanLinden <none@none>2010-10-26 10:31:48 -0700
commite4a5d16be1719706e96beb21cc23c512b02c7b33 (patch)
tree72a3eb349a2abe8958bf4ec4a5c94021fa4055b7
parent7863674626bcf16ad26f3bb8e77a6ca41998c36b (diff)
Fixed convex hull size incompatibility in mesh assets.
-rw-r--r--indra/llprimitive/llmodel.cpp4
-rw-r--r--indra/newview/app_settings/static_data.db2bin576578 -> 832578 bytes
-rw-r--r--indra/newview/app_settings/static_index.db2bin9894 -> 18020 bytes
3 files changed, 1 insertions, 3 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 7fa72d82e1..e2a33965ea 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -1449,9 +1449,7 @@ LLSD LLModel::writeModel(
{
U32 size = decomp[i].size();
total += size;
- // The valid range of sizes is actually 3-256 verts. We need this to fit into a U8,
- // So we just subtract 1
- hulls[i] = (U8) (size - 1);
+ hulls[i] = (U8) size;
for (U32 j = 0; j < decomp[i].size(); ++j)
{
diff --git a/indra/newview/app_settings/static_data.db2 b/indra/newview/app_settings/static_data.db2
index f85aa81601..052ff9f1e2 100644
--- a/indra/newview/app_settings/static_data.db2
+++ b/indra/newview/app_settings/static_data.db2
Binary files differ
diff --git a/indra/newview/app_settings/static_index.db2 b/indra/newview/app_settings/static_index.db2
index a5440f96f2..e0b7375338 100644
--- a/indra/newview/app_settings/static_index.db2
+++ b/indra/newview/app_settings/static_index.db2
Binary files differ