diff options
author | John Hurliman | 2009-09-16 15:06:08 -0700 |
---|---|---|
committer | John Hurliman | 2009-09-16 15:06:08 -0700 |
commit | f42d085ab17098709bcba0c816c9742a213d3c01 (patch) | |
tree | cdf3af0cf5e65ad949f07afc80d28a29954bfa42 /OpenSim/Data/SQLite | |
parent | Add the Null storage implementation for the RegionData service. Standalones (diff) | |
download | opensim-SC-f42d085ab17098709bcba0c816c9742a213d3c01.zip opensim-SC-f42d085ab17098709bcba0c816c9742a213d3c01.tar.gz opensim-SC-f42d085ab17098709bcba0c816c9742a213d3c01.tar.bz2 opensim-SC-f42d085ab17098709bcba0c816c9742a213d3c01.tar.xz |
SceneObjectGroup cleanup. Removes the default constructor and unnecessary null checks on m_rootPart
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 3 |
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); |