From 64fa23df7c1ab196ec1b901839e71837403b29ce Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 3 Sep 2009 19:41:38 +0100
Subject: If a test dll fails, stop immediately rather than trying all the
other test dlls This is very useful behaviour if debugging test failures
otherwise it's hard to pick out the test output Also, some minor method
shuffling in the iar module
---
.nant/local.include | 35 ++++++++-------
.../Archiver/InventoryArchiveWriteRequest.cs | 5 ++-
.../Inventory/Archiver/InventoryArchiverModule.cs | 51 +++++++++++-----------
3 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/.nant/local.include b/.nant/local.include
index 510bdc6..6ad893a 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -37,48 +37,47 @@
+
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 4ee90e2..f73a7e3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -199,6 +199,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
InventoryFolderImpl inventoryFolder = null;
InventoryItemBase inventoryItem = null;
+ /*
if (!m_userInfo.HasReceivedInventory)
{
// If the region server has access to the user admin service (by which users are created),
@@ -220,13 +221,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
m_userInfo.FetchInventory();
}
}
+ */
bool foundStar = false;
// Eliminate double slashes and any leading / on the path. This might be better done within InventoryFolderImpl
// itself (possibly at a small loss in efficiency).
string[] components
- = m_invPath.Split(new string[] { InventoryFolderImpl.PATH_DELIMITER }, StringSplitOptions.RemoveEmptyEntries);
+ = m_invPath.Split(
+ new string[] { InventoryFolderImpl.PATH_DELIMITER }, StringSplitOptions.RemoveEmptyEntries);
int maxComponentIndex = components.Length - 1;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index d3ba5fe..c495e02 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
///
private Dictionary m_scenes = new Dictionary();
private Scene m_aScene;
+
///
/// The comms manager we will use for all comms requests
///
@@ -110,8 +111,30 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved;
if (handlerInventoryArchiveSaved != null)
handlerInventoryArchiveSaved(succeeded, userInfo, invPath, saveStream, reportedException);
+ }
+
+ public void ArchiveInventory(string firstName, string lastName, string invPath, Stream saveStream)
+ {
+ if (m_scenes.Count > 0)
+ {
+ CachedUserInfo userInfo = GetUserInfo(firstName, lastName);
+
+ if (userInfo != null)
+ new InventoryArchiveWriteRequest(this, userInfo, invPath, saveStream).Execute();
+ }
+ }
+
+ public void ArchiveInventory(string firstName, string lastName, string invPath, string savePath)
+ {
+ if (m_scenes.Count > 0)
+ {
+ CachedUserInfo userInfo = GetUserInfo(firstName, lastName);
+
+ if (userInfo != null)
+ new InventoryArchiveWriteRequest(this, userInfo, invPath, savePath).Execute();
+ }
}
-
+
public void DearchiveInventory(string firstName, string lastName, string invPath, Stream loadStream)
{
if (m_scenes.Count > 0)
@@ -125,18 +148,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
UpdateClientWithLoadedNodes(userInfo, request.Execute());
}
}
- }
-
- public void ArchiveInventory(string firstName, string lastName, string invPath, Stream saveStream)
- {
- if (m_scenes.Count > 0)
- {
- CachedUserInfo userInfo = GetUserInfo(firstName, lastName);
-
- if (userInfo != null)
- new InventoryArchiveWriteRequest(this, userInfo, invPath, saveStream).Execute();
- }
- }
+ }
public void DearchiveInventory(string firstName, string lastName, string invPath, string loadPath)
{
@@ -151,18 +163,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
UpdateClientWithLoadedNodes(userInfo, request.Execute());
}
}
- }
-
- public void ArchiveInventory(string firstName, string lastName, string invPath, string savePath)
- {
- if (m_scenes.Count > 0)
- {
- CachedUserInfo userInfo = GetUserInfo(firstName, lastName);
-
- if (userInfo != null)
- new InventoryArchiveWriteRequest(this, userInfo, invPath, savePath).Execute();
- }
- }
+ }
///
/// Load inventory from an inventory file archive
--
cgit v1.1
From 9bd0106333771f084ce2774dac8e264d0d91f772 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Thu, 3 Sep 2009 14:55:54 -0400
Subject: some more tooling around on nant / nunit to make it a bit cleaner
---
.nant/local.include | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/.nant/local.include b/.nant/local.include
index 6ad893a..58d1ad1 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -34,50 +34,55 @@
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
--
cgit v1.1
From bc6b4c5bf6a00444bd9553d515983e1fe0b397d5 Mon Sep 17 00:00:00 2001
From: Dave Coyle
Date: Wed, 19 Aug 2009 15:19:18 -0400
Subject: document options in OpenSim.ConsoleClient.ini.example
---
bin/OpenSim.ConsoleClient.ini.example | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/bin/OpenSim.ConsoleClient.ini.example b/bin/OpenSim.ConsoleClient.ini.example
index beea7d8..628ff86 100644
--- a/bin/OpenSim.ConsoleClient.ini.example
+++ b/bin/OpenSim.ConsoleClient.ini.example
@@ -1 +1,12 @@
[Startup]
+ ; set here or use the -user command-line switch
+ ;user = Test
+
+ ; set here or use the -host command-line switch
+ ;host = localhost
+
+ ; set here or use the -port command-line switch
+ ;port = 8003
+
+ ; set here or use the -pass command-line switch
+ ;pass = secret
--
cgit v1.1
From 6b70b5709913e9734f5864560e997b34dfd58b85 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 3 Sep 2009 20:00:18 +0100
Subject: * Add extra warning about using -pass in
OpenSim.ConsoleClient.ini.example
---
bin/OpenSim.ConsoleClient.ini.example | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/bin/OpenSim.ConsoleClient.ini.example b/bin/OpenSim.ConsoleClient.ini.example
index 628ff86..5223d1d 100644
--- a/bin/OpenSim.ConsoleClient.ini.example
+++ b/bin/OpenSim.ConsoleClient.ini.example
@@ -1,12 +1,14 @@
[Startup]
- ; set here or use the -user command-line switch
+ ; Set here or use the -user command-line switch
;user = Test
- ; set here or use the -host command-line switch
+ ; Set here or use the -host command-line switch
;host = localhost
- ; set here or use the -port command-line switch
+ ; Set here or use the -port command-line switch
;port = 8003
- ; set here or use the -pass command-line switch
+ ; Set here or use the -pass command-line switch
+ ; Please be aware that this is not secure since the password is in the clear
+ ; we recommend the use of -pass wherever possible
;pass = secret
--
cgit v1.1
From a3183b20253e90e63152e99370c2e6e4ce61abb8 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Thu, 3 Sep 2009 15:00:53 -0400
Subject: in case ruby is somewhere else in the path (just used for coloring
output)
---
nant-color | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/nant-color b/nant-color
index c4cebb0..b368986 100755
--- a/nant-color
+++ b/nant-color
@@ -1,5 +1,4 @@
-#!/usr/bin/ruby
-
+#!/usr/bin/env ruby
def main
IO.popen("nant #{ARGV.join(' ')}") { |pipe|
--
cgit v1.1