aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-08-06 21:20:57 +0100
committerMelanie2009-08-06 21:20:57 +0100
commiteb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e (patch)
treea5b3d1ab68f5b9974cfed174c96f25cd710b542e
parentAdd the addon modules folder (diff)
parentgoose panda (diff)
downloadopensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.zip
opensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.gz
opensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.bz2
opensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs6
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs4
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs4
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs6
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs6
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
-rw-r--r--OpenSim/Services/InventoryService/InventoryService.cs1
8 files changed, 17 insertions, 20 deletions
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
index f030531..0c2f5df 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
41 [TestFixtureSetUp] 41 [TestFixtureSetUp]
42 public void Init() 42 public void Init()
43 { 43 {
44 // SQLite doesn't work on power linux 44 // SQLite doesn't work on power or z linux
45 if (Directory.Exists("/proc/ppc64")) 45 if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
46 { 46 {
47 Assert.Ignore(); 47 Assert.Ignore();
48 } 48 }
@@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
61 File.Delete(file); 61 File.Delete(file);
62 } 62 }
63 } 63 }
64} \ No newline at end of file 64}
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
index 1249e76..30f6641 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
41 [TestFixtureSetUp] 41 [TestFixtureSetUp]
42 public void Init() 42 public void Init()
43 { 43 {
44 // SQLite doesn't work on power linux 44 // SQLite doesn't work on power or z linux
45 if (Directory.Exists("/proc/ppc64")) 45 if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
46 { 46 {
47 Assert.Ignore(); 47 Assert.Ignore();
48 } 48 }
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
index 17fa86c..98458a3 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
41 [TestFixtureSetUp] 41 [TestFixtureSetUp]
42 public void Init() 42 public void Init()
43 { 43 {
44 // SQLite doesn't work on power linux 44 // SQLite doesn't work on power or z linux
45 if (Directory.Exists("/proc/ppc64")) 45 if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
46 { 46 {
47 Assert.Ignore(); 47 Assert.Ignore();
48 } 48 }
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
index 7a75808..abb97cf 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
41 [TestFixtureSetUp] 41 [TestFixtureSetUp]
42 public void Init() 42 public void Init()
43 { 43 {
44 // SQLite doesn't work on power linux 44 // SQLite doesn't work on power or z linux
45 if (Directory.Exists("/proc/ppc64")) 45 if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
46 { 46 {
47 Assert.Ignore(); 47 Assert.Ignore();
48 } 48 }
@@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
61 File.Delete(file); 61 File.Delete(file);
62 } 62 }
63 } 63 }
64} \ No newline at end of file 64}
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
index 52dac39..c9953c5 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
41 [TestFixtureSetUp] 41 [TestFixtureSetUp]
42 public void Init() 42 public void Init()
43 { 43 {
44 // SQLite doesn't work on power linux 44 // SQLite doesn't work on power or z linux
45 if (Directory.Exists("/proc/ppc64")) 45 if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
46 { 46 {
47 Assert.Ignore(); 47 Assert.Ignore();
48 } 48 }
@@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
61 File.Delete(file); 61 File.Delete(file);
62 } 62 }
63 } 63 }
64} \ No newline at end of file 64}
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 14cee36..12d3e95 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
66 /// <summary> 66 /// <summary>
67 /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). 67 /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
68 /// </summary> 68 /// </summary>
69 [Test] 69 //[Test]
70 public void TestSaveIarV0_1() 70 public void TestSaveIarV0_1()
71 { 71 {
72 TestHelper.InMethod(); 72 TestHelper.InMethod();
@@ -202,7 +202,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
202 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where 202 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
203 /// an account exists with the creator name. 203 /// an account exists with the creator name.
204 /// </summary> 204 /// </summary>
205 [Test] 205 //[Test]
206 public void TestLoadIarV0_1ExistingUsers() 206 public void TestLoadIarV0_1ExistingUsers()
207 { 207 {
208 TestHelper.InMethod(); 208 TestHelper.InMethod();
@@ -367,7 +367,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
367 CommunicationsManager commsManager = scene.CommsManager; 367 CommunicationsManager commsManager = scene.CommsManager;
368 368
369 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); 369 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
370 userInfo.FetchInventory(); 370 //userInfo.FetchInventory();
371 /* 371 /*
372 for (int i = 0 ; i < 50 ; i++) 372 for (int i = 0 ; i < 50 ; i++)
373 { 373 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index fa1fd89..50baa9b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1218,9 +1218,7 @@ namespace OpenSim.Region.Framework.Scenes
1218 if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) 1218 if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
1219 { 1219 {
1220 StandUp(); 1220 StandUp();
1221 } 1221 }
1222
1223
1224 1222
1225 // Check if Client has camera in 'follow cam' or 'build' mode. 1223 // Check if Client has camera in 'follow cam' or 'build' mode.
1226 Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation); 1224 Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation);
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index 86a903c..ea34195 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -195,7 +195,6 @@ namespace OpenSim.Services.InventoryService
195 195
196 if (skeletonFolders != null) 196 if (skeletonFolders != null)
197 { 197 {
198
199 InventoryFolderImpl rootFolder = null; 198 InventoryFolderImpl rootFolder = null;
200 199
201 // Need to retrieve the root folder on the first pass 200 // Need to retrieve the root folder on the first pass