diff options
author | Justin Clarke Casey | 2009-05-25 19:54:47 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-25 19:54:47 +0000 |
commit | 582c20b1c4fb669884f0e2804487dd050f779f2b (patch) | |
tree | 3152941227a4445f08fa2ff5941890c447b3dfca /OpenSim/Grid | |
parent | One more utility. Not used yet. (diff) | |
download | opensim-SC_OLD-582c20b1c4fb669884f0e2804487dd050f779f2b.zip opensim-SC_OLD-582c20b1c4fb669884f0e2804487dd050f779f2b.tar.gz opensim-SC_OLD-582c20b1c4fb669884f0e2804487dd050f779f2b.tar.bz2 opensim-SC_OLD-582c20b1c4fb669884f0e2804487dd050f779f2b.tar.xz |
* 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
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/InventoryServer/GridInventoryService.cs | 5 |
1 files changed, 3 insertions, 2 deletions
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 | |||
44 | /// </summary> | 44 | /// </summary> |
45 | public class GridInventoryService : InventoryServiceBase | 45 | public class GridInventoryService : InventoryServiceBase |
46 | { | 46 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
48 | |||
47 | private bool m_doLookup = false; | 49 | private bool m_doLookup = false; |
48 | 50 | ||
49 | public bool DoLookup | 51 | public bool DoLookup |
@@ -51,8 +53,7 @@ namespace OpenSim.Grid.InventoryServer | |||
51 | get { return m_doLookup; } | 53 | get { return m_doLookup; } |
52 | set { m_doLookup = value; } | 54 | set { m_doLookup = value; } |
53 | } | 55 | } |
54 | private static readonly ILog m_log | 56 | |
55 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
56 | private static readonly int INVENTORY_DEFAULT_SESSION_TIME = 30; // secs | 57 | private static readonly int INVENTORY_DEFAULT_SESSION_TIME = 30; // secs |
57 | 58 | ||
58 | private string m_userserver_url; | 59 | private string m_userserver_url; |