diff options
author | MW | 2007-08-10 17:22:54 +0000 |
---|---|---|
committer | MW | 2007-08-10 17:22:54 +0000 |
commit | 79f0ac82e328e325df28f3af3d4c98a7885a44f5 (patch) | |
tree | 2322942186b99ad92990ad7dcb79e6abdd8bed83 /OpenSim/Region/Environment | |
parent | Renamed Compiler.LSL to Compiler.LSO (diff) | |
download | opensim-SC_OLD-79f0ac82e328e325df28f3af3d4c98a7885a44f5.zip opensim-SC_OLD-79f0ac82e328e325df28f3af3d4c98a7885a44f5.tar.gz opensim-SC_OLD-79f0ac82e328e325df28f3af3d4c98a7885a44f5.tar.bz2 opensim-SC_OLD-79f0ac82e328e325df28f3af3d4c98a7885a44f5.tar.xz |
Some cleaning up and removed a few old files no longer in use.
Temporary have had to rename the OpenSim.DataStore.MonoSqlite project to OpenSim.DataStore.MonoSqlite1, as I'm not sure what was done to stop the old project name being included in the VS2005 solution.
Also some config changes:
OpenSim now has a INI (OpenSim.ini) file that it will read some config settings from (if the ini file exists).
Added Mono.Data.SqliteClient.dll so that we can use the same code for sqlite on Windows and mono/linux. (from what I can tell Mono class libraries have a MIT license so there should be no problems with us including this dll).
So now to get the basic prim storage working , you need to first create the sqlite database file from the sqlite3-prims.sql in share directory. Then in the OpenSim.ini file, change the storage_plugin so it points to OpenSim.DataStore.MonoSqlite1.dll (storage_plugin = OpenSim.DataStore.MonoSqlite1.dll). Then in your region.xml files change the DataStore value so it is the name of your database file (at the moment you need a different sqlite3 database file for each region).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/LandManagement/LandManager.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 15 |
3 files changed, 5 insertions, 16 deletions
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs index f67b51a..5bc975c 100644 --- a/OpenSim/Region/Environment/LandManagement/LandManager.cs +++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment.LandManagement | |||
41 | /// <summary> | 41 | /// <summary> |
42 | /// Handles Land objects and operations requiring information from other Land objects (divide, join, etc) | 42 | /// Handles Land objects and operations requiring information from other Land objects (divide, join, etc) |
43 | /// </summary> | 43 | /// </summary> |
44 | public class LandManager : ILocalStorageLandObjectReceiver | 44 | public class LandManager |
45 | { | 45 | { |
46 | 46 | ||
47 | #region Constants | 47 | #region Constants |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index cae57a2..d3c7f77 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
50 | 50 | ||
51 | public delegate void ForEachScenePresenceDelegate(ScenePresence presence); | 51 | public delegate void ForEachScenePresenceDelegate(ScenePresence presence); |
52 | 52 | ||
53 | public partial class Scene : SceneBase, ILocalStorageReceiver | 53 | public partial class Scene : SceneBase |
54 | { | 54 | { |
55 | protected Timer m_heartbeatTimer = new Timer(); | 55 | protected Timer m_heartbeatTimer = new Timer(); |
56 | protected Dictionary<LLUUID, ScenePresence> Avatars; | 56 | protected Dictionary<LLUUID, ScenePresence> Avatars; |
@@ -229,7 +229,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
229 | 229 | ||
230 | //backup scene data | 230 | //backup scene data |
231 | storageCount++; | 231 | storageCount++; |
232 | if (storageCount > 1200) //set to how often you want to backup | 232 | if (storageCount > 600) //set to how often you want to backup |
233 | { | 233 | { |
234 | Backup(); | 234 | Backup(); |
235 | storageCount = 0; | 235 | storageCount = 0; |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 114623a..1be1e7a 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -665,19 +665,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
665 | } | 665 | } |
666 | } | 666 | } |
667 | 667 | ||
668 | public static void CreateDefaultTextureEntry(string name) | 668 | public static void CreateDefaultTextureEntry() |
669 | { | 669 | { |
670 | /* FileInfo fInfo = new FileInfo(name); | ||
671 | long numBytes = fInfo.Length; | ||
672 | FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read); | ||
673 | BinaryReader br = new BinaryReader(fStream); | ||
674 | byte[] data1 = br.ReadBytes((int)numBytes); | ||
675 | br.Close(); | ||
676 | fStream.Close(); | ||
677 | DefaultTexture = data1; | ||
678 | LLObject.TextureEntry textu = new LLObject.TextureEntry(data1, 0, data1.Length); | ||
679 | Console.WriteLine("default texture entry: " + textu.ToString());*/ | ||
680 | |||
681 | LLObject.TextureEntry textu = new LLObject.TextureEntry(new LLUUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97")); | 670 | LLObject.TextureEntry textu = new LLObject.TextureEntry(new LLUUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97")); |
682 | textu.CreateFace(0).TextureID = new LLUUID("00000000-0000-1111-9999-000000000012"); | 671 | textu.CreateFace(0).TextureID = new LLUUID("00000000-0000-1111-9999-000000000012"); |
683 | textu.CreateFace(1).TextureID = new LLUUID("5748decc-f629-461c-9a36-a35a221fe21f"); | 672 | textu.CreateFace(1).TextureID = new LLUUID("5748decc-f629-461c-9a36-a35a221fe21f"); |