From 392e84e55402166f5b4ec708d3338efe70a94c2e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Nov 2012 01:23:29 +0000
Subject: Remove unnecessary ability to directly set
InventoryItemBase.CreatorIdAsUuid
This was necessary historically but hasn't been for many years.
Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
---
OpenSim/Framework/InventoryItemBase.cs | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index a663680..3d45e76 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -87,16 +87,7 @@ namespace OpenSim.Framework
protected string m_creatorId;
///
- /// The UUID for the creator. This may be different from the canonical CreatorId. This property is used
- /// for communication with the client over the Second Life protocol, since that protocol can only understand
- /// UUIDs. As this is a basic framework class, this means that both the string creator id and the uuid
- /// reference have to be settable separately
- ///
- /// Database plugins don't need to set this, it will be set by
- /// upstream code (or set by the get accessor if left unset).
- ///
- /// XXX: An alternative to having a separate uuid property would be to hash the CreatorId appropriately
- /// every time there was communication with a UUID-only client. This may be much more expensive.
+ /// The CreatorId expressed as a UUID.tely
///
public UUID CreatorIdAsUuid
{
@@ -109,20 +100,18 @@ namespace OpenSim.Framework
return m_creatorIdAsUuid;
}
-
- set
- {
- m_creatorIdAsUuid = value;
- }
}
protected UUID m_creatorIdAsUuid = UUID.Zero;
- protected string m_creatorData = string.Empty;
+ ///
+ /// Extended creator information of the form ;
+ ///
public string CreatorData // = ;
{
get { return m_creatorData; }
set { m_creatorData = value; }
}
+ protected string m_creatorData = string.Empty;
///
/// Used by the DB layer to retrieve / store the entire user identification.
@@ -162,7 +151,6 @@ namespace OpenSim.Framework
name = parts[2];
m_creatorData += ';' + name;
-
}
}
}
--
cgit v1.1