diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
| commit | 1c909afe3998778e4cc045c9ab733e8afbf7c25b (patch) | |
| tree | 75c00a32a8e305280cbec253195d1113d628fc3e /indra/llmath | |
| parent | bc59c04653bf1404e8148a8169208b146a123b28 (diff) | |
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llcamera.cpp | 2 | ||||
| -rw-r--r-- | indra/llmath/llvolume.cpp | 27 |
2 files changed, 4 insertions, 25 deletions
diff --git a/indra/llmath/llcamera.cpp b/indra/llmath/llcamera.cpp index eaeb83f625..920d07f361 100644 --- a/indra/llmath/llcamera.cpp +++ b/indra/llmath/llcamera.cpp @@ -486,7 +486,7 @@ void LLCamera::calcAgentFrustumPlanes(LLVector3* frust) mAgentPlanes[3] = planeFromPoints(frust[1], frust[0], frust[4]); //cache plane octant facing mask for use in AABBInFrustum - for (int i = 0; i < 8; i++) + for (int i = 0; i < 6; i++) { U8 mask = 0; LLPlane p = mAgentPlanes[i]; diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index c5d105c9ee..20d07064e3 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -722,10 +722,6 @@ BOOL LLProfileParams::importFile(FILE *fp) buffer, " %255s %255s", keyword, valuestr); - if (!keyword) - { - continue; - } if (!strcmp("{", keyword)) { continue; @@ -798,10 +794,6 @@ BOOL LLProfileParams::importLegacyStream(std::istream& input_stream) " %255s %255s", keyword, valuestr); - if (!keyword) - { - continue; - } if (!strcmp("{", keyword)) { continue; @@ -1225,10 +1217,6 @@ BOOL LLPathParams::importFile(FILE *fp) buffer, " %255s %255s", keyword, valuestr); - if (!keyword) - { - continue; - } if (!strcmp("{", keyword)) { continue; @@ -1369,10 +1357,6 @@ BOOL LLPathParams::importLegacyStream(std::istream& input_stream) buffer, " %255s %255s", keyword, valuestr); - if (!keyword) - { - continue; - } if (!strcmp("{", keyword)) { continue; @@ -3267,6 +3251,9 @@ BOOL LLVolume::cleanupTriangleData( const S32 num_input_vertices, if (new_num_triangles == 0) { llwarns << "Created volume object with 0 faces." << llendl; + delete[] new_triangles; + delete[] vertex_mapping; + delete[] new_vertices; return FALSE; } @@ -3361,10 +3348,6 @@ BOOL LLVolumeParams::importFile(FILE *fp) { fgets(buffer, BUFSIZE, fp); sscanf(buffer, " %255s", keyword); /* Flawfinder: ignore */ - if (!keyword) - { - continue; - } if (!strcmp("{", keyword)) { continue; @@ -3415,10 +3398,6 @@ BOOL LLVolumeParams::importLegacyStream(std::istream& input_stream) { input_stream.getline(buffer, BUFSIZE); sscanf(buffer, " %255s", keyword); - if (!keyword) - { - continue; - } if (!strcmp("{", keyword)) { continue; |