diff options
| author | Melanie | 2013-05-11 02:35:26 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-11 02:35:26 +0100 |
| commit | 13cd8c17d781c517e083cdf9d5cc3b1b95802c2d (patch) | |
| tree | 41e9d608cc0fbb486ae885d4c9e9a6ad85e39ff3 /OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.zip opensim-SC-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.gz opensim-SC-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.bz2 opensim-SC-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs | 4 |
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}", |