From e4a5d16be1719706e96beb21cc23c512b02c7b33 Mon Sep 17 00:00:00 2001 From: JonathanLinden Date: Tue, 26 Oct 2010 10:31:48 -0700 Subject: Fixed convex hull size incompatibility in mesh assets. --- indra/llprimitive/llmodel.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/llprimitive/llmodel.cpp') 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) { -- cgit v1.3 From 0a8d43e84455b48e220a4f6574e42d258b9312d4 Mon Sep 17 00:00:00 2001 From: Jonathan Wolk Date: Tue, 26 Oct 2010 11:11:20 -0700 Subject: Backing out latest change to undo static cache file changes --- indra/llprimitive/llmodel.cpp | 4 +++- indra/newview/app_settings/static_data.db2 | Bin 832578 -> 576578 bytes indra/newview/app_settings/static_index.db2 | Bin 18020 -> 9894 bytes 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/llprimitive/llmodel.cpp') 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 Binary files a/indra/newview/app_settings/static_data.db2 and b/indra/newview/app_settings/static_data.db2 differ diff --git a/indra/newview/app_settings/static_index.db2 b/indra/newview/app_settings/static_index.db2 index e0b7375338..a5440f96f2 100644 Binary files a/indra/newview/app_settings/static_index.db2 and b/indra/newview/app_settings/static_index.db2 differ -- cgit v1.3 From 57cbcdc9ec9e8edf50bfea82efb63b3f8fab3cdc Mon Sep 17 00:00:00 2001 From: Jonathan Wolk Date: Tue, 26 Oct 2010 11:20:48 -0700 Subject: Adding back in fix for convex hull size incompatibility after backout of previous checkin. --- indra/llprimitive/llmodel.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/llprimitive/llmodel.cpp') diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 7fa72d82e1..1cee5a6e15 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) { -- cgit v1.3