diff options
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 27 |
1 files changed, 3 insertions, 24 deletions
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; |