ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some cleaning up and removed a few old files no longer in use.

Browse Source 
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).
This commit is contained in:
MW
2007-08-10 17:22:54 +00:00
parent 8b17e4da10
commit 79f0ac82e3
18 changed files with 251 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment.LandManagement
/// <summary>
/// Handles Land objects and operations requiring information from other Land objects (divide, join, etc)
/// </summary>
public class LandManager : ILocalStorageLandObjectReceiver
public class LandManager
{
#region Constants

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

@@ -50,7 +50,7 @@ namespace OpenSim.Region.Environment.Scenes
public delegate void ForEachScenePresenceDelegate(ScenePresence presence);
public partial class Scene : SceneBase, ILocalStorageReceiver
public partial class Scene : SceneBase
{
protected Timer m_heartbeatTimer = new Timer();
protected Dictionary<LLUUID, ScenePresence> Avatars;
@@ -229,7 +229,7 @@ namespace OpenSim.Region.Environment.Scenes
//backup scene data
storageCount++;
if (storageCount > 1200) //set to how often you want to backup
if (storageCount > 600) //set to how often you want to backup
{
Backup();
storageCount = 0;

13
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@@ -665,19 +665,8 @@ namespace OpenSim.Region.Environment.Scenes
}
}
public static void CreateDefaultTextureEntry(string name)
public static void CreateDefaultTextureEntry()
{
/* FileInfo fInfo = new FileInfo(name);
long numBytes = fInfo.Length;
FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);
BinaryReader br = new BinaryReader(fStream);
byte[] data1 = br.ReadBytes((int)numBytes);
br.Close();
fStream.Close();
DefaultTexture = data1;
LLObject.TextureEntry textu = new LLObject.TextureEntry(data1, 0, data1.Length);
Console.WriteLine("default texture entry: " + textu.ToString());*/
LLObject.TextureEntry textu = new LLObject.TextureEntry(new LLUUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97"));
textu.CreateFace(0).TextureID = new LLUUID("00000000-0000-1111-9999-000000000012");
textu.CreateFace(1).TextureID = new LLUUID("5748decc-f629-461c-9a36-a35a221fe21f");