aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 215d30d..4156584 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -890,11 +890,12 @@ namespace OpenSim.Region.Environment.Scenes
890 public virtual void LoadPrimsFromStorage(bool m_permissions) 890 public virtual void LoadPrimsFromStorage(bool m_permissions)
891 { 891 {
892 MainLog.Instance.Verbose("SCENE", "Loading objects from datastore"); 892 MainLog.Instance.Verbose("SCENE", "Loading objects from datastore");
893
893 List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(m_regInfo.RegionID); 894 List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(m_regInfo.RegionID);
894 foreach (SceneObjectGroup prim in PrimsFromDB) 895 foreach (SceneObjectGroup group in PrimsFromDB)
895 { 896 {
896 AddEntityFromStorage(prim); 897 AddEntityFromStorage(group);
897 SceneObjectPart rootPart = prim.GetChildPart(prim.UUID); 898 SceneObjectPart rootPart = group.GetChildPart(group.UUID);
898 rootPart.ApplySanePermissions(); 899 rootPart.ApplySanePermissions();
899 900
900 bool UsePhysics = (((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Physics) > 0) && m_physicalPrim); 901 bool UsePhysics = (((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Physics) > 0) && m_physicalPrim);
@@ -909,6 +910,7 @@ namespace OpenSim.Region.Environment.Scenes
909 rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); 910 rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics);
910 rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); 911 rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
911 } 912 }
913
912 MainLog.Instance.Verbose("SCENE", "Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); 914 MainLog.Instance.Verbose("SCENE", "Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)");
913 } 915 }
914 916