aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Tests
diff options
context:
space:
mode:
authorUbitUmarov2012-07-17 00:54:23 +0100
committerUbitUmarov2012-07-17 00:54:23 +0100
commitd5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch)
tree8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /OpenSim/Data/Tests
parentUbitOde: remove useless water collider from active code. (diff)
parentMerge branch 'avination' into careminster (diff)
downloadopensim-SC_OLD-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip
opensim-SC_OLD-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz
opensim-SC_OLD-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2
opensim-SC_OLD-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Data/Tests')
-rw-r--r--OpenSim/Data/Tests/RegionTests.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index 474609b..dbed8f6 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -1069,8 +1069,6 @@ namespace OpenSim.Data.Tests
1069 regionInfo.RegionLocX = 0; 1069 regionInfo.RegionLocX = 0;
1070 regionInfo.RegionLocY = 0; 1070 regionInfo.RegionLocY = 0;
1071 1071
1072 Scene scene = new Scene(regionInfo);
1073
1074 SceneObjectPart sop = new SceneObjectPart(); 1072 SceneObjectPart sop = new SceneObjectPart();
1075 sop.Name = name; 1073 sop.Name = name;
1076 sop.Description = name; 1074 sop.Description = name;
@@ -1081,7 +1079,7 @@ namespace OpenSim.Data.Tests
1081 sop.Shape = PrimitiveBaseShape.Default; 1079 sop.Shape = PrimitiveBaseShape.Default;
1082 1080
1083 SceneObjectGroup sog = new SceneObjectGroup(sop); 1081 SceneObjectGroup sog = new SceneObjectGroup(sop);
1084 sog.SetScene(scene); 1082// sog.SetScene(scene);
1085 1083
1086 return sog; 1084 return sog;
1087 } 1085 }