summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wolk <none@none>2010-10-26 11:11:20 -0700
committerJonathan Wolk <none@none>2010-10-26 11:11:20 -0700
commit0a8d43e84455b48e220a4f6574e42d258b9312d4 (patch)
tree7de70d2f90508cad873ffefdf59f92cee01504d2
parente4a5d16be1719706e96beb21cc23c512b02c7b33 (diff)
Backing out latest change to undo static cache file changes
-rw-r--r--indra/llprimitive/llmodel.cpp4
-rw-r--r--indra/newview/app_settings/static_data.db2bin832578 -> 576578 bytes
-rw-r--r--indra/newview/app_settings/static_index.db2bin18020 -> 9894 bytes
3 files changed, 3 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index e2a33965ea..7fa72d82e1 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -1449,7 +1449,9 @@ LLSD LLModel::writeModel(
{
U32 size = decomp[i].size();
total += size;
- hulls[i] = (U8) 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);
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 052ff9f1e2..f85aa81601 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 e0b7375338..a5440f96f2 100644
--- a/indra/newview/app_settings/static_index.db2
+++ b/indra/newview/app_settings/static_index.db2
Binary files differ