diff options
author | Justin Clark-Casey (justincc) | 2009-09-18 19:26:22 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-18 19:26:22 +0100 |
commit | a1e688bdf3ab354104545623bb1784213d479e0a (patch) | |
tree | d29552ec2f6cb3d3136cdab68e36a9969285e88d /OpenSim/Data/Tests | |
parent | Remove old OpenSim.Example.xml file that doesn't keep up with OpenSim.ini.exa... (diff) | |
parent | addition of a new script function osSetParcelSIPAddress(string SIPAddress), n... (diff) | |
download | opensim-SC_OLD-a1e688bdf3ab354104545623bb1784213d479e0a.zip opensim-SC_OLD-a1e688bdf3ab354104545623bb1784213d479e0a.tar.gz opensim-SC_OLD-a1e688bdf3ab354104545623bb1784213d479e0a.tar.bz2 opensim-SC_OLD-a1e688bdf3ab354104545623bb1784213d479e0a.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/Tests/BasicRegionTest.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs index 8474921..c66ab7c 100644 --- a/OpenSim/Data/Tests/BasicRegionTest.cs +++ b/OpenSim/Data/Tests/BasicRegionTest.cs | |||
@@ -322,9 +322,8 @@ namespace OpenSim.Data.Tests | |||
322 | // This is necessary or object will not be inserted in DB | 322 | // This is necessary or object will not be inserted in DB |
323 | sop.ObjectFlags = 0; | 323 | sop.ObjectFlags = 0; |
324 | 324 | ||
325 | SceneObjectGroup sog = new SceneObjectGroup(); | 325 | SceneObjectGroup sog = new SceneObjectGroup(sop); |
326 | sog.SetScene(scene); // Reguired by nhibernate database module. | 326 | sog.SetScene(scene); // Reguired by nhibernate database module. |
327 | sog.SetRootPart(sop); | ||
328 | 327 | ||
329 | // Inserts group in DB | 328 | // Inserts group in DB |
330 | db.StoreObject(sog,region3); | 329 | db.StoreObject(sog,region3); |
@@ -1003,9 +1002,8 @@ namespace OpenSim.Data.Tests | |||
1003 | sop.UUID = uuid; | 1002 | sop.UUID = uuid; |
1004 | sop.Shape = PrimitiveBaseShape.Default; | 1003 | sop.Shape = PrimitiveBaseShape.Default; |
1005 | 1004 | ||
1006 | SceneObjectGroup sog = new SceneObjectGroup(); | 1005 | SceneObjectGroup sog = new SceneObjectGroup(sop); |
1007 | sog.SetScene(scene); | 1006 | sog.SetScene(scene); |
1008 | sog.SetRootPart(sop); | ||
1009 | 1007 | ||
1010 | return sog; | 1008 | return sog; |
1011 | } | 1009 | } |