diff options
author | Dave Parks <davep@lindenlab.com> | 2011-05-05 17:12:41 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-05-05 17:12:41 -0500 |
commit | 3c516973f3a508d2bf0060d8dc70fa0d7809340f (patch) | |
tree | 57ac54824d8444d9c8beaeb88fcc2fd5bed3185e | |
parent | 9cb31845bafe9188d9f90dc1330355c73fb96851 (diff) |
SH-1497 "Positions" not "Position" for convex decomp.
-rw-r--r-- | indra/llprimitive/llmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 66b5150ed4..ebd2fc7a29 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -2017,7 +2017,7 @@ void LLModel::Decomposition::fromLLSD(LLSD& decomp) { // updated for const-correctness. gcc is picky about this type of thing - Nyx const LLSD::Binary& hulls = decomp["HullList"].asBinary(); - const LLSD::Binary& position = decomp["Position"].asBinary(); + const LLSD::Binary& position = decomp["Positions"].asBinary(); U16* p = (U16*) &position[0]; @@ -2166,7 +2166,7 @@ LLSD LLModel::Decomposition::asLLSD() const llassert(valid.size() > 3); } - ret["Position"] = p; + ret["Positions"] = p; } if (!mBaseHull.empty()) |