From 582c20b1c4fb669884f0e2804487dd050f779f2b Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 25 May 2009 19:54:47 +0000 Subject: * reseparate inventory item creator id and creator uuid * unfortunately, while the client requires uuids and we want to be able to have arbitrary string ids, these cannot be kept in sync * I think the problems last time were due to a serialization change * So the major inteface version has been bumped to take care of any lingering issues here. * This means that region servers beyond this revision can only connect to similarly uptodate grid services, and vice versa --- OpenSim/Grid/InventoryServer/GridInventoryService.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'OpenSim/Grid/InventoryServer') diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs index 16d8154..66dfb14 100644 --- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs +++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs @@ -44,6 +44,8 @@ namespace OpenSim.Grid.InventoryServer /// 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; -- cgit v1.1