merge -r62831:64079 branches/maintenance to release

5 files changed, 3 insertions, 22 deletions

diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 38b0cb06c6..6263f7ae11 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -1211,24 +1211,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/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index 1ad51dfd1e..fe51185153 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -244,7 +244,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/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h
index 76794e1ed9..131db1a635 100644
--- a/indra/llinventory/llpermissions.h
+++ b/indra/llinventory/llpermissions.h
@@ -120,7 +120,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/indra/llinventory/lluserrelations.cpp b/indra/llinventory/lluserrelations.cpp
index c10f6f610a..c42b1abc16 100644
--- a/indra/llinventory/lluserrelations.cpp
+++ b/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/indra/llinventory/lluserrelations.h b/indra/llinventory/lluserrelations.h
index 7c24254339..036f039105 100644
--- a/indra/llinventory/lluserrelations.h
+++ b/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.