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/ClientStack | |
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 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/Assets/InventoryCache.cs | 23 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 2 |
3 files changed, 2 insertions, 25 deletions
diff --git a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs index c0609b6..8185502 100644 --- a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs +++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs | |||
@@ -64,17 +64,6 @@ namespace OpenSim.Assets | |||
64 | } | 64 | } |
65 | } | 65 | } |
66 | 66 | ||
67 | public AgentInventory FetchAgentsInventory(LLUUID agentID, IUserServer userserver) | ||
68 | { | ||
69 | AgentInventory res = null; | ||
70 | if (!this._agentsInventory.ContainsKey(agentID)) | ||
71 | { | ||
72 | res = userserver.RequestAgentsInventory(agentID); | ||
73 | this._agentsInventory.Add(agentID,res); | ||
74 | } | ||
75 | return res; | ||
76 | } | ||
77 | |||
78 | public AgentInventory GetAgentsInventory(LLUUID agentID) | 67 | public AgentInventory GetAgentsInventory(LLUUID agentID) |
79 | { | 68 | { |
80 | if (this._agentsInventory.ContainsKey(agentID)) | 69 | if (this._agentsInventory.ContainsKey(agentID)) |
@@ -85,18 +74,6 @@ namespace OpenSim.Assets | |||
85 | return null; | 74 | return null; |
86 | } | 75 | } |
87 | 76 | ||
88 | public void ClientLeaving(LLUUID clientID, IUserServer userserver) | ||
89 | { | ||
90 | if (this._agentsInventory.ContainsKey(clientID)) | ||
91 | { | ||
92 | if (userserver != null) | ||
93 | { | ||
94 | userserver.UpdateAgentsInventory(clientID, this._agentsInventory[clientID]); | ||
95 | } | ||
96 | this._agentsInventory.Remove(clientID); | ||
97 | } | ||
98 | } | ||
99 | |||
100 | public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID) | 77 | public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID) |
101 | { | 78 | { |
102 | return this.CreateNewInventoryFolder(remoteClient, folderID, 0); | 79 | return this.CreateNewInventoryFolder(remoteClient, folderID, 0); |
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index e693c64..1375f6c 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -120,7 +120,7 @@ namespace OpenSim.Region.ClientStack | |||
120 | public void KillClient() | 120 | public void KillClient() |
121 | { | 121 | { |
122 | clientPingTimer.Stop(); | 122 | clientPingTimer.Stop(); |
123 | this.m_inventoryCache.ClientLeaving(this.AgentID, null); | 123 | |
124 | m_scene.RemoveClient(this.AgentId); | 124 | m_scene.RemoveClient(this.AgentId); |
125 | 125 | ||
126 | m_clientThreads.Remove(this.CircuitCode); | 126 | m_clientThreads.Remove(this.CircuitCode); |
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 05c970a..d47450a 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Region.ClientStack | |||
70 | 70 | ||
71 | Initialize(); | 71 | Initialize(); |
72 | 72 | ||
73 | ScenePresence.CreateDefaultTextureEntry("avatar-texture.dat"); | 73 | ScenePresence.CreateDefaultTextureEntry(); |
74 | 74 | ||
75 | m_httpServer = new BaseHttpServer( m_httpServerPort ); | 75 | m_httpServer = new BaseHttpServer( m_httpServerPort ); |
76 | 76 | ||