From 3323413f53fd39cdbba4e247c6a8a63278150b10 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey
Date: Wed, 5 Aug 2009 17:17:20 +0100
Subject: reinstate TestReplicateArchivePathToUserInventory()
---
.../Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index dd524f5..780327f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -353,7 +353,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// <summary>
/// Test replication of an archive path to the user's inventory.
/// </summary>
- //[Test]
+ [Test]
public void TestReplicateArchivePathToUserInventory()
{
TestHelper.InMethod();
--
cgit v1.1
From 190bdc8a2e8fa842759087749592769f951834ab Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey
Date: Wed, 5 Aug 2009 17:33:23 +0100
Subject: * Remove some mono compiler warnings
---
.../ClientStack/LindenUDP/LLPacketHandler.cs | 4 +--
.../TextureDownload/UserTextureDownloadService.cs | 29 +++++++++++-----------
.../CoreModules/Scripting/LSLHttp/UrlModule.cs | 6 ++---
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 3 ++-
.../Shared/Api/Implementation/LSL_Api.cs | 2 +-
5 files changed, 22 insertions(+), 22 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index fad9218..eaf8f60 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -827,9 +827,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
sendbuffer.Length, SocketFlags.None, m_Client.CircuitCode);
}
}
- catch (NullReferenceException n)
+ catch (NullReferenceException)
{
- m_log.Debug("[PACKET] Detected reuse of a returned packet");
+ m_log.Error("[PACKET]: Detected reuse of a returned packet");
m_PacketQueue.Cancel(item.Sequence);
return;
}
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
index 5be2a65..65138e2 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
@@ -45,8 +45,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
/// </summary>
public class UserTextureDownloadService
{
- private static readonly ILog m_log
- = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// True if the service has been closed, probably because a user with texture requests still queued
@@ -88,13 +87,13 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
/// XXX This is really a temporary solution to deal with the situation where a client continually requests
/// the same missing textures
/// </summary>
- private readonly IRequestLimitStrategy<UUID> missingTextureLimitStrategy
- = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS);
+// private readonly IRequestLimitStrategy<UUID> missingTextureLimitStrategy
+// = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS);
public UserTextureDownloadService(
IClientAPI client, Scene scene, OpenSim.Framework.BlockingQueue<ITextureSender> sharedQueue)
{
- m_client = client;
+// m_client = client;
m_scene = scene;
m_sharedSendersQueue = sharedQueue;
}
@@ -231,16 +230,16 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
/// Place a ready texture sender on the processing queue.
/// </summary>
/// <param name="textureSender"></param>
- private void EnqueueTextureSender(ITextureSender textureSender)
- {
- textureSender.Cancel = false;
- textureSender.Sending = true;
-
- if (!m_sharedSendersQueue.Contains(textureSender))
- {
- m_sharedSendersQueue.Enqueue(textureSender);
- }
- }
+// private void EnqueueTextureSender(ITextureSender textureSender)
+// {
+// textureSender.Cancel = false;
+// textureSender.Sending = true;
+//
+// if (!m_sharedSendersQueue.Contains(textureSender))
+// {
+// m_sharedSendersQueue.Enqueue(textureSender);
+// }
+// }
/// <summary>
/// Close this module.
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 7082e85..ad42523 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -60,9 +60,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
public class UrlModule : ISharedRegionModule, IUrlModule
{
- private static readonly ILog m_log =
- LogManager.GetLogger(
- MethodBase.GetCurrentMethod().DeclaringType);
+// private static readonly ILog m_log =
+// LogManager.GetLogger(
+// MethodBase.GetCurrentMethod().DeclaringType);
private Dictionary<UUID, UrlData> m_RequestMap =
new Dictionary<UUID, UrlData>();
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 83db396..9805ff5 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -2863,7 +2863,8 @@ namespace OpenSim.Region.Physics.OdePlugin
//if ((framecount % m_randomizeWater) == 0)
// randomizeWater(waterlevel);
- int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests();
+ //int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests();
+ m_rayCastManager.ProcessQueuedRequests();
collision_optimized(timeStep);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index acab734..7f691ba 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9033,7 +9033,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (m.Success) {
for (int i = 1; i < gnums.Length; i++) {
System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
- CaptureCollection cc = g.Captures;
+ //CaptureCollection cc = g.Captures;
}
if (m.Groups.Count == 5) {
httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));
--
cgit v1.1
From e5904c388388ae5be4eb466c0c70f0ef4c628446 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey
Date: Wed, 5 Aug 2009 17:39:32 +0100
Subject: remove some more mono compiler warnings
---
.../Agent/TextureDownload/UserTextureDownloadService.cs | 12 ++++++------
.../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
index 65138e2..19f0f90 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
@@ -60,22 +60,22 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
/// currently handle properly as far as I know). However, this situation should be handled in a more
/// sophisticated way.
/// </summary>
- private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 5;
+// private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 5;
/// <summary>
/// XXX Also going to limit requests for found textures.
/// </summary>
- private readonly IRequestLimitStrategy<UUID> foundTextureLimitStrategy
- = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS);
+// private readonly IRequestLimitStrategy<UUID> foundTextureLimitStrategy
+// = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS);
- private readonly IClientAPI m_client;
+// private readonly IClientAPI m_client;
private readonly Scene m_scene;
/// <summary>
/// Texture Senders are placed in this queue once they have received their texture from the asset
/// cache. Another module actually invokes the send.
/// </summary>
- private readonly OpenSim.Framework.BlockingQueue<ITextureSender> m_sharedSendersQueue;
+// private readonly OpenSim.Framework.BlockingQueue<ITextureSender> m_sharedSendersQueue;
/// <summary>
/// Holds texture senders before they have received the appropriate texture from the asset cache.
@@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
{
// m_client = client;
m_scene = scene;
- m_sharedSendersQueue = sharedQueue;
+// m_sharedSendersQueue = sharedQueue;
}
/// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7f691ba..bc36fda 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9032,7 +9032,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
Match m = r.Match(url);
if (m.Success) {
for (int i = 1; i < gnums.Length; i++) {
- System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
+ //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
//CaptureCollection cc = g.Captures;
}
if (m.Groups.Count == 5) {
--
cgit v1.1
From 9e0f1b7fef658d7873b5cce994b7beb1bbc4ca30 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 5 Aug 2009 18:01:18 +0100
Subject: reinstate TestSaveIarV0_1()
---
.../Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 780327f..cf3b29f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// <summary>
/// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
/// </summary>
- //[Test]
+ [Test]
public void TestSaveIarV0_1()
{
TestHelper.InMethod();
--
cgit v1.1
From 1b65bd5861dd8e36e05c1f9c69040270b0855b5c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 5 Aug 2009 18:21:22 +0100
Subject: Recomment TestReplicateArchivePathToUserInventory() for now due to
occasional test fail
---
.../Inventory/Archiver/Tests/InventoryArchiverTests.cs | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index cf3b29f..4928ede 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -264,17 +264,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
}
Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName);
- Assert.That(foundItem, Is.Not.Null);
- Assert.That(foundItem.CreatorId, Is.EqualTo(item1.CreatorId));
- Assert.That(foundItem.CreatorIdAsUuid, Is.EqualTo(user2Uuid));
- Assert.That(foundItem.Owner, Is.EqualTo(userUuid));
+ Assert.That(foundItem, Is.Not.Null, "Didn't find loaded item");
+ Assert.That(
+ foundItem.CreatorId, Is.EqualTo(item1.CreatorId),
+ "Loaded item non-uuid creator doesn't match original");
+ Assert.That(
+ foundItem.CreatorIdAsUuid, Is.EqualTo(user2Uuid),
+ "Loaded item uuid creator doesn't match original");
+ Assert.That(foundItem.Owner, Is.EqualTo(userUuid),
+ "Loaded item owner doesn't match inventory reciever");
Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
}
/// <summary>
/// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
- /// no account exists with the creator name
+ /// no account exists with the creator name
/// </summary>
//[Test]
public void TestLoadIarV0_1TempProfiles()
@@ -353,7 +358,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// <summary>
/// Test replication of an archive path to the user's inventory.
/// </summary>
- [Test]
+ //[Test]
public void TestReplicateArchivePathToUserInventory()
{
TestHelper.InMethod();
--
cgit v1.1
From f8d8f07cb44853710706559632e709af5fc8971b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 5 Aug 2009 18:59:44 +0100
Subject: Remove waiting in TestReplicateArchivePathToUserInventory() since
local inventory loading is synchronous Insert a little more debugging info in
case the occasional failure reoccurs
---
.../Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 7 +++++--
.../Inventory/LocalInventoryServiceConnector.cs | 1 -
2 files changed, 5 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 4928ede..95308ea 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -358,7 +358,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// <summary>
/// Test replication of an archive path to the user's inventory.
/// </summary>
- //[Test]
+ [Test]
public void TestReplicateArchivePathToUserInventory()
{
TestHelper.InMethod();
@@ -367,6 +367,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
userInfo.FetchInventory();
+ /*
for (int i = 0 ; i < 50 ; i++)
{
if (userInfo.HasReceivedInventory == true)
@@ -374,6 +375,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
Thread.Sleep(200);
}
Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
+ */
Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>();
List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>();
@@ -394,7 +396,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null)
.ReplicateArchivePathToUserInventory(itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded);
-
+
+ Console.WriteLine("userInfo.RootFolder: {0}", userInfo.RootFolder);
InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a");
Assert.That(folder1, Is.Not.Null, "Could not find folder a");
InventoryFolderImpl folder2 = folder1.FindFolderByPath("b");
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index a304357..e70d985 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -39,7 +39,6 @@ using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;
using OpenMetaverse;
-
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
{
public class LocalInventoryServicesConnector : ISharedRegionModule, IInventoryService
--
cgit v1.1
From 9e5736eeeccee4c96a0a7b80a099f6705ceb09e3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 5 Aug 2009 19:06:07 +0100
Subject: insert a little more debug info for
TestReplicateArchivePathToUserInventory()
---
.../Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 95308ea..cd14340 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -376,6 +376,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
}
Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
*/
+
+ Console.WriteLine("userInfo.RootFolder 1: {0}", userInfo.RootFolder);
+
Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>();
List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>();
@@ -393,11 +396,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
= string.Format(
"{0}{1}/{2}/{3}",
ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemName);
+
+ Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder);
new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null)
.ReplicateArchivePathToUserInventory(itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded);
- Console.WriteLine("userInfo.RootFolder: {0}", userInfo.RootFolder);
+ Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder);
InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a");
Assert.That(folder1, Is.Not.Null, "Could not find folder a");
InventoryFolderImpl folder2 = folder1.FindFolderByPath("b");
--
cgit v1.1
From 07e00e110d6954eb995382fc0e03af19a46811ab Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 5 Aug 2009 19:38:45 +0100
Subject: Reinstate TestLoadIarV0_1ExistingUsers(), removing unnecessary wait
---
.../Archiver/Tests/InventoryArchiverTests.cs | 23 +++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index cd14340..877a2ac 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -202,19 +202,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
/// an account exists with the creator name.
/// </summary>
- //[Test]
+ [Test]
public void TestLoadIarV0_1ExistingUsers()
{
TestHelper.InMethod();
- //log4net.Config.XmlConfigurator.Configure();
+ log4net.Config.XmlConfigurator.Configure();
string userFirstName = "Mr";
string userLastName = "Tiddles";
UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000555");
- string user2FirstName = "Lord";
- string user2LastName = "Lucan";
- UUID user2Uuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
+ string userItemCreatorFirstName = "Lord";
+ string userItemCreatorLastName = "Lucan";
+ UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
string itemName = "b.lsl";
string archiveItemName
@@ -227,7 +227,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
item1.Name = itemName;
item1.AssetID = UUID.Random();
item1.GroupID = UUID.Random();
- item1.CreatorId = OspResolver.MakeOspa(user2FirstName, user2LastName);
+ item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName);
//item1.CreatorId = userUuid.ToString();
//item1.CreatorId = "00000000-0000-0000-0000-000000000444";
item1.Owner = UUID.Zero;
@@ -249,13 +249,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
userAdminService.AddUser(
userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid);
userAdminService.AddUser(
- user2FirstName, user2LastName, "hampshire", String.Empty, 1000, 1000, user2Uuid);
+ userItemCreatorFirstName, userItemCreatorLastName, "hampshire",
+ String.Empty, 1000, 1000, userItemCreatorUuid);
archiverModule.DearchiveInventory(userFirstName, userLastName, "/", archiveReadStream);
CachedUserInfo userInfo
= scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
- userInfo.FetchInventory();
+ //userInfo.FetchInventory();
+ /*
for (int i = 0 ; i < 50 ; i++)
{
if (userInfo.HasReceivedInventory == true)
@@ -263,18 +265,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
Thread.Sleep(200);
}
Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
+ */
InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName);
Assert.That(foundItem, Is.Not.Null, "Didn't find loaded item");
Assert.That(
foundItem.CreatorId, Is.EqualTo(item1.CreatorId),
"Loaded item non-uuid creator doesn't match original");
Assert.That(
- foundItem.CreatorIdAsUuid, Is.EqualTo(user2Uuid),
+ foundItem.CreatorIdAsUuid, Is.EqualTo(userItemCreatorUuid),
"Loaded item uuid creator doesn't match original");
Assert.That(foundItem.Owner, Is.EqualTo(userUuid),
"Loaded item owner doesn't match inventory reciever");
-
- Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
}
/// <summary>
--
cgit v1.1
From bc6de6f5f0c40db9b9f5073089f75a99f518b219 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 5 Aug 2009 20:05:22 +0100
Subject: Disable TestReplicateArchivePathToUserInventory() pending more
investigation
---
.../Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 877a2ac..14cee36 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -359,7 +359,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// <summary>
/// Test replication of an archive path to the user's inventory.
/// </summary>
- [Test]
+ //[Test]
public void TestReplicateArchivePathToUserInventory()
{
TestHelper.InMethod();
--
cgit v1.1
From e8b0f7cf5d1595b19d884d7f865929ad7e228227 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 5 Aug 2009 20:37:10 +0100
Subject: Remove bad assembly identification tag
---
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 3 ---
1 file changed, 3 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 5471f9e..696f915 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -41,9 +41,6 @@ using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
-[assembly: Addin("SampleMoneyModule", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.5")]
-
namespace OpenSim.Region.OptionalModules.World.MoneyModule
{
/// <summary>
--
cgit v1.1
From efc57bc3d79e9c3c0971a2715a407ad08e030f02 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 6 Aug 2009 02:29:12 +0100
Subject: Allow arbitrary wildcards in config includes. Things like
Include-Modules = "addin-modules/*/config/*.ini" will now work. Adds
Util.Glob, which will resolve a globbed path into a string list.
---
OpenSim/Region/Application/ConfigurationLoader.cs | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 1be36ca..7bb8864 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -188,10 +188,11 @@ namespace OpenSim
{
string path = Path.GetFullPath(
Path.Combine(Util.configDir(), file));
- if (File.Exists(path))
+ string[] paths = Util.Glob(path);
+ foreach (string p in paths)
{
- if (!sources.Contains(path))
- sources.Add(path);
+ if (!sources.Contains(p))
+ sources.Add(p);
}
}
}
--
cgit v1.1