aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim.RegionServer')
-rw-r--r--OpenSim.RegionServer/AgentAssetUpload.cs1
-rw-r--r--OpenSim.RegionServer/Assets/InventoryCache.cs20
-rw-r--r--OpenSim.RegionServer/CAPS/AdminWebFront.cs2
-rw-r--r--OpenSim.RegionServer/SimClient.cs10
4 files changed, 27 insertions, 6 deletions
diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs
index dae2191..bf8531a 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim.RegionServer/AgentAssetUpload.cs
@@ -197,6 +197,7 @@ namespace OpenSim
197 trans.Asset.Description = Helpers.FieldToString(packet.InventoryBlock.Description); 197 trans.Asset.Description = Helpers.FieldToString(packet.InventoryBlock.Description);
198 trans.Asset.Name = Helpers.FieldToString(packet.InventoryBlock.Name); 198 trans.Asset.Name = Helpers.FieldToString(packet.InventoryBlock.Name);
199 trans.Asset.Type = packet.InventoryBlock.Type; 199 trans.Asset.Type = packet.InventoryBlock.Type;
200 trans.Asset.InvType = packet.InventoryBlock.InvType;
200 if (trans.UploadComplete) 201 if (trans.UploadComplete)
201 { 202 {
202 //already complete so we can add it to the inventory 203 //already complete so we can add it to the inventory
diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim.RegionServer/Assets/InventoryCache.cs
index cc7cc29..c62975a 100644
--- a/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim.RegionServer/Assets/InventoryCache.cs
@@ -141,11 +141,27 @@ namespace OpenSim.Assets
141 return newItem; 141 return newItem;
142 } 142 }
143 143
144 public bool UpdateInventoryItem(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Assets.AssetBase asset) 144 public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Assets.AssetBase asset)
145 { 145 {
146 if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) 146 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
147 { 147 {
148 bool res = _agentsInventory[remoteClient.AgentID].UpdateItem(itemID, asset); 148 bool res = _agentsInventory[remoteClient.AgentID].UpdateItemAsset(itemID, asset);
149 if (res)
150 {
151 InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
152 this.SendItemUpdateCreate(remoteClient, Item);
153 }
154 return res;
155 }
156
157 return false;
158 }
159
160 public bool UpdateInventoryItemDetails(SimClient remoteClient, LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)
161 {
162 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
163 {
164 bool res = _agentsInventory[remoteClient.AgentID].UpdateItemDetails(itemID, packet);
149 if (res) 165 if (res)
150 { 166 {
151 InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID]; 167 InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
diff --git a/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim.RegionServer/CAPS/AdminWebFront.cs
index 6473878..4995e54 100644
--- a/OpenSim.RegionServer/CAPS/AdminWebFront.cs
+++ b/OpenSim.RegionServer/CAPS/AdminWebFront.cs
@@ -78,7 +78,7 @@ namespace OpenSim.CAPS
78 //Console.WriteLine(requestBody); 78 //Console.WriteLine(requestBody);
79 comp = requestBody.Split(delimiter); 79 comp = requestBody.Split(delimiter);
80 passw = comp[3].Split(delimiter2); 80 passw = comp[3].Split(delimiter2);
81 if (passw[1] == passWord) 81 if (passw[1] == passWord) // check admin password is correct
82 { 82 {
83 83
84 line = comp[0].Split(delimiter2); //split firstname 84 line = comp[0].Split(delimiter2); //split firstname
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 068e148..ec6d3dc 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -49,7 +49,6 @@ namespace OpenSim
49 /// </summary> 49 /// </summary>
50 public class SimClient 50 public class SimClient
51 { 51 {
52
53 public LLUUID AgentID; 52 public LLUUID AgentID;
54 public LLUUID SessionID; 53 public LLUUID SessionID;
55 public LLUUID SecureSessionID = LLUUID.Zero; 54 public LLUUID SecureSessionID = LLUUID.Zero;
@@ -354,6 +353,7 @@ namespace OpenSim
354 break; 353 break;
355 case PacketType.UpdateInventoryItem: 354 case PacketType.UpdateInventoryItem:
356 UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; 355 UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
356 Console.WriteLine(Pack.ToString());
357 for (int i = 0; i < update.InventoryData.Length; i++) 357 for (int i = 0; i < update.InventoryData.Length; i++)
358 { 358 {
359 if (update.InventoryData[i].TransactionID != LLUUID.Zero) 359 if (update.InventoryData[i].TransactionID != LLUUID.Zero)
@@ -362,7 +362,7 @@ namespace OpenSim
362 if (asset != null) 362 if (asset != null)
363 { 363 {
364 Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache"); 364 Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache");
365 m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); 365 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
366 } 366 }
367 else 367 else
368 { 368 {
@@ -370,7 +370,7 @@ namespace OpenSim
370 if (asset != null) 370 if (asset != null)
371 { 371 {
372 Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache"); 372 Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache");
373 m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); 373 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
374 } 374 }
375 else 375 else
376 { 376 {
@@ -378,6 +378,10 @@ namespace OpenSim
378 } 378 }
379 } 379 }
380 } 380 }
381 else
382 {
383 m_inventoryCache.UpdateInventoryItemDetails(this, update.InventoryData[i].ItemID, update.InventoryData[i]); ;
384 }
381 } 385 }
382 break; 386 break;
383 case PacketType.ViewerEffect: 387 case PacketType.ViewerEffect: