merge changes for 4.0.4-release

1 files changed, 8 insertions, 3 deletions

diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index f8681fe098..e20360066e 100755
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -183,10 +183,15 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 			msg->getU32("DataExtended", "TimeStamp", time_stamp, block);
 			msg->getF32("DataExtended", "MonoScore", mono_score, block);
 			msg->getS32("DataExtended", "PublicURLs", public_urls, block);
-			if (msg->getSize("DataExtended", "ParcelName") > 0)
+
+			std::string parcel_name;
+			F32 script_size = 0.f;
+			msg->getString("DataExtended", "ParcelName", parcel_name, block);
+			msg->getF32("DataExtended", "Size", script_size, block);
+			if (parcel_name.size() > 0 || script_size > 0)
 			{
-				msg->getString("DataExtended", "ParcelName", parcel_buf, block);
-				msg->getF32("DataExtended", "Size", script_memory, block);
+				parcel_buf = parcel_name;
+				script_memory = script_size;
 			}
 		}