OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Cleaned out remaining references to the old LocalStorage system in prep. to move to StorageManager.

afrisby
Adam Frisby 2007-07-19 00:42:59 +00:00
parent f29acf95b0
commit 920ffaf24b
4 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -111,7 +111,6 @@ namespace OpenSim.Region.ClientStack
udpServer.LocalWorld = scene; udpServer.LocalWorld = scene;
scene.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll");
scene.LoadWorldMap(); scene.LoadWorldMap();
scene.PhysScene = GetPhysicsScene( ); scene.PhysScene = GetPhysicsScene( );
@ -124,13 +123,13 @@ namespace OpenSim.Region.ClientStack
{ {
m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]");
scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
scene.localStorage.LoadLandObjects((ILocalStorageLandObjectReceiver)scene.LandManager); //TODO: Load parcels from storageManager
} }
else else
{ {
m_log.Notice("Parcels - No master avatar found, using null."); m_log.Notice("Parcels - No master avatar found, using null.");
scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero; scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero;
scene.localStorage.LoadLandObjects((ILocalStorageLandObjectReceiver)scene.LandManager); //TODO: Load parcels from storageManager
} }
scene.performParcelPrimCountUpdate(); scene.performParcelPrimCountUpdate();
scene.StartTimer(); scene.StartTimer();

2
OpenSim/Region/Environment/LandManagement/LandManager.cs
View File

@ -174,7 +174,7 @@ namespace OpenSim.Region.Environment.LandManagement
} }
} }
} }
m_world.localStorage.RemoveLandObject(landList[local_id].landData); // TODO: Put event here for storage manager to bind to.
landList.Remove(local_id); landList.Remove(local_id);
} }

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

@ -439,7 +439,11 @@ namespace OpenSim.Region.Environment.Scenes
public void LoadPrimsFromStorage() public void LoadPrimsFromStorage()
{ {
MainLog.Instance.Verbose("World.cs: LoadPrimsFromStorage() - Loading primitives"); MainLog.Instance.Verbose("World.cs: LoadPrimsFromStorage() - Loading primitives");
localStorage.LoadPrimitives(this); List<SceneObject> NewObjectsList = storageManager.DataStore.LoadObjects();
foreach (SceneObject obj in NewObjectsList)
{
this.Objects.Add(obj.rootUUID, obj);
}
} }
/// <summary> /// <summary>

41
OpenSim/Region/Environment/Scenes/SceneBase.cs
View File

@ -48,7 +48,6 @@ namespace OpenSim.Region.Environment.Scenes
public TerrainEngine Terrain; public TerrainEngine Terrain;
protected string m_datastore; protected string m_datastore;
public ILocalStorage localStorage;
protected object m_syncRoot = new object(); protected object m_syncRoot = new object();
private uint m_nextLocalId = 8880000; private uint m_nextLocalId = 8880000;
@ -69,44 +68,6 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
public abstract void LoadWorldMap(); public abstract void LoadWorldMap();
/// <summary>
/// Loads a new storage subsystem from a named library
/// </summary>
/// <param name="dllName">Storage Library</param>
/// <returns>Successful or not</returns>
public bool LoadStorageDLL(string dllName)
{
Assembly pluginAssembly = Assembly.LoadFrom(dllName);
ILocalStorage store = null;
foreach (Type pluginType in pluginAssembly.GetTypes())
{
if (pluginType.IsPublic)
{
if (!pluginType.IsAbstract)
{
Type typeInterface = pluginType.GetInterface("ILocalStorage", true);
if (typeInterface != null)
{
ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
store = plug;
store.Initialise(this.m_datastore);
break;
}
typeInterface = null;
}
}
}
pluginAssembly = null;
this.localStorage = store;
return (store == null);
}
/// <summary> /// <summary>
/// Send the region heightmap to the client /// Send the region heightmap to the client
/// </summary> /// </summary>
@ -173,7 +134,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
try try
{ {
this.localStorage.ShutDown(); //TODO: Add cleanup code for storage manager, etc.
} }
catch (Exception e) catch (Exception e)
{ {