From 5b25ee1f6a3488f16a68e436a0bcec79636a11e6 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 27 Feb 2012 05:01:01 +1000
Subject: Fix a bug preventning seeing nearby sims, or TPing to other sims.

After some investigation, McCabe and I narrowed it down to this if statement.
We still don't know why, but at least it fixes the problem.  To be investiganted more later.
---
 linden/indra/llcommon/llsdserialize_xml.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp
index 3545309..7c3dcbf 100644
--- a/linden/indra/llcommon/llsdserialize_xml.cpp
+++ b/linden/indra/llcommon/llsdserialize_xml.cpp
@@ -394,7 +394,9 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
 		if (status == XML_STATUS_ERROR)
 		{
 			std::string error_string(XML_ErrorString(XML_GetErrorCode( mParser )));
-			if (input.gcount() == 0)
+			// I know, this if seems odd, but it fixes a problem with not being able to see nearby sims, or TP to other sims.
+			// No idea why.
+			if (input && (input.gcount() == 0))
 			{
 				// nothing to do -- MC
 				data = LLSD();
-- 
cgit v1.1