1 files changed, 3 insertions, 1 deletions

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();