From a408bac29378072fbf36864164149458c978cfcc Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:44:59 -0500
Subject: Second Life viewer sources 1.17.1.0

---
 linden/indra/llinventory/llparcel.cpp        | 18 ------------------
 linden/indra/llinventory/llparcel.h          |  1 -
 linden/indra/llinventory/llpermissions.h     |  2 +-
 linden/indra/llinventory/lluserrelations.cpp |  2 +-
 linden/indra/llinventory/lluserrelations.h   |  4 ++--
 5 files changed, 4 insertions(+), 23 deletions(-)

(limited to 'linden/indra/llinventory')

diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index 990e77d..5902acd 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -1231,24 +1231,6 @@ 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)
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 371b802..a33ffad 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -264,7 +264,6 @@ public:
 	BOOL	importStream(std::istream& input_stream);
 	BOOL	importAccessEntry(std::istream& input_stream, LLAccessEntry* entry);
 	BOOL	exportStream(std::ostream& output_stream);
-	virtual LLSD asLLSD() const;
 
 	void	packMessage(LLMessageSystem* msg);
 	void	unpackMessage(LLMessageSystem* msg);
diff --git a/linden/indra/llinventory/llpermissions.h b/linden/indra/llinventory/llpermissions.h
index 608f4b2..9607a9b 100644
--- a/linden/indra/llinventory/llpermissions.h
+++ b/linden/indra/llinventory/llpermissions.h
@@ -140,7 +140,7 @@ public:
 	const LLUUID&	getOwner() 			const	{ return mOwner; }
 
 	// return the group_id of the group associated with the
-	// object. group_id == owner_id if the object is group owned.
+	// object.
 	const LLUUID&	getGroup() 			const	{ return mGroup; }
 
 	// return the agent_id of the last agent owner. Only returns
diff --git a/linden/indra/llinventory/lluserrelations.cpp b/linden/indra/llinventory/lluserrelations.cpp
index fc8e510..5f01e51 100644
--- a/linden/indra/llinventory/lluserrelations.cpp
+++ b/linden/indra/llinventory/lluserrelations.cpp
@@ -1,5 +1,5 @@
 /** 
- * @file lluserrealations.cpp
+ * @file lluserrelations.cpp
  * @author Phoenix
  * @date 2006-10-12
  * @brief Implementation of a simple cache of user relations.
diff --git a/linden/indra/llinventory/lluserrelations.h b/linden/indra/llinventory/lluserrelations.h
index 3895533..69f5966 100644
--- a/linden/indra/llinventory/lluserrelations.h
+++ b/linden/indra/llinventory/lluserrelations.h
@@ -1,5 +1,5 @@
 /** 
- * @file llluserrelations.h
+ * @file lluserrelations.h
  * @author Phoenix
  * @date 2006-10-12
  * @brief Declaration of a class for handling granted rights.
@@ -38,7 +38,7 @@
  * @class LLRelationship
  *
  * This class represents a relationship between two agents, where the
- * related agent is stored and the other agent in the relationship is
+ * related agent is stored and the other agent is the relationship is
  * implicit by container ownership.
  * This is merely a cache of this information used by the sim 
  * and viewer.
-- 
cgit v1.1