* Moved PrimitiveBaseShape subclasses into factory methods - the subclassing scheme won't hold for serialization

* Extracted out the 'old' AddNewPrimitive that places an object at an exact pos, without the raytracing

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index 065d37d..b5a231e 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -265,7 +265,7 @@ namespace OpenSim.DataStore.MonoSqlite
                             {
                                 MainLog.Instance.Notice(
                                     "No shape found for prim in storage, so setting default box shape");
-                                prim.Shape = BoxShape.Default;
+                                prim.Shape = PrimitiveBaseShape.Default;
                             }
                             group.AddPart(prim);
                             group.RootPart = prim;
@@ -285,7 +285,7 @@ namespace OpenSim.DataStore.MonoSqlite
                             {
                                 MainLog.Instance.Notice(
                                     "No shape found for prim in storage, so setting default box shape");
-                                prim.Shape = BoxShape.Default;
+                                prim.Shape = PrimitiveBaseShape.Default;
                             }
                             createdObjects[new LLUUID(objID)].AddPart(prim);
                         }