From 1ea4ba3a18cf0ccdc512a1cc800e44bc5cf16210 Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 2 Apr 2007 10:46:59 +0000
Subject: Moved database storage of the world map to the Db4LocalStorage so its
in the same database as in world prims are stored.
---
OpenSim.Framework/AgentInventory.cs | 3 +-
OpenSim.Framework/IConfig.cs | 2 -
OpenSim.Framework/ILocalStorage.cs | 2 +
OpenSim.Framework/OpenSim.Framework.csproj | 320 ++++++++++++++---------------
4 files changed, 163 insertions(+), 164 deletions(-)
(limited to 'OpenSim.Framework')
diff --git a/OpenSim.Framework/AgentInventory.cs b/OpenSim.Framework/AgentInventory.cs
index 5c57020..e53d071 100644
--- a/OpenSim.Framework/AgentInventory.cs
+++ b/OpenSim.Framework/AgentInventory.cs
@@ -39,8 +39,7 @@ namespace OpenSim.Framework.Inventory
InventoryRoot.DefaultType = 8;
InventoryRoot.OwnerID = this.AgentID;
InventoryRoot.FolderName = "My Inventory";
- InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);
-
+ InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);
}
public bool CreateNewFolder(LLUUID folderID, ushort type)
diff --git a/OpenSim.Framework/IConfig.cs b/OpenSim.Framework/IConfig.cs
index ca7f645..7b4c040 100644
--- a/OpenSim.Framework/IConfig.cs
+++ b/OpenSim.Framework/IConfig.cs
@@ -66,8 +66,6 @@ namespace OpenSim.Framework.Interfaces
public abstract void InitConfig(bool sandboxMode);
public abstract void LoadFromGrid();
- public abstract float[] LoadWorld();
- public abstract void SaveMap(float[] heightmap);
}
diff --git a/OpenSim.Framework/ILocalStorage.cs b/OpenSim.Framework/ILocalStorage.cs
index e9aa1a2..2c45baa 100644
--- a/OpenSim.Framework/ILocalStorage.cs
+++ b/OpenSim.Framework/ILocalStorage.cs
@@ -39,6 +39,8 @@ namespace OpenSim.Framework.Interfaces
void StorePrim(PrimData prim);
void RemovePrim(LLUUID primID);
void LoadPrimitives(ILocalStorageReceiver receiver);
+ float[] LoadWorld();
+ void SaveMap(float[] heightmap);
void ShutDown();
}
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj
index e93661a..53a20c1 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim.Framework/OpenSim.Framework.csproj
@@ -1,160 +1,160 @@
-
-
- Local
- 8.0.50727
- 2.0
- {7404933D-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenSim.Framework
- JScript
- Grid
- IE50
- false
- Library
-
- OpenSim.Framework
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ../bin/
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ../bin/
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- ..\bin\libsecondlife.dll
- False
-
-
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
+
+
+ Local
+ 8.0.50727
+ 2.0
+ {8ACA2445-0000-0000-0000-000000000000}
+ Debug
+ AnyCPU
+
+
+
+ OpenSim.Framework
+ JScript
+ Grid
+ IE50
+ false
+ Library
+
+ OpenSim.Framework
+
+
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE;DEBUG
+
+ True
+ 4096
+ False
+ ..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE
+
+ False
+ 4096
+ True
+ ..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+
+ System.dll
+ False
+
+
+ System.Xml.dll
+ False
+
+
+ ..\bin\libsecondlife.dll
+ False
+
+
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
--
cgit v1.1