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

Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

arthursv
Melanie 2009-08-06 21:20:57 +01:00
parent f2498d707d 615e1ed285
commit eb9d584ee0
8 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
View File

@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
[TestFixtureSetUp] [TestFixtureSetUp]
public void Init() public void Init()
{ {
// SQLite doesn't work on power linux // SQLite doesn't work on power or z linux
if (Directory.Exists("/proc/ppc64")) if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
{ {
Assert.Ignore(); Assert.Ignore();
} }
@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
File.Delete(file); File.Delete(file);
} }
} }
} }

4
OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
View File

@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
[TestFixtureSetUp] [TestFixtureSetUp]
public void Init() public void Init()
{ {
// SQLite doesn't work on power linux // SQLite doesn't work on power or z linux
if (Directory.Exists("/proc/ppc64")) if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
{ {
Assert.Ignore(); Assert.Ignore();
} }

4
OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
View File

@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
[TestFixtureSetUp] [TestFixtureSetUp]
public void Init() public void Init()
{ {
// SQLite doesn't work on power linux // SQLite doesn't work on power or z linux
if (Directory.Exists("/proc/ppc64")) if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
{ {
Assert.Ignore(); Assert.Ignore();
} }

6
OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
View File

@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
[TestFixtureSetUp] [TestFixtureSetUp]
public void Init() public void Init()
{ {
// SQLite doesn't work on power linux // SQLite doesn't work on power or z linux
if (Directory.Exists("/proc/ppc64")) if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
{ {
Assert.Ignore(); Assert.Ignore();
} }
@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
File.Delete(file); File.Delete(file);
} }
} }
} }

6
OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
View File

@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
[TestFixtureSetUp] [TestFixtureSetUp]
public void Init() public void Init()
{ {
// SQLite doesn't work on power linux // SQLite doesn't work on power or z linux
if (Directory.Exists("/proc/ppc64")) if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
{ {
Assert.Ignore(); Assert.Ignore();
} }
@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
File.Delete(file); File.Delete(file);
} }
} }
} }

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

@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// <summary> /// <summary>
/// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
/// </summary> /// </summary>
[Test] //[Test]
public void TestSaveIarV0_1() public void TestSaveIarV0_1()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
@ -202,7 +202,7 @@ 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 /// 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. /// an account exists with the creator name.
/// </summary> /// </summary>
[Test] //[Test]
public void TestLoadIarV0_1ExistingUsers() public void TestLoadIarV0_1ExistingUsers()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
@ -367,7 +367,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
CommunicationsManager commsManager = scene.CommsManager; CommunicationsManager commsManager = scene.CommsManager;
CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
userInfo.FetchInventory(); //userInfo.FetchInventory();
/* /*
for (int i = 0 ; i < 50 ; i++) for (int i = 0 ; i < 50 ; i++)
{ {

4
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1218,9 +1218,7 @@ namespace OpenSim.Region.Framework.Scenes
if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
{ {
StandUp(); StandUp();
} }
// Check if Client has camera in 'follow cam' or 'build' mode. // Check if Client has camera in 'follow cam' or 'build' mode.
Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation); Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation);

1
OpenSim/Services/InventoryService/InventoryService.cs
View File

@ -195,7 +195,6 @@ namespace OpenSim.Services.InventoryService
if (skeletonFolders != null) if (skeletonFolders != null)
{ {
InventoryFolderImpl rootFolder = null; InventoryFolderImpl rootFolder = null;
// Need to retrieve the root folder on the first pass // Need to retrieve the root folder on the first pass