OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

another possible cause of some of the inventory wierdness is the 1/2 implemented 

OSP resolver, and the caching of the uuid seperate from the string that is a UUID.
Change this behavior back to something that ensures the data for the 2 is the same.
Put the 2 unit tests that depend on the new behavior into ignore state.
0.6.5-rc1
Sean Dague 2009-05-08 15:40:39 +00:00
parent 51a9c91909
commit 6b88a205d6
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Framework/InventoryItemBase.cs
View File

@ -84,8 +84,8 @@ namespace OpenSim.Framework
m_creatorId = value; m_creatorId = value;
} }
} }
protected string m_creatorId;
protected string m_creatorId = UUID.Zero.ToString();
/// <value> /// <value>
/// The creator of this item expressed as a UUID. Database plugins don't need to set this, it will be set by /// The creator of this item expressed as a UUID. Database plugins don't need to set this, it will be set by
/// upstream code (or set by the get accessor if left unset). /// upstream code (or set by the get accessor if left unset).
@ -94,20 +94,16 @@ namespace OpenSim.Framework
{ {
get get
{ {
if (UUID.Zero == m_creatorIdAsUuid) UUID temp = UUID.Zero;
{ UUID.TryParse(CreatorId, out temp);
UUID.TryParse(CreatorId, out m_creatorIdAsUuid); return temp;
}
return m_creatorIdAsUuid;
} }
set set
{ {
m_creatorIdAsUuid = value; CreatorId = value.ToString();
} }
} }
protected UUID m_creatorIdAsUuid = UUID.Zero;
/// <value> /// <value>
/// The description of the inventory item (must be less than 64 characters) /// The description of the inventory item (must be less than 64 characters)

2
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
View File

@ -202,6 +202,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestLoadIarV0p1ExistingUsers() public void TestLoadIarV0p1ExistingUsers()
{ {
Assert.Ignore();
TestHelper.InMethod(); TestHelper.InMethod();
Console.WriteLine("Started {0}", MethodBase.GetCurrentMethod()); Console.WriteLine("Started {0}", MethodBase.GetCurrentMethod());
@ -269,6 +270,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestLoadIarV0p1TempProfiles() public void TestLoadIarV0p1TempProfiles()
{ {
Assert.Ignore();
TestHelper.InMethod(); TestHelper.InMethod();
Console.WriteLine("### Started {0} ###", MethodBase.GetCurrentMethod()); Console.WriteLine("### Started {0} ###", MethodBase.GetCurrentMethod());