diff options
author | MW | 2007-03-23 16:05:32 +0000 |
---|---|---|
committer | MW | 2007-03-23 16:05:32 +0000 |
commit | 085c184c5c58e22aaa3f276f980b3c81e92c9cb5 (patch) | |
tree | 7a3f9611422b7ea34715c265cc27d844f8bfdca1 /OpenSim.RegionServer/Assets/AssetCache.cs | |
parent | * whoops - missing project... (diff) | |
download | opensim-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/Assets/AssetCache.cs')
-rw-r--r-- | OpenSim.RegionServer/Assets/AssetCache.cs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim.RegionServer/Assets/AssetCache.cs index f7f2e10..4149cb2 100644 --- a/OpenSim.RegionServer/Assets/AssetCache.cs +++ b/OpenSim.RegionServer/Assets/AssetCache.cs | |||
@@ -145,15 +145,12 @@ namespace OpenSim.Assets | |||
145 | num = 5; | 145 | num = 5; |
146 | } | 146 | } |
147 | AssetRequest req; | 147 | AssetRequest req; |
148 | Console.WriteLine("processing texture requests ( " + num + " )"); | ||
149 | for (int i = 0; i < num; i++) | 148 | for (int i = 0; i < num; i++) |
150 | { | 149 | { |
151 | req = (AssetRequest)this.TextureRequests[i]; | 150 | req = (AssetRequest)this.TextureRequests[i]; |
152 | if (req.PacketCounter != req.NumPackets) | 151 | if (req.PacketCounter != req.NumPackets) |
153 | { | 152 | { |
154 | // if (req.ImageInfo.FullID == new LLUUID("00000000-0000-0000-5005-000000000005")) | 153 | |
155 | Console.WriteLine("sending base texture ( " + req.ImageInfo.FullID + " ) in " + req.NumPackets + "number of packets"); | ||
156 | |||
157 | if (req.PacketCounter == 0) | 154 | if (req.PacketCounter == 0) |
158 | { | 155 | { |
159 | //first time for this request so send imagedata packet | 156 | //first time for this request so send imagedata packet |
@@ -227,7 +224,6 @@ namespace OpenSim.Assets | |||
227 | } | 224 | } |
228 | public void AssetReceived(AssetBase asset, bool IsTexture) | 225 | public void AssetReceived(AssetBase asset, bool IsTexture) |
229 | { | 226 | { |
230 | Console.WriteLine("received asset from asset server ( " + asset.FullID + " )"); | ||
231 | if (asset.FullID != LLUUID.Zero) // if it is set to zero then the asset wasn't found by the server | 227 | if (asset.FullID != LLUUID.Zero) // if it is set to zero then the asset wasn't found by the server |
232 | { | 228 | { |
233 | //check if it is a texture or not | 229 | //check if it is a texture or not |
@@ -433,9 +429,6 @@ namespace OpenSim.Assets | |||
433 | /// <param name="imageID"></param> | 429 | /// <param name="imageID"></param> |
434 | public void AddTextureRequest(SimClient userInfo, LLUUID imageID) | 430 | public void AddTextureRequest(SimClient userInfo, LLUUID imageID) |
435 | { | 431 | { |
436 | if (imageID == new LLUUID("00000000-0000-0000-5005-000000000005")) | ||
437 | Console.WriteLine("request base prim texture "); | ||
438 | |||
439 | //check to see if texture is in local cache, if not request from asset server | 432 | //check to see if texture is in local cache, if not request from asset server |
440 | if (!this.Textures.ContainsKey(imageID)) | 433 | if (!this.Textures.ContainsKey(imageID)) |
441 | { | 434 | { |