summaryrefslogtreecommitdiff
path: root/indra/llmath/llvolume.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-02-24 22:02:01 -0600
committerDave Parks <davep@lindenlab.com>2010-02-24 22:02:01 -0600
commit3c78771acee787e087bd2e2391397794d4d98f6d (patch)
tree0fc5ef571ea276db24217b33b24f6034ead50eb7 /indra/llmath/llvolume.cpp
parent6b1163c5559ee503942ce293c3292297920f2b1f (diff)
Removed scale from model importer.
Removed support for scale entry in mesh assets. Fixed MeshMaxConcurrentRequests being ignored. Added mesh download queue debug text.
Diffstat (limited to 'indra/llmath/llvolume.cpp')
-rw-r--r--indra/llmath/llvolume.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 704308f20f..904786079f 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -2098,8 +2098,6 @@ BOOL LLVolume::unpackVolumeFaces(std::istream& is, S32 size)
min_tc.setValue(mdl[i]["TexCoord0Domain"]["Min"]);
max_tc.setValue(mdl[i]["TexCoord0Domain"]["Max"]);
- F32 scale = llclamp((F32) mdl[i]["Scale"].asReal(), 1.f, 10.f);
-
LLVector3 pos_range = max_pos - min_pos;
LLVector2 tc_range = max_tc - min_tc;
@@ -2117,8 +2115,6 @@ BOOL LLVolume::unpackVolumeFaces(std::istream& is, S32 size)
(F32) v[1] / 65535.f * pos_range.mV[1] + min_pos.mV[1],
(F32) v[2] / 65535.f * pos_range.mV[2] + min_pos.mV[2]);
- face.mVertices[j].mPosition *= scale;
-
if (j == 0)
{
min = max = face.mVertices[j].mPosition;