aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/SimClient.cs
diff options
context:
space:
mode:
authorMW2007-03-23 16:05:32 +0000
committerMW2007-03-23 16:05:32 +0000
commit085c184c5c58e22aaa3f276f980b3c81e92c9cb5 (patch)
tree7a3f9611422b7ea34715c265cc27d844f8bfdca1 /OpenSim.RegionServer/SimClient.cs
parent* whoops - missing project... (diff)
downloadopensim-SC-085c184c5c58e22aaa3f276f980b3c81e92c9cb5.zip
opensim-SC-085c184c5c58e22aaa3f276f980b3c81e92c9cb5.tar.gz
opensim-SC-085c184c5c58e22aaa3f276f980b3c81e92c9cb5.tar.bz2
opensim-SC-085c184c5c58e22aaa3f276f980b3c81e92c9cb5.tar.xz
Fixed it so that a Avatar update shouldn't be sent every frame and none should be sent when not moving.
Fixed the problem with sometimes Avatar Animations being updated every frame. New Asset uploads should now appear in the inventory all the time. Moved Animation names/ LLUUIDs to their own class (AvatarAnimations)
Diffstat (limited to 'OpenSim.RegionServer/SimClient.cs')
-rw-r--r--OpenSim.RegionServer/SimClient.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 210e0d9..b62d018 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -279,15 +279,12 @@ namespace OpenSim
279 break; 279 break;
280 case PacketType.AssetUploadRequest: 280 case PacketType.AssetUploadRequest:
281 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; 281 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
282 Console.WriteLine("upload request "+ request.AssetBlock.TransactionID);
283 AssetBase newAsset = OpenSimRoot.Instance.AssetCache.UploadPacket(request, LLUUID.Random()); 282 AssetBase newAsset = OpenSimRoot.Instance.AssetCache.UploadPacket(request, LLUUID.Random());
284 if (newAsset != null) 283 if ((newAsset != null) && (this.newAssetFolder != LLUUID.Zero))
285 { 284 {
286 OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this, this.newAssetFolder, newAsset); 285 OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this, this.newAssetFolder, newAsset);
287 } 286 }
288 Console.WriteLine(request.ToString()); 287
289 Console.WriteLine("combined uuid is " + request.AssetBlock.TransactionID.Combine(this.SecureSessionID).ToStringHyphenated());
290
291 AssetUploadCompletePacket response = new AssetUploadCompletePacket(); 288 AssetUploadCompletePacket response = new AssetUploadCompletePacket();
292 response.AssetBlock.Type =request.AssetBlock.Type; 289 response.AssetBlock.Type =request.AssetBlock.Type;
293 response.AssetBlock.Success = true; 290 response.AssetBlock.Success = true;