* Started renaming world to Scene

* Update and UpdateMovement now first stores array to avoid collection update exceptions
* Ignored some bins

2 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Framework/General/Interfaces/ILocalStorage.cs b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
index 9d5bb62..1b7b01e 100644
--- a/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
+++ b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Interfaces
         void LoadPrimitives(ILocalStorageReceiver receiver);
 
         [System.Obsolete("Use DataStorage instead")]
-        float[] LoadWorld();
+        float[] LoadScene();
         [System.Obsolete("Use DataStorage instead")]
         void SaveMap(float[] heightmap);
 
diff --git a/OpenSim/Framework/General/Interfaces/IWorld.cs b/OpenSim/Framework/General/Interfaces/IScene.cs
index a474636..ee7a96a 100644
--- a/OpenSim/Framework/General/Interfaces/IWorld.cs
+++ b/OpenSim/Framework/General/Interfaces/IScene.cs
@@ -30,7 +30,7 @@ using OpenSim.Framework.Types;
 
 namespace OpenSim.Framework.Interfaces
 {
-    public interface IWorld
+    public interface IScene
     {
         void AddNewClient(IClientAPI client, bool child);
         void RemoveClient(LLUUID agentID);