* Catch directory exception on load oar as well as file exception0.6.6-post-fixes
parent
ad7214620f
commit
29671fc103
|
@ -1115,7 +1115,11 @@ namespace OpenSim
|
|||
}
|
||||
catch (FileNotFoundException)
|
||||
{
|
||||
m_console.Error("Specified oar not found. Usage: load oar <filename>");
|
||||
m_console.Error("Specified oar file not found.");
|
||||
}
|
||||
catch (DirectoryNotFoundException)
|
||||
{
|
||||
m_console.Error("Specified directory not found.");
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@ -1126,7 +1130,7 @@ namespace OpenSim
|
|||
}
|
||||
catch (FileNotFoundException)
|
||||
{
|
||||
m_console.Error("Default oar not found. Usage: load oar <filename>");
|
||||
m_console.Error("Default oar file not found.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -67,10 +67,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
|
|||
/// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
|
||||
/// </summary>
|
||||
//[Test]
|
||||
public void TestSaveIarV0p1()
|
||||
public void TestSaveIarV0_1()
|
||||
{
|
||||
TestHelper.InMethod();
|
||||
//log4net.Config.XmlConfigurator.Configure();
|
||||
log4net.Config.XmlConfigurator.Configure();
|
||||
|
||||
InventoryArchiverModule archiverModule = new InventoryArchiverModule();
|
||||
|
||||
|
@ -198,11 +198,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
|
|||
/// an account exists with the creator name.
|
||||
/// </summary>
|
||||
[Test]
|
||||
public void TestLoadIarV0p1ExistingUsers()
|
||||
public void TestLoadIarV0_1ExistingUsers()
|
||||
{
|
||||
Assert.Ignore();
|
||||
TestHelper.InMethod();
|
||||
Console.WriteLine("Started {0}", MethodBase.GetCurrentMethod());
|
||||
|
||||
//log4net.Config.XmlConfigurator.Configure();
|
||||
|
||||
|
@ -266,7 +265,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
|
|||
/// no account exists with the creator name
|
||||
/// </summary>
|
||||
[Test]
|
||||
public void TestLoadIarV0p1TempProfiles()
|
||||
public void TestLoadIarV0_1TempProfiles()
|
||||
{
|
||||
Assert.Ignore();
|
||||
TestHelper.InMethod();
|
||||
|
|
|
@ -78,10 +78,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
|
|||
/// Test saving a V0.2 OpenSim Region Archive.
|
||||
/// </summary>
|
||||
[Test]
|
||||
public void TestSaveOarV0p2()
|
||||
public void TestSaveOarV0_2()
|
||||
{
|
||||
TestHelper.InMethod();
|
||||
log4net.Config.XmlConfigurator.Configure();
|
||||
//log4net.Config.XmlConfigurator.Configure();
|
||||
|
||||
ArchiverModule archiverModule = new ArchiverModule();
|
||||
SerialiserModule serialiserModule = new SerialiserModule();
|
||||
|
@ -202,7 +202,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
|
|||
/// Test loading a V0.2 OpenSim Region Archive.
|
||||
/// </summary>
|
||||
[Test]
|
||||
public void TestLoadOarV0p2()
|
||||
public void TestLoadOarV0_2()
|
||||
{
|
||||
TestHelper.InMethod();
|
||||
//log4net.Config.XmlConfigurator.Configure();
|
||||
|
@ -275,7 +275,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
|
|||
/// Test merging a V0.2 OpenSim Region Archive into an existing scene
|
||||
/// </summary>
|
||||
//[Test]
|
||||
public void TestMergeOarV0p2()
|
||||
public void TestMergeOarV0_2()
|
||||
{
|
||||
TestHelper.InMethod();
|
||||
//XmlConfigurator.Configure();
|
||||
|
|
Loading…
Reference in New Issue