* Applies r9674 to 0.6.5-post-fixes.
* This makes it compatible with the current MajorInterfaceVersion0.6.5-post-fixes
parent
4b0e34155d
commit
b74cd49f7c
|
@ -84,26 +84,38 @@ namespace OpenSim.Framework
|
|||
m_creatorId = value;
|
||||
}
|
||||
}
|
||||
protected string m_creatorId;
|
||||
|
||||
protected string m_creatorId = UUID.Zero.ToString();
|
||||
/// <value>
|
||||
/// The creator of this item expressed as a UUID. Database plugins don't need to set this, it will be set by
|
||||
/// 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.
|
||||
/// </value>
|
||||
public UUID CreatorIdAsUuid
|
||||
{
|
||||
get
|
||||
{
|
||||
UUID temp = UUID.Zero;
|
||||
UUID.TryParse(CreatorId, out temp);
|
||||
return temp;
|
||||
if (UUID.Zero == m_creatorIdAsUuid)
|
||||
{
|
||||
UUID.TryParse(CreatorId, out m_creatorIdAsUuid);
|
||||
}
|
||||
|
||||
return m_creatorIdAsUuid;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
CreatorId = value.ToString();
|
||||
m_creatorIdAsUuid = value;
|
||||
}
|
||||
}
|
||||
protected UUID m_creatorIdAsUuid = UUID.Zero;
|
||||
|
||||
/// <value>
|
||||
/// The description of the inventory item (must be less than 64 characters)
|
||||
|
|
|
@ -236,10 +236,6 @@ namespace OpenSim.Framework.Servers.HttpServer
|
|||
/// <summary>
|
||||
/// The operation to perform once trust has been established.
|
||||
/// </summary>
|
||||
/// <param name="httpMethod"></param>
|
||||
/// <param name="path"></param>
|
||||
/// <param name="method"></param>
|
||||
/// <param name="tmethod"></param>
|
||||
private RestDeserialiseMethod<TRequest, TResponse> m_method;
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -48,6 +48,6 @@ namespace OpenSim
|
|||
/// of the code that is too old.
|
||||
///
|
||||
/// </value>
|
||||
public readonly static int MajorInterfaceVersion = 3;
|
||||
public readonly static int MajorInterfaceVersion = 4;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -44,6 +44,8 @@ namespace OpenSim.Grid.InventoryServer
|
|||
/// </summary>
|
||||
public class GridInventoryService : InventoryServiceBase
|
||||
{
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
private bool m_doLookup = false;
|
||||
|
||||
public bool DoLookup
|
||||
|
@ -51,8 +53,7 @@ namespace OpenSim.Grid.InventoryServer
|
|||
get { return m_doLookup; }
|
||||
set { m_doLookup = value; }
|
||||
}
|
||||
private static readonly ILog m_log
|
||||
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
private static readonly int INVENTORY_DEFAULT_SESSION_TIME = 30; // secs
|
||||
|
||||
private string m_userserver_url;
|
||||
|
|
Loading…
Reference in New Issue