aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
diff options
context:
space:
mode:
authorMelanie2013-05-11 01:29:30 +0100
committerMelanie2013-05-11 01:29:30 +0100
commit55c9bc15e571065f66190e017f973f6e1ac43428 (patch)
tree537b8c95902bf343d8aeeef52a38124e0ba7e701 /OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
parentSend up the part missing from the Avination Estate commit. (diff)
parentBulletSim: fix CPU loop that occurs when any 'degenerate' sculptie (diff)
downloadopensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.zip
opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.gz
opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.bz2
opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs')
-rw-r--r--OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
index 30b1f38..2be5524 100644
--- a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
@@ -118,8 +118,8 @@ namespace OpenSim.Tests.Common.Mock
118 118
119 folder.parentFolderID = new UUID(newParent); 119 folder.parentFolderID = new UUID(newParent);
120 120
121 XInventoryFolder[] newParentFolders 121// XInventoryFolder[] newParentFolders
122 = GetFolders(new string[] { "folderID" }, new string[] { folder.parentFolderID.ToString() }); 122// = GetFolders(new string[] { "folderID" }, new string[] { folder.parentFolderID.ToString() });
123 123
124// Console.WriteLine( 124// Console.WriteLine(
125// "Moved folder {0} {1}, to {2} {3}", 125// "Moved folder {0} {1}, to {2} {3}",