aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-25 19:54:47 +0000
committerJustin Clarke Casey2009-05-25 19:54:47 +0000
commit582c20b1c4fb669884f0e2804487dd050f779f2b (patch)
tree3152941227a4445f08fa2ff5941890c447b3dfca
parentOne more utility. Not used yet. (diff)
downloadopensim-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
-rw-r--r--OpenSim/Framework/InventoryItemBase.cs24
-rw-r--r--OpenSim/Framework/Servers/HttpServer/RestSessionService.cs4
-rw-r--r--OpenSim/Framework/Servers/VersionInfo.cs2
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs5
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs3
5 files changed, 22 insertions, 16 deletions
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 2968712..cab241e 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -84,26 +84,38 @@ namespace OpenSim.Framework
84 m_creatorId = value; 84 m_creatorId = value;
85 } 85 }
86 } 86 }
87 protected string m_creatorId;
87 88
88 protected string m_creatorId = UUID.Zero.ToString();
89 /// <value> 89 /// <value>
90 /// The creator of this item expressed as a UUID. Database plugins don't need to set this, it will be set by 90 /// The UUID for the creator. This may be different from the canonical CreatorId. This property is used
91 /// for communication with the client over the Second Life protocol, since that protocol can only understand
92 /// UUIDs. As this is a basic framework class, this means that both the string creator id and the uuid
93 /// reference have to be settable separately
94 ///
95 /// Database plugins don't need to set this, it will be set by
91 /// upstream code (or set by the get accessor if left unset). 96 /// upstream code (or set by the get accessor if left unset).
97 ///
98 /// XXX: An alternative to having a separate uuid property would be to hash the CreatorId appropriately
99 /// every time there was communication with a UUID-only client. This may be much more expensive.
92 /// </value> 100 /// </value>
93 public UUID CreatorIdAsUuid 101 public UUID CreatorIdAsUuid
94 { 102 {
95 get 103 get
96 { 104 {
97 UUID temp = UUID.Zero; 105 if (UUID.Zero == m_creatorIdAsUuid)
98 UUID.TryParse(CreatorId, out temp); 106 {
99 return temp; 107 UUID.TryParse(CreatorId, out m_creatorIdAsUuid);
108 }
109
110 return m_creatorIdAsUuid;
100 } 111 }
101 112
102 set 113 set
103 { 114 {
104 CreatorId = value.ToString(); 115 m_creatorIdAsUuid = value;
105 } 116 }
106 } 117 }
118 protected UUID m_creatorIdAsUuid = UUID.Zero;
107 119
108 /// <value> 120 /// <value>
109 /// The description of the inventory item (must be less than 64 characters) 121 /// The description of the inventory item (must be less than 64 characters)
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index f5e4248..ec2f9ec 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -236,10 +236,6 @@ namespace OpenSim.Framework.Servers.HttpServer
236 /// <summary> 236 /// <summary>
237 /// The operation to perform once trust has been established. 237 /// The operation to perform once trust has been established.
238 /// </summary> 238 /// </summary>
239 /// <param name="httpMethod"></param>
240 /// <param name="path"></param>
241 /// <param name="method"></param>
242 /// <param name="tmethod"></param>
243 private RestDeserialiseMethod<TRequest, TResponse> m_method; 239 private RestDeserialiseMethod<TRequest, TResponse> m_method;
244 240
245 /// <summary> 241 /// <summary>
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 7ed3b96..c16a7f4 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -48,6 +48,6 @@ namespace OpenSim
48 /// of the code that is too old. 48 /// of the code that is too old.
49 /// 49 ///
50 /// </value> 50 /// </value>
51 public readonly static int MajorInterfaceVersion = 3; 51 public readonly static int MajorInterfaceVersion = 4;
52 } 52 }
53} 53}
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;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index fd79ffa..20adb21 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -198,7 +198,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
198 [Test] 198 [Test]
199 public void TestLoadIarV0_1ExistingUsers() 199 public void TestLoadIarV0_1ExistingUsers()
200 { 200 {
201 Assert.Ignore();
202 TestHelper.InMethod(); 201 TestHelper.InMethod();
203 202
204 //log4net.Config.XmlConfigurator.Configure(); 203 //log4net.Config.XmlConfigurator.Configure();
@@ -265,9 +264,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
265 [Test] 264 [Test]
266 public void TestLoadIarV0_1TempProfiles() 265 public void TestLoadIarV0_1TempProfiles()
267 { 266 {
268 Assert.Ignore();
269 TestHelper.InMethod(); 267 TestHelper.InMethod();
270 Console.WriteLine("### Started {0} ###", MethodBase.GetCurrentMethod());
271 268
272 log4net.Config.XmlConfigurator.Configure(); 269 log4net.Config.XmlConfigurator.Configure();
273 270