svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release

1 files changed, 19 insertions, 1 deletions

diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 7ea83f6e5e..c2b2eb27de 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -1194,6 +1194,24 @@ BOOL LLParcel::exportStream(std::ostream& output_stream)
 	return TRUE;
 }
 
+// virtual
+LLSD LLParcel::asLLSD() const
+{
+	LLSD p;
+	p["parcel-id"] = getID();
+	p["name"] = getName();
+	p["desc"] = getDesc();
+	p["owner-id"] = getOwnerID();
+	p["group-id"] = getGroupID();
+	p["group-owned"] = (bool)getIsGroupOwned();
+	p["auction-id"] = (S32)getAuctionID();
+	p["snapshot-id"] = getSnapshotID();
+	p["authorized-buyer-id"] = getAuthorizedBuyerID();
+	p["sale-price"] = getSalePrice();
+	p["parcel-flags"] = (S32)getParcelFlags();
+	// NOTE: This list is incomplete, as this is used only for search. JC
+	return p;
+}
 
 // Assumes we are in a block "ParcelData"
 void LLParcel::packMessage(LLMessageSystem* msg)
@@ -1766,7 +1784,7 @@ const char* category_to_ui_string(LLParcel::ECategory category)
 	else
 	{
 		// C_ANY = -1 , but the "Any" string is at the end of the list
-		index = ((S32) LLParcel::C_COUNT) + 1;
+		index = ((S32) LLParcel::C_COUNT);
 	}
 	return PARCEL_CATEGORY_UI_STRING[index];
 }