2 files changed, 6 insertions, 41 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1ba23b4..3abd96d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -439,7 +439,11 @@ namespace OpenSim.Region.Environment.Scenes
         public void LoadPrimsFromStorage()
         {
             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>
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 4326553..2c50e4d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -48,7 +48,6 @@ namespace OpenSim.Region.Environment.Scenes
         public TerrainEngine Terrain;
 
         protected string m_datastore;
-        public ILocalStorage localStorage;
 
         protected object m_syncRoot = new object();
         private uint m_nextLocalId = 8880000;
@@ -70,44 +69,6 @@ namespace OpenSim.Region.Environment.Scenes
         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>
         /// Send the region heightmap to the client
         /// </summary>
         /// <param name="RemoteClient">Client to send to</param>
@@ -173,7 +134,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             try
             {
-                this.localStorage.ShutDown();
+                //TODO: Add cleanup code for storage manager, etc.
             }
             catch (Exception e)
             {