diff options
author | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
commit | 24789f11cc58cf7c03283a8e9648085a5cb9d7d8 (patch) | |
tree | bade7e21ca009bdb6a9f89b155732876bb02035d /indra/llxml/llxmlnode.cpp | |
parent | a7499dc4abfa5fa7582dc7ebb535a07ed94d0c4f (diff) | |
parent | 66f101bac591d82b71ab7dc976b6fed0ed451909 (diff) |
Pull from viewer-experience
Diffstat (limited to 'indra/llxml/llxmlnode.cpp')
-rw-r--r-- | indra/llxml/llxmlnode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp index 3d4e6f9a0b..2ffb0d8503 100644 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp @@ -801,7 +801,7 @@ bool LLXMLNode::parseStream( while(str.good()) { str.read((char*)buffer, BUFSIZE); - int count = str.gcount(); + int count = (int)str.gcount(); if (XML_Parse(my_parser, (const char *)buffer, count, !str.good()) != XML_STATUS_OK) { |