diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2011-06-15 16:20:33 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2011-06-15 16:20:33 -0600 |
commit | 0bb7bcc96cfea7b5d56f083d0afcbc1fce7e9f21 (patch) | |
tree | 46b49b78517bdf835cc5abf503c2c5c730702ced /indra/llprimitive/llmodel.cpp | |
parent | a451c9e83431c7d39ef912680bf9d7411c7a12d2 (diff) |
fix for SH-1788: Assert in texture load when uploading textured mesh model
and beyond: fixed the thread-safe and highest texture resolution flaws in the mesh texture uploading flow.
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
-rw-r--r-- | indra/llprimitive/llmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index e0cfa07614..0463d5364b 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -2252,7 +2252,7 @@ LLSD LLModel::Decomposition::asLLSD() const ret["Positions"] = p; } - llassert(!mBaseHull.empty()); + //llassert(!mBaseHull.empty()); if (!mBaseHull.empty()) { |