aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim.RegionServer/AgentAssetUpload.cs6
-rw-r--r--OpenSim.RegionServer/SimClient.cs22
2 files changed, 25 insertions, 3 deletions
diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs
index f6b388d..722da53 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim.RegionServer/AgentAssetUpload.cs
@@ -41,6 +41,7 @@ namespace OpenSim
41 response.AssetBlock.Success = true; 41 response.AssetBlock.Success = true;
42 response.AssetBlock.UUID = transactionID.Combine(this.ourClient.SecureSessionID); 42 response.AssetBlock.UUID = transactionID.Combine(this.ourClient.SecureSessionID);
43 this.ourClient.OutPacket(response); 43 this.ourClient.OutPacket(response);
44 m_assetCache.AddAsset(asset);
44 } 45 }
45 else 46 else
46 { 47 {
@@ -150,10 +151,11 @@ namespace OpenSim
150 response.AssetBlock.UUID = trans.TransactionID.Combine(this.ourClient.SecureSessionID); 151 response.AssetBlock.UUID = trans.TransactionID.Combine(this.ourClient.SecureSessionID);
151 this.ourClient.OutPacket(response); 152 this.ourClient.OutPacket(response);
152 153
154 m_assetCache.AddAsset(trans.Asset);
153 //check if we should add it to inventory 155 //check if we should add it to inventory
154 if (trans.AddToInventory) 156 if (trans.AddToInventory)
155 { 157 {
156 m_assetCache.AddAsset(trans.Asset); 158 // m_assetCache.AddAsset(trans.Asset);
157 m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset); 159 m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset);
158 } 160 }
159 161
@@ -201,7 +203,7 @@ namespace OpenSim
201 if (trans.UploadComplete) 203 if (trans.UploadComplete)
202 { 204 {
203 //already complete so we can add it to the inventory 205 //already complete so we can add it to the inventory
204 m_assetCache.AddAsset(trans.Asset); 206 //m_assetCache.AddAsset(trans.Asset);
205 Console.WriteLine( "Item created is " +m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset).ToStringHyphenated()); 207 Console.WriteLine( "Item created is " +m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset).ToStringHyphenated());
206 } 208 }
207 else 209 else
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 0985447..6ea9e6e 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -69,7 +69,7 @@ namespace OpenSim
69 private const int MAX_SEQUENCE = 0xFFFFFF; 69 private const int MAX_SEQUENCE = 0xFFFFFF;
70 private AgentAssetUpload UploadAssets; 70 private AgentAssetUpload UploadAssets;
71 private LLUUID newAssetFolder = LLUUID.Zero; 71 private LLUUID newAssetFolder = LLUUID.Zero;
72 private bool debug = false; 72 private bool debug = true;//false;
73 private World m_world; 73 private World m_world;
74 private Dictionary<uint, SimClient> m_clientThreads; 74 private Dictionary<uint, SimClient> m_clientThreads;
75 private AssetCache m_assetCache; 75 private AssetCache m_assetCache;
@@ -78,6 +78,7 @@ namespace OpenSim
78 private OpenSimNetworkHandler m_application; 78 private OpenSimNetworkHandler m_application;
79 private InventoryCache m_inventoryCache; 79 private InventoryCache m_inventoryCache;
80 private bool m_sandboxMode; 80 private bool m_sandboxMode;
81 private int cachedtextureserial = 0;
81 82
82 83
83 public IUserServer UserServer 84 public IUserServer UserServer
@@ -149,6 +150,25 @@ namespace OpenSim
149 // Console.WriteLine(appear.ToString()); 150 // Console.WriteLine(appear.ToString());
150 this.ClientAvatar.SetAppearance(appear); 151 this.ClientAvatar.SetAppearance(appear);
151 break; 152 break;
153 case PacketType.AgentCachedTexture:
154 Console.WriteLine(Pack.ToString());
155 AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)Pack;
156 AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket();
157 cachedresp.AgentData.AgentID = this.AgentID;
158 cachedresp.AgentData.SessionID = this.SessionID;
159 cachedresp.AgentData.SerialNum = this.cachedtextureserial;
160 this.cachedtextureserial++;
161 cachedresp.WearableData = new AgentCachedTextureResponsePacket.WearableDataBlock[chechedtex.WearableData.Length];
162 for (int i = 0; i < chechedtex.WearableData.Length; i++)
163 {
164 cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
165 cachedresp.WearableData[i].TextureIndex = chechedtex.WearableData[i].TextureIndex;
166 cachedresp.WearableData[i].TextureID = LLUUID.Zero;
167 cachedresp.WearableData[i].HostName = new byte[0];
168 }
169
170 this.OutPacket(cachedresp);
171 break;
152 case PacketType.ObjectAdd: 172 case PacketType.ObjectAdd:
153 m_world.AddNewPrim((ObjectAddPacket)Pack, this); 173 m_world.AddNewPrim((ObjectAddPacket)Pack, this);
154 break; 174 break;