diff options
| author | UbitUmarov | 2012-07-17 00:54:23 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-07-17 00:54:23 +0100 |
| commit | d5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch) | |
| tree | 8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs | |
| parent | UbitOde: remove useless water collider from active code. (diff) | |
| parent | Merge branch 'avination' into careminster (diff) | |
| download | opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2 opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs index c13d82e..c7eaff9 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs | |||
| @@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 58 | 58 | ||
| 59 | UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); | 59 | UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); |
| 60 | 60 | ||
| 61 | TestScene scene = SceneHelpers.SetupScene(); | 61 | TestScene scene = new SceneHelpers().SetupScene(); |
| 62 | IConfigSource configSource = new IniConfigSource(); | 62 | IConfigSource configSource = new IniConfigSource(); |
| 63 | 63 | ||
| 64 | IConfig startupConfig = configSource.AddConfig("Startup"); | 64 | IConfig startupConfig = configSource.AddConfig("Startup"); |