Second Life viewer sources 1.15.1.3

1 files changed, 19 insertions, 1 deletions

diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index c37a4d6..5b2052f 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -1214,6 +1214,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)
@@ -1786,7 +1804,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];
 }