ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made a few changes so that once we enable the sqlite data store (simple line change in OpenSimMain), then basic ( with a few limits at moment) prim database backup will work.

Browse Source
This commit is contained in:
MW
2007-08-10 13:59:19 +00:00
parent 6063d2ce5f
commit 94c7e41ef1
8 changed files with 124 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -151,15 +151,6 @@ namespace OpenSim.Region.Environment.Scenes
Avatars = new Dictionary<LLUUID, ScenePresence>();
Prims = new Dictionary<LLUUID, SceneObjectGroup>();
MainLog.Instance.Verbose("Loading objects from datastore");
List<SceneObjectGroup> PrimsFromDB = storageManager.DataStore.LoadObjects();
foreach (SceneObjectGroup prim in PrimsFromDB)
{
AddEntity(prim);
}
MainLog.Instance.Verbose("Loaded " + PrimsFromDB.Count.ToString() + " object(s)");
MainLog.Instance.Verbose("Creating LandMap");
Terrain = new TerrainEngine((int)this.RegionInfo.RegionLocX, (int)this.RegionInfo.RegionLocY);
@@ -238,7 +229,7 @@ namespace OpenSim.Region.Environment.Scenes
//backup scene data
storageCount++;
if (storageCount > 1200) //set to how often you want to backup
if (storageCount > 600) //set to how often you want to backup
{
Backup();
storageCount = 0;
@@ -462,12 +453,13 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
public void LoadPrimsFromStorage()
{
MainLog.Instance.Verbose("World.cs: LoadPrimsFromStorage() - Loading primitives");
List<SceneObjectGroup> NewObjectsList = storageManager.DataStore.LoadObjects();
foreach (SceneObjectGroup obj in NewObjectsList)
MainLog.Instance.Verbose("Loading objects from datastore");
List<SceneObjectGroup> PrimsFromDB = storageManager.DataStore.LoadObjects();
foreach (SceneObjectGroup prim in PrimsFromDB)
{
this.Objects.Add(obj.UUID, obj);
AddEntityFromStorage(prim);
}
MainLog.Instance.Verbose("Loaded " + PrimsFromDB.Count.ToString() + " object(s)");
}
/// <summary>
@@ -520,6 +512,17 @@ namespace OpenSim.Region.Environment.Scenes
}
}
public void AddEntityFromStorage(SceneObjectGroup sceneObject)
{
sceneObject.RegionHandle = this.m_regionHandle;
sceneObject.SetScene(this);
foreach (SceneObjectPart part in sceneObject.Children.Values)
{
part.LocalID = this.PrimIDAllocate();
}
this.AddEntity(sceneObject);
}
public void AddEntity(SceneObjectGroup sceneObject)
{
Entities.Add(sceneObject.UUID, sceneObject);
@@ -781,7 +784,7 @@ namespace OpenSim.Region.Environment.Scenes
{
if (ent is SceneObjectGroup)
{
// ((SceneObject) ent).SendAllChildPrimsToClient(client);
((SceneObjectGroup) ent).SendFullUpdateToClient(client);
}
}
}