aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Tests/RegionTests.cs
diff options
context:
space:
mode:
authorMic Bowman2011-08-29 09:55:34 -0700
committerMic Bowman2011-08-29 09:55:34 -0700
commit648866b59761cfbd76e2bd267011c935812770d0 (patch)
tree4ff1227fb7fbe684b42deabd07de5831ae6497da /OpenSim/Data/Tests/RegionTests.cs
parentBulletSim: add mesh representation. Use meshes for static objects and switch ... (diff)
parentMove GetMeshKey from buried inside Meshmerizer to a public method on Primitiv... (diff)
downloadopensim-SC_OLD-648866b59761cfbd76e2bd267011c935812770d0.zip
opensim-SC_OLD-648866b59761cfbd76e2bd267011c935812770d0.tar.gz
opensim-SC_OLD-648866b59761cfbd76e2bd267011c935812770d0.tar.bz2
opensim-SC_OLD-648866b59761cfbd76e2bd267011c935812770d0.tar.xz
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Data/Tests/RegionTests.cs')
-rw-r--r--OpenSim/Data/Tests/RegionTests.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index 2b8fa59..cac8cac 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -304,9 +304,9 @@ namespace OpenSim.Data.Tests
304 regionInfo.RegionLocX = 0; 304 regionInfo.RegionLocX = 0;
305 regionInfo.RegionLocY = 0; 305 regionInfo.RegionLocY = 0;
306 306
307// Scene scene = new Scene(regionInfo);
308
309 SceneObjectPart sop = new SceneObjectPart(); 307 SceneObjectPart sop = new SceneObjectPart();
308 SceneObjectGroup sog = new SceneObjectGroup(sop);
309
310 sop.RegionHandle = regionh; 310 sop.RegionHandle = regionh;
311 sop.UUID = uuid; 311 sop.UUID = uuid;
312 sop.LocalId = localid; 312 sop.LocalId = localid;
@@ -373,8 +373,6 @@ namespace OpenSim.Data.Tests
373 373
374 // This is necessary or object will not be inserted in DB 374 // This is necessary or object will not be inserted in DB
375 sop.Flags = PrimFlags.None; 375 sop.Flags = PrimFlags.None;
376
377 SceneObjectGroup sog = new SceneObjectGroup(sop);
378 376
379 // Inserts group in DB 377 // Inserts group in DB
380 db.StoreObject(sog,region3); 378 db.StoreObject(sog,region3);