llcommon merge. Added LLUnits.

2016-04-06 01:31:20 -05:00
parent 0fa7848b19
commit 0841479ccc
66 changed files with 1895 additions and 621 deletions
--- a/indra/llcommon/llsdserialize_xml.cpp
+++ b/indra/llcommon/llsdserialize_xml.cpp
@@ -337,10 +337,9 @@ void clear_eol(std::istream& input)
 static unsigned get_till_eol(std::istream& input, char *buf, unsigned bufsize)
 {
 	unsigned count = 0;
-	char c;
 	while (count < bufsize && input.good())
 	{
-		input.get(c);
+		char c = input.get();
 		buf[count++] = c;
 		if (is_eol(c))
 			break;