summaryrefslogtreecommitdiff
path: root/indra/newview/lllandmarklist.cpp
diff options
context:
space:
mode:
authorAaron Brashears <aaronb@lindenlab.com>2007-02-02 17:28:58 +0000
committerAaron Brashears <aaronb@lindenlab.com>2007-02-02 17:28:58 +0000
commit305c74d5163c5e344a675d39ca2394a9e45bd2c2 (patch)
tree42836c4a6010b2b015156024d3cfb6bf64a48ad6 /indra/newview/lllandmarklist.cpp
parent54d89549df38bb61881583a3eb8d3645c107d79f (diff)
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
Diffstat (limited to 'indra/newview/lllandmarklist.cpp')
-rw-r--r--indra/newview/lllandmarklist.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp
index 0fb32c2dc3..57684fbc18 100644
--- a/indra/newview/lllandmarklist.cpp
+++ b/indra/newview/lllandmarklist.cpp
@@ -65,7 +65,7 @@ void LLLandmarkList::processGetAssetReply(
S32 file_length = file.getSize();
char* buffer = new char[ file_length + 1 ];
- file.read( (U8*)buffer, file_length);
+ file.read( (U8*)buffer, file_length); /*Flawfinder: ignore*/
buffer[ file_length ] = 0;
LLLandmark* landmark = LLLandmark::constructFromString(buffer);