diff options
author | MW | 2007-09-10 06:45:54 +0000 |
---|---|---|
committer | MW | 2007-09-10 06:45:54 +0000 |
commit | 15423539f98d47201a819e35f80b0c30ee459556 (patch) | |
tree | 3eb7831bfaaf5e0309c49f966d19869a9fe72e2b /OpenSim/Region/ClientStack | |
parent | * Fixed: Accessing xmlrpc with invalid xml data would crash the sim. (diff) | |
download | opensim-SC-15423539f98d47201a819e35f80b0c30ee459556.zip opensim-SC-15423539f98d47201a819e35f80b0c30ee459556.tar.gz opensim-SC-15423539f98d47201a819e35f80b0c30ee459556.tar.bz2 opensim-SC-15423539f98d47201a819e35f80b0c30ee459556.tar.xz |
hooked up sdague new sqlite asset database provider to the old asset system. So we can still use sqlite for assets while we wait for the rest of the new asset system to be wrote.
Needs more testing, so if it causes problems will have to swap back to db4o.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs index 082eec2..e2617b3 100644 --- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs +++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ClientStack | |||
58 | 58 | ||
59 | protected bool AgentTextureCached(ClientView simclient, Packet packet) | 59 | protected bool AgentTextureCached(ClientView simclient, Packet packet) |
60 | { | 60 | { |
61 | // Console.WriteLine(packet.ToString()); | 61 | //System.Console.WriteLine("texture cached: " + packet.ToString()); |
62 | AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet; | 62 | AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet; |
63 | AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket(); | 63 | AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket(); |
64 | cachedresp.AgentData.AgentID = this.AgentID; | 64 | cachedresp.AgentData.AgentID = this.AgentID; |
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index a35666d..4e2599f 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | |||
@@ -170,6 +170,7 @@ namespace OpenSim.Region.ClientStack | |||
170 | } | 170 | } |
171 | break; | 171 | break; |
172 | case PacketType.AgentSetAppearance: | 172 | case PacketType.AgentSetAppearance: |
173 | //OpenSim.Framework.Console.MainLog.Instance.Verbose("set appear", Pack.ToString()); | ||
173 | AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack; | 174 | AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack; |
174 | if (OnSetAppearance != null) | 175 | if (OnSetAppearance != null) |
175 | { | 176 | { |
@@ -366,8 +367,9 @@ namespace OpenSim.Region.ClientStack | |||
366 | m_assetCache.AddAssetRequest(this, transfer); | 367 | m_assetCache.AddAssetRequest(this, transfer); |
367 | break; | 368 | break; |
368 | case PacketType.AssetUploadRequest: | 369 | case PacketType.AssetUploadRequest: |
369 | //Console.WriteLine("upload request " + Pack.ToString()); | ||
370 | AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; | 370 | AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; |
371 | // Console.WriteLine("upload request " + Pack.ToString()); | ||
372 | // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionID).ToStringHyphenated()); | ||
371 | if (OnAssetUploadRequest != null) | 373 | if (OnAssetUploadRequest != null) |
372 | { | 374 | { |
373 | OnAssetUploadRequest(this, request.AssetBlock.TransactionID.Combine(this.SecureSessionID), request.AssetBlock.TransactionID, request.AssetBlock.Type, request.AssetBlock.AssetData, request.AssetBlock.StoreLocal); | 375 | OnAssetUploadRequest(this, request.AssetBlock.TransactionID.Combine(this.SecureSessionID), request.AssetBlock.TransactionID, request.AssetBlock.Type, request.AssetBlock.AssetData, request.AssetBlock.StoreLocal); |