aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteRegionData.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-09-18 19:26:22 +0100
committerJustin Clark-Casey (justincc)2009-09-18 19:26:22 +0100
commita1e688bdf3ab354104545623bb1784213d479e0a (patch)
treed29552ec2f6cb3d3136cdab68e36a9969285e88d /OpenSim/Data/SQLite/SQLiteRegionData.cs
parentRemove old OpenSim.Example.xml file that doesn't keep up with OpenSim.ini.exa... (diff)
parentaddition of a new script function osSetParcelSIPAddress(string SIPAddress), n... (diff)
downloadopensim-SC-a1e688bdf3ab354104545623bb1784213d479e0a.zip
opensim-SC-a1e688bdf3ab354104545623bb1784213d479e0a.tar.gz
opensim-SC-a1e688bdf3ab354104545623bb1784213d479e0a.tar.bz2
opensim-SC-a1e688bdf3ab354104545623bb1784213d479e0a.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteRegionData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 0259ac5..ea076fe 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -416,7 +416,6 @@ namespace OpenSim.Data.SQLite
416 416
417 if (uuid == objID) //is new SceneObjectGroup ? 417 if (uuid == objID) //is new SceneObjectGroup ?
418 { 418 {
419 SceneObjectGroup group = new SceneObjectGroup();
420 prim = buildPrim(primRow); 419 prim = buildPrim(primRow);
421 DataRow shapeRow = shapes.Rows.Find(prim.UUID.ToString()); 420 DataRow shapeRow = shapes.Rows.Find(prim.UUID.ToString());
422 if (shapeRow != null) 421 if (shapeRow != null)
@@ -430,7 +429,7 @@ namespace OpenSim.Data.SQLite
430 prim.Shape = PrimitiveBaseShape.Default; 429 prim.Shape = PrimitiveBaseShape.Default;
431 } 430 }
432 431
433 group.SetRootPart(prim); 432 SceneObjectGroup group = new SceneObjectGroup(prim);
434 createdObjects.Add(group.UUID, group); 433 createdObjects.Add(group.UUID, group);
435 retvals.Add(group); 434 retvals.Add(group);
436 LoadItems(prim); 435 LoadItems(prim);