summaryrefslogtreecommitdiff
path: root/indra/llmath/llvolume.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2009-12-11 14:47:11 -0600
committerDave Parks <davep@lindenlab.com>2009-12-11 14:47:11 -0600
commit695969c77066de5032bdc9caefecf9b32b076b2f (patch)
treeeda417dcc78dd06274a8752fa04b7fe7997b64cd /indra/llmath/llvolume.cpp
parentcd138869d5bfcf40d3d13d7b887e36263e2919d9 (diff)
HTTP Mesh fetch FTW.. still busted
Diffstat (limited to 'indra/llmath/llvolume.cpp')
-rw-r--r--indra/llmath/llvolume.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index fb2de92e35..44ff173502 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -1952,8 +1952,12 @@ BOOL LLVolume::createVolumeFacesFromStream(std::istream& is)
}
is.seekg(header[nm[lod]]["offset"].asInteger(), std::ios_base::cur);
-
+ return unpackVolumeFaces(is, header[nm[lod]]["size"].asInteger());
+}
+
+BOOL LLVolume::unpackVolumeFaces(std::istream& is, S32 size)
+{
U8* result = NULL;
U32 cur_size = 0;
@@ -1964,7 +1968,6 @@ BOOL LLVolume::createVolumeFacesFromStream(std::istream& is)
const U32 CHUNK = 65536;
- S32 size = header[nm[lod]]["size"].asInteger();
U8 *in = new U8[size];
is.read((char*) in, size);