aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorDavid Walter Seikel2012-02-27 05:01:01 +1000
committerDavid Walter Seikel2012-02-27 05:01:01 +1000
commit5b25ee1f6a3488f16a68e436a0bcec79636a11e6 (patch)
treec331a5a8fd6806ea9c3af9a843faf8ef98433f0f /linden
parentAdding my linux build scripts. Makes it easy to build under 32 and 64 bit li... (diff)
downloadmeta-impy-5b25ee1f6a3488f16a68e436a0bcec79636a11e6.zip
meta-impy-5b25ee1f6a3488f16a68e436a0bcec79636a11e6.tar.gz
meta-impy-5b25ee1f6a3488f16a68e436a0bcec79636a11e6.tar.bz2
meta-impy-5b25ee1f6a3488f16a68e436a0bcec79636a11e6.tar.xz
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.
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/llcommon/llsdserialize_xml.cpp4
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)
394 if (status == XML_STATUS_ERROR) 394 if (status == XML_STATUS_ERROR)
395 { 395 {
396 std::string error_string(XML_ErrorString(XML_GetErrorCode( mParser ))); 396 std::string error_string(XML_ErrorString(XML_GetErrorCode( mParser )));
397 if (input.gcount() == 0) 397 // I know, this if seems odd, but it fixes a problem with not being able to see nearby sims, or TP to other sims.
398 // No idea why.
399 if (input && (input.gcount() == 0))
398 { 400 {
399 // nothing to do -- MC 401 // nothing to do -- MC
400 data = LLSD(); 402 data = LLSD();