diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
16 files changed, 3715 insertions, 1184 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 8752404..921d3bf 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Timers; | ||
29 | using System.Collections; | 30 | using System.Collections; |
30 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
31 | using System.IO; | 32 | using System.IO; |
@@ -54,14 +55,16 @@ using PermissionMask = OpenSim.Framework.PermissionMask; | |||
54 | namespace OpenSim.Region.ClientStack.Linden | 55 | namespace OpenSim.Region.ClientStack.Linden |
55 | { | 56 | { |
56 | public delegate void UpLoadedAsset( | 57 | public delegate void UpLoadedAsset( |
57 | string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder, | 58 | string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder, |
58 | byte[] data, string inventoryType, string assetType); | 59 | byte[] data, string inventoryType, string assetType, |
60 | int cost, UUID texturesFolder, int nreqtextures, int nreqmeshs, int nreqinstances, | ||
61 | bool IsAtestUpload, ref string error); | ||
59 | 62 | ||
60 | public delegate UUID UpdateItem(UUID itemID, byte[] data); | 63 | public delegate UUID UpdateItem(UUID itemID, byte[] data); |
61 | 64 | ||
62 | public delegate void UpdateTaskScript(UUID itemID, UUID primID, bool isScriptRunning, byte[] data, ref ArrayList errors); | 65 | public delegate void UpdateTaskScript(UUID itemID, UUID primID, bool isScriptRunning, byte[] data, ref ArrayList errors); |
63 | 66 | ||
64 | public delegate void NewInventoryItem(UUID userID, InventoryItemBase item); | 67 | public delegate void NewInventoryItem(UUID userID, InventoryItemBase item, uint cost); |
65 | 68 | ||
66 | public delegate void NewAsset(AssetBase asset); | 69 | public delegate void NewAsset(AssetBase asset); |
67 | 70 | ||
@@ -87,6 +90,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
87 | 90 | ||
88 | private Scene m_Scene; | 91 | private Scene m_Scene; |
89 | private Caps m_HostCapsObj; | 92 | private Caps m_HostCapsObj; |
93 | private ModelCost m_ModelCost; | ||
90 | 94 | ||
91 | private static readonly string m_requestPath = "0000/"; | 95 | private static readonly string m_requestPath = "0000/"; |
92 | // private static readonly string m_mapLayerPath = "0001/"; | 96 | // private static readonly string m_mapLayerPath = "0001/"; |
@@ -98,7 +102,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
98 | private static readonly string m_copyFromNotecardPath = "0007/"; | 102 | private static readonly string m_copyFromNotecardPath = "0007/"; |
99 | // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule. | 103 | // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule. |
100 | private static readonly string m_getObjectPhysicsDataPath = "0101/"; | 104 | private static readonly string m_getObjectPhysicsDataPath = "0101/"; |
101 | /* 0102 - 0103 RESERVED */ | 105 | private static readonly string m_getObjectCostPath = "0102/"; |
106 | private static readonly string m_ResourceCostSelectedPath = "0103/"; | ||
102 | private static readonly string m_UpdateAgentInformationPath = "0500/"; | 107 | private static readonly string m_UpdateAgentInformationPath = "0500/"; |
103 | 108 | ||
104 | // These are callbacks which will be setup by the scene so that we can update scene data when we | 109 | // These are callbacks which will be setup by the scene so that we can update scene data when we |
@@ -114,12 +119,50 @@ namespace OpenSim.Region.ClientStack.Linden | |||
114 | private IAssetService m_assetService; | 119 | private IAssetService m_assetService; |
115 | private bool m_dumpAssetsToFile = false; | 120 | private bool m_dumpAssetsToFile = false; |
116 | private string m_regionName; | 121 | private string m_regionName; |
122 | |||
117 | private int m_levelUpload = 0; | 123 | private int m_levelUpload = 0; |
118 | 124 | ||
125 | private bool m_enableFreeTestUpload = false; // allows "TEST-" prefix hack | ||
126 | private bool m_ForceFreeTestUpload = false; // forces all uploads to be test | ||
127 | |||
128 | private bool m_enableModelUploadTextureToInventory = false; // place uploaded textures also in inventory | ||
129 | // may not be visible till relog | ||
130 | |||
131 | private bool m_RestrictFreeTestUploadPerms = false; // reduces also the permitions. Needs a creator defined!! | ||
132 | private UUID m_testAssetsCreatorID = UUID.Zero; | ||
133 | |||
134 | private float m_PrimScaleMin = 0.001f; | ||
135 | |||
136 | private enum FileAgentInventoryState : int | ||
137 | { | ||
138 | idle = 0, | ||
139 | processRequest = 1, | ||
140 | waitUpload = 2, | ||
141 | processUpload = 3 | ||
142 | } | ||
143 | private FileAgentInventoryState m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
144 | |||
119 | public BunchOfCaps(Scene scene, Caps caps) | 145 | public BunchOfCaps(Scene scene, Caps caps) |
120 | { | 146 | { |
121 | m_Scene = scene; | 147 | m_Scene = scene; |
122 | m_HostCapsObj = caps; | 148 | m_HostCapsObj = caps; |
149 | |||
150 | // create a model upload cost provider | ||
151 | m_ModelCost = new ModelCost(); | ||
152 | // tell it about scene object limits | ||
153 | m_ModelCost.NonPhysicalPrimScaleMax = m_Scene.m_maxNonphys; | ||
154 | m_ModelCost.PhysicalPrimScaleMax = m_Scene.m_maxPhys; | ||
155 | |||
156 | // m_ModelCost.ObjectLinkedPartsMax = ?? | ||
157 | // m_ModelCost.PrimScaleMin = ?? | ||
158 | |||
159 | m_PrimScaleMin = m_ModelCost.PrimScaleMin; | ||
160 | float modelTextureUploadFactor = m_ModelCost.ModelTextureCostFactor; | ||
161 | float modelUploadFactor = m_ModelCost.ModelMeshCostFactor; | ||
162 | float modelMinUploadCostFactor = m_ModelCost.ModelMinCostFactor; | ||
163 | float modelPrimCreationCost = m_ModelCost.primCreationCost; | ||
164 | float modelMeshByteCost = m_ModelCost.bytecost; | ||
165 | |||
123 | IConfigSource config = m_Scene.Config; | 166 | IConfigSource config = m_Scene.Config; |
124 | if (config != null) | 167 | if (config != null) |
125 | { | 168 | { |
@@ -134,6 +177,37 @@ namespace OpenSim.Region.ClientStack.Linden | |||
134 | { | 177 | { |
135 | m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures); | 178 | m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures); |
136 | } | 179 | } |
180 | // economy for model upload | ||
181 | IConfig EconomyConfig = config.Configs["Economy"]; | ||
182 | if (EconomyConfig != null) | ||
183 | { | ||
184 | modelUploadFactor = EconomyConfig.GetFloat("MeshModelUploadCostFactor", modelUploadFactor); | ||
185 | modelTextureUploadFactor = EconomyConfig.GetFloat("MeshModelUploadTextureCostFactor", modelTextureUploadFactor); | ||
186 | modelMinUploadCostFactor = EconomyConfig.GetFloat("MeshModelMinCostFactor", modelMinUploadCostFactor); | ||
187 | // next 2 are normalized so final cost is afected by modelUploadFactor above and normal cost | ||
188 | modelPrimCreationCost = EconomyConfig.GetFloat("ModelPrimCreationCost", modelPrimCreationCost); | ||
189 | modelMeshByteCost = EconomyConfig.GetFloat("ModelMeshByteCost", modelMeshByteCost); | ||
190 | |||
191 | m_enableModelUploadTextureToInventory = EconomyConfig.GetBoolean("MeshModelAllowTextureToInventory", m_enableModelUploadTextureToInventory); | ||
192 | |||
193 | m_RestrictFreeTestUploadPerms = EconomyConfig.GetBoolean("m_RestrictFreeTestUploadPerms", m_RestrictFreeTestUploadPerms); | ||
194 | m_enableFreeTestUpload = EconomyConfig.GetBoolean("AllowFreeTestUpload", m_enableFreeTestUpload); | ||
195 | m_ForceFreeTestUpload = EconomyConfig.GetBoolean("ForceFreeTestUpload", m_ForceFreeTestUpload); | ||
196 | string testcreator = EconomyConfig.GetString("TestAssetsCreatorID", ""); | ||
197 | if (testcreator != "") | ||
198 | { | ||
199 | UUID id; | ||
200 | UUID.TryParse(testcreator, out id); | ||
201 | if (id != null) | ||
202 | m_testAssetsCreatorID = id; | ||
203 | } | ||
204 | |||
205 | m_ModelCost.ModelMeshCostFactor = modelUploadFactor; | ||
206 | m_ModelCost.ModelTextureCostFactor = modelTextureUploadFactor; | ||
207 | m_ModelCost.ModelMinCostFactor = modelMinUploadCostFactor; | ||
208 | m_ModelCost.primCreationCost = modelPrimCreationCost; | ||
209 | m_ModelCost.bytecost = modelMeshByteCost; | ||
210 | } | ||
137 | } | 211 | } |
138 | 212 | ||
139 | m_assetService = m_Scene.AssetService; | 213 | m_assetService = m_Scene.AssetService; |
@@ -145,6 +219,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
145 | ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; | 219 | ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; |
146 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; | 220 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; |
147 | GetClient = m_Scene.SceneGraph.GetControllingClient; | 221 | GetClient = m_Scene.SceneGraph.GetControllingClient; |
222 | |||
223 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
148 | } | 224 | } |
149 | 225 | ||
150 | /// <summary> | 226 | /// <summary> |
@@ -190,7 +266,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
190 | { | 266 | { |
191 | try | 267 | try |
192 | { | 268 | { |
193 | // I don't think this one works... | ||
194 | m_HostCapsObj.RegisterHandler( | 269 | m_HostCapsObj.RegisterHandler( |
195 | "NewFileAgentInventory", | 270 | "NewFileAgentInventory", |
196 | new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>( | 271 | new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>( |
@@ -209,6 +284,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
209 | m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req); | 284 | m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req); |
210 | IRequestHandler getObjectPhysicsDataHandler = new RestStreamHandler("POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData); | 285 | IRequestHandler getObjectPhysicsDataHandler = new RestStreamHandler("POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData); |
211 | m_HostCapsObj.RegisterHandler("GetObjectPhysicsData", getObjectPhysicsDataHandler); | 286 | m_HostCapsObj.RegisterHandler("GetObjectPhysicsData", getObjectPhysicsDataHandler); |
287 | IRequestHandler getObjectCostHandler = new RestStreamHandler("POST", capsBase + m_getObjectCostPath, GetObjectCost); | ||
288 | m_HostCapsObj.RegisterHandler("GetObjectCost", getObjectCostHandler); | ||
289 | IRequestHandler ResourceCostSelectedHandler = new RestStreamHandler("POST", capsBase + m_ResourceCostSelectedPath, ResourceCostSelected); | ||
290 | m_HostCapsObj.RegisterHandler("ResourceCostSelected", ResourceCostSelectedHandler); | ||
212 | IRequestHandler UpdateAgentInformationHandler = new RestStreamHandler("POST", capsBase + m_UpdateAgentInformationPath, UpdateAgentInformation); | 291 | IRequestHandler UpdateAgentInformationHandler = new RestStreamHandler("POST", capsBase + m_UpdateAgentInformationPath, UpdateAgentInformation); |
213 | m_HostCapsObj.RegisterHandler("UpdateAgentInformation", UpdateAgentInformationHandler); | 292 | m_HostCapsObj.RegisterHandler("UpdateAgentInformation", UpdateAgentInformationHandler); |
214 | 293 | ||
@@ -264,6 +343,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
264 | m_log.DebugFormat( | 343 | m_log.DebugFormat( |
265 | "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); | 344 | "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); |
266 | 345 | ||
346 | if (!m_HostCapsObj.WaitForActivation()) | ||
347 | return string.Empty; | ||
348 | |||
267 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) | 349 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) |
268 | { | 350 | { |
269 | m_log.WarnFormat( | 351 | m_log.WarnFormat( |
@@ -393,62 +475,176 @@ namespace OpenSim.Region.ClientStack.Linden | |||
393 | //m_log.Debug("[CAPS]: NewAgentInventoryRequest Request is: " + llsdRequest.ToString()); | 475 | //m_log.Debug("[CAPS]: NewAgentInventoryRequest Request is: " + llsdRequest.ToString()); |
394 | //m_log.Debug("asset upload request via CAPS" + llsdRequest.inventory_type + " , " + llsdRequest.asset_type); | 476 | //m_log.Debug("asset upload request via CAPS" + llsdRequest.inventory_type + " , " + llsdRequest.asset_type); |
395 | 477 | ||
478 | // start by getting the client | ||
479 | IClientAPI client = null; | ||
480 | m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client); | ||
481 | |||
482 | // check current state so we only have one service at a time | ||
483 | lock (m_ModelCost) | ||
484 | { | ||
485 | switch (m_FileAgentInventoryState) | ||
486 | { | ||
487 | case FileAgentInventoryState.processRequest: | ||
488 | case FileAgentInventoryState.processUpload: | ||
489 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); | ||
490 | resperror.message = "Uploader busy processing previus request"; | ||
491 | resperror.identifier = UUID.Zero; | ||
492 | |||
493 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); | ||
494 | errorResponse.uploader = ""; | ||
495 | errorResponse.state = "error"; | ||
496 | errorResponse.error = resperror; | ||
497 | return errorResponse; | ||
498 | break; | ||
499 | case FileAgentInventoryState.waitUpload: | ||
500 | // todo stop current uploader server | ||
501 | break; | ||
502 | case FileAgentInventoryState.idle: | ||
503 | default: | ||
504 | break; | ||
505 | } | ||
506 | |||
507 | m_FileAgentInventoryState = FileAgentInventoryState.processRequest; | ||
508 | } | ||
509 | |||
510 | int cost = 0; | ||
511 | int nreqtextures = 0; | ||
512 | int nreqmeshs= 0; | ||
513 | int nreqinstances = 0; | ||
514 | bool IsAtestUpload = false; | ||
515 | |||
516 | string assetName = llsdRequest.name; | ||
517 | |||
518 | LLSDAssetUploadResponseData meshcostdata = new LLSDAssetUploadResponseData(); | ||
519 | |||
396 | if (llsdRequest.asset_type == "texture" || | 520 | if (llsdRequest.asset_type == "texture" || |
397 | llsdRequest.asset_type == "animation" || | 521 | llsdRequest.asset_type == "animation" || |
522 | llsdRequest.asset_type == "mesh" || | ||
398 | llsdRequest.asset_type == "sound") | 523 | llsdRequest.asset_type == "sound") |
399 | { | 524 | { |
400 | ScenePresence avatar = null; | 525 | ScenePresence avatar = null; |
401 | IClientAPI client = null; | ||
402 | m_Scene.TryGetScenePresence(m_HostCapsObj.AgentID, out avatar); | 526 | m_Scene.TryGetScenePresence(m_HostCapsObj.AgentID, out avatar); |
403 | 527 | ||
404 | // check user level | 528 | // check user level |
405 | if (avatar != null) | 529 | if (avatar != null) |
406 | { | 530 | { |
407 | client = avatar.ControllingClient; | ||
408 | |||
409 | if (avatar.UserLevel < m_levelUpload) | 531 | if (avatar.UserLevel < m_levelUpload) |
410 | { | 532 | { |
411 | if (client != null) | 533 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); |
412 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false); | 534 | resperror.message = "Insufficient permissions to upload"; |
535 | resperror.identifier = UUID.Zero; | ||
413 | 536 | ||
414 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); | 537 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); |
415 | errorResponse.uploader = ""; | 538 | errorResponse.uploader = ""; |
416 | errorResponse.state = "error"; | 539 | errorResponse.state = "error"; |
540 | errorResponse.error = resperror; | ||
541 | lock (m_ModelCost) | ||
542 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
417 | return errorResponse; | 543 | return errorResponse; |
418 | } | 544 | } |
419 | } | 545 | } |
420 | 546 | ||
421 | // check funds | 547 | // check test upload and funds |
422 | if (client != null) | 548 | if (client != null) |
423 | { | 549 | { |
424 | IMoneyModule mm = m_Scene.RequestModuleInterface<IMoneyModule>(); | 550 | IMoneyModule mm = m_Scene.RequestModuleInterface<IMoneyModule>(); |
425 | 551 | ||
552 | int baseCost = 0; | ||
426 | if (mm != null) | 553 | if (mm != null) |
554 | baseCost = mm.UploadCharge; | ||
555 | |||
556 | string warning = String.Empty; | ||
557 | |||
558 | if (llsdRequest.asset_type == "mesh") | ||
427 | { | 559 | { |
428 | if (!mm.UploadCovered(client.AgentId, mm.UploadCharge)) | 560 | string error; |
561 | int modelcost; | ||
562 | |||
563 | if (!m_ModelCost.MeshModelCost(llsdRequest.asset_resources, baseCost, out modelcost, | ||
564 | meshcostdata, out error, ref warning)) | ||
429 | { | 565 | { |
430 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); | 566 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); |
567 | resperror.message = error; | ||
568 | resperror.identifier = UUID.Zero; | ||
431 | 569 | ||
432 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); | 570 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); |
433 | errorResponse.uploader = ""; | 571 | errorResponse.uploader = ""; |
434 | errorResponse.state = "error"; | 572 | errorResponse.state = "error"; |
573 | errorResponse.error = resperror; | ||
574 | |||
575 | lock (m_ModelCost) | ||
576 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
435 | return errorResponse; | 577 | return errorResponse; |
436 | } | 578 | } |
579 | cost = modelcost; | ||
580 | } | ||
581 | else | ||
582 | { | ||
583 | cost = baseCost; | ||
584 | } | ||
585 | |||
586 | if (cost > 0 && mm != null) | ||
587 | { | ||
588 | // check for test upload | ||
589 | |||
590 | if (m_ForceFreeTestUpload) // all are test | ||
591 | { | ||
592 | if (!(assetName.Length > 5 && assetName.StartsWith("TEST-"))) // has normal name lets change it | ||
593 | assetName = "TEST-" + assetName; | ||
594 | |||
595 | IsAtestUpload = true; | ||
596 | } | ||
597 | |||
598 | else if (m_enableFreeTestUpload) // only if prefixed with "TEST-" | ||
599 | { | ||
600 | |||
601 | IsAtestUpload = (assetName.Length > 5 && assetName.StartsWith("TEST-")); | ||
602 | } | ||
603 | |||
604 | |||
605 | if(IsAtestUpload) // let user know, still showing cost estimation | ||
606 | warning += "Upload will have no cost, for testing purposes only. Other uses are prohibited. Items will not work after 48 hours or on other regions"; | ||
607 | |||
608 | // check funds | ||
609 | else | ||
610 | { | ||
611 | if (!mm.UploadCovered(client.AgentId, (int)cost)) | ||
612 | { | ||
613 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); | ||
614 | resperror.message = "Insuficient funds"; | ||
615 | resperror.identifier = UUID.Zero; | ||
616 | |||
617 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); | ||
618 | errorResponse.uploader = ""; | ||
619 | errorResponse.state = "error"; | ||
620 | errorResponse.error = resperror; | ||
621 | lock (m_ModelCost) | ||
622 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
623 | return errorResponse; | ||
624 | } | ||
625 | } | ||
437 | } | 626 | } |
627 | |||
628 | if (client != null && warning != String.Empty) | ||
629 | client.SendAgentAlertMessage(warning, true); | ||
438 | } | 630 | } |
439 | } | 631 | } |
440 | 632 | ||
441 | string assetName = llsdRequest.name; | ||
442 | string assetDes = llsdRequest.description; | 633 | string assetDes = llsdRequest.description; |
443 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; | 634 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; |
444 | UUID newAsset = UUID.Random(); | 635 | UUID newAsset = UUID.Random(); |
445 | UUID newInvItem = UUID.Random(); | 636 | UUID newInvItem = UUID.Random(); |
446 | UUID parentFolder = llsdRequest.folder_id; | 637 | UUID parentFolder = llsdRequest.folder_id; |
447 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); | 638 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); |
639 | UUID texturesFolder = UUID.Zero; | ||
640 | |||
641 | if(!IsAtestUpload && m_enableModelUploadTextureToInventory) | ||
642 | texturesFolder = llsdRequest.texture_folder_id; | ||
448 | 643 | ||
449 | AssetUploader uploader = | 644 | AssetUploader uploader = |
450 | new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type, | 645 | new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type, |
451 | llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile); | 646 | llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile, cost, |
647 | texturesFolder, nreqtextures, nreqmeshs, nreqinstances, IsAtestUpload); | ||
452 | 648 | ||
453 | m_HostCapsObj.HttpListener.AddStreamHandler( | 649 | m_HostCapsObj.HttpListener.AddStreamHandler( |
454 | new BinaryStreamHandler( | 650 | new BinaryStreamHandler( |
@@ -466,10 +662,22 @@ namespace OpenSim.Region.ClientStack.Linden | |||
466 | string uploaderURL = protocol + m_HostCapsObj.HostName + ":" + m_HostCapsObj.Port.ToString() + capsBase + | 662 | string uploaderURL = protocol + m_HostCapsObj.HostName + ":" + m_HostCapsObj.Port.ToString() + capsBase + |
467 | uploaderPath; | 663 | uploaderPath; |
468 | 664 | ||
665 | |||
469 | LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse(); | 666 | LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse(); |
470 | uploadResponse.uploader = uploaderURL; | 667 | uploadResponse.uploader = uploaderURL; |
471 | uploadResponse.state = "upload"; | 668 | uploadResponse.state = "upload"; |
669 | uploadResponse.upload_price = (int)cost; | ||
670 | |||
671 | if (llsdRequest.asset_type == "mesh") | ||
672 | { | ||
673 | uploadResponse.data = meshcostdata; | ||
674 | } | ||
675 | |||
472 | uploader.OnUpLoad += UploadCompleteHandler; | 676 | uploader.OnUpLoad += UploadCompleteHandler; |
677 | |||
678 | lock (m_ModelCost) | ||
679 | m_FileAgentInventoryState = FileAgentInventoryState.waitUpload; | ||
680 | |||
473 | return uploadResponse; | 681 | return uploadResponse; |
474 | } | 682 | } |
475 | 683 | ||
@@ -481,8 +689,14 @@ namespace OpenSim.Region.ClientStack.Linden | |||
481 | /// <param name="data"></param> | 689 | /// <param name="data"></param> |
482 | public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID, | 690 | public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID, |
483 | UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType, | 691 | UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType, |
484 | string assetType) | 692 | string assetType, int cost, |
693 | UUID texturesFolder, int nreqtextures, int nreqmeshs, int nreqinstances, | ||
694 | bool IsAtestUpload, ref string error) | ||
485 | { | 695 | { |
696 | |||
697 | lock (m_ModelCost) | ||
698 | m_FileAgentInventoryState = FileAgentInventoryState.processUpload; | ||
699 | |||
486 | m_log.DebugFormat( | 700 | m_log.DebugFormat( |
487 | "[BUNCH OF CAPS]: Uploaded asset {0} for inventory item {1}, inv type {2}, asset type {3}", | 701 | "[BUNCH OF CAPS]: Uploaded asset {0} for inventory item {1}, inv type {2}, asset type {3}", |
488 | assetID, inventoryItem, inventoryType, assetType); | 702 | assetID, inventoryItem, inventoryType, assetType); |
@@ -490,117 +704,247 @@ namespace OpenSim.Region.ClientStack.Linden | |||
490 | sbyte assType = 0; | 704 | sbyte assType = 0; |
491 | sbyte inType = 0; | 705 | sbyte inType = 0; |
492 | 706 | ||
707 | IClientAPI client = null; | ||
708 | |||
709 | UUID owner_id = m_HostCapsObj.AgentID; | ||
710 | UUID creatorID; | ||
711 | |||
712 | bool istest = IsAtestUpload && m_enableFreeTestUpload && (cost > 0); | ||
713 | |||
714 | bool restrictPerms = m_RestrictFreeTestUploadPerms && istest; | ||
715 | |||
716 | if (istest && m_testAssetsCreatorID != UUID.Zero) | ||
717 | creatorID = m_testAssetsCreatorID; | ||
718 | else | ||
719 | creatorID = owner_id; | ||
720 | |||
721 | string creatorIDstr = creatorID.ToString(); | ||
722 | |||
723 | IMoneyModule mm = m_Scene.RequestModuleInterface<IMoneyModule>(); | ||
724 | if (mm != null) | ||
725 | { | ||
726 | // make sure client still has enougth credit | ||
727 | if (!mm.UploadCovered(m_HostCapsObj.AgentID, (int)cost)) | ||
728 | { | ||
729 | error = "Insufficient funds."; | ||
730 | return; | ||
731 | } | ||
732 | } | ||
733 | |||
734 | // strings to types | ||
493 | if (inventoryType == "sound") | 735 | if (inventoryType == "sound") |
494 | { | 736 | { |
495 | inType = 1; | 737 | inType = (sbyte)InventoryType.Sound; |
496 | assType = 1; | 738 | assType = (sbyte)AssetType.Sound; |
497 | } | 739 | } |
498 | else if (inventoryType == "animation") | 740 | else if (inventoryType == "animation") |
499 | { | 741 | { |
500 | inType = 19; | 742 | inType = (sbyte)InventoryType.Animation; |
501 | assType = 20; | 743 | assType = (sbyte)AssetType.Animation; |
502 | } | 744 | } |
503 | else if (inventoryType == "wearable") | 745 | else if (inventoryType == "wearable") |
504 | { | 746 | { |
505 | inType = 18; | 747 | inType = (sbyte)InventoryType.Wearable; |
506 | switch (assetType) | 748 | switch (assetType) |
507 | { | 749 | { |
508 | case "bodypart": | 750 | case "bodypart": |
509 | assType = 13; | 751 | assType = (sbyte)AssetType.Bodypart; |
510 | break; | 752 | break; |
511 | case "clothing": | 753 | case "clothing": |
512 | assType = 5; | 754 | assType = (sbyte)AssetType.Clothing; |
513 | break; | 755 | break; |
514 | } | 756 | } |
515 | } | 757 | } |
516 | else if (inventoryType == "object") | 758 | else if (inventoryType == "object") |
517 | { | 759 | { |
518 | inType = (sbyte)InventoryType.Object; | 760 | if (assetType == "mesh") // this code for now is for mesh models uploads only |
519 | assType = (sbyte)AssetType.Object; | ||
520 | |||
521 | List<Vector3> positions = new List<Vector3>(); | ||
522 | List<Quaternion> rotations = new List<Quaternion>(); | ||
523 | OSDMap request = (OSDMap)OSDParser.DeserializeLLSDXml(data); | ||
524 | OSDArray instance_list = (OSDArray)request["instance_list"]; | ||
525 | OSDArray mesh_list = (OSDArray)request["mesh_list"]; | ||
526 | OSDArray texture_list = (OSDArray)request["texture_list"]; | ||
527 | SceneObjectGroup grp = null; | ||
528 | |||
529 | List<UUID> textures = new List<UUID>(); | ||
530 | for (int i = 0; i < texture_list.Count; i++) | ||
531 | { | 761 | { |
532 | AssetBase textureAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Texture, ""); | 762 | inType = (sbyte)InventoryType.Object; |
533 | textureAsset.Data = texture_list[i].AsBinary(); | 763 | assType = (sbyte)AssetType.Object; |
534 | m_assetService.Store(textureAsset); | ||
535 | textures.Add(textureAsset.FullID); | ||
536 | } | ||
537 | 764 | ||
538 | for (int i = 0; i < mesh_list.Count; i++) | 765 | List<Vector3> positions = new List<Vector3>(); |
539 | { | 766 | List<Quaternion> rotations = new List<Quaternion>(); |
540 | PrimitiveBaseShape pbs = PrimitiveBaseShape.CreateBox(); | 767 | OSDMap request = (OSDMap)OSDParser.DeserializeLLSDXml(data); |
768 | |||
769 | // compare and get updated information | ||
541 | 770 | ||
542 | Primitive.TextureEntry textureEntry | 771 | bool mismatchError = true; |
543 | = new Primitive.TextureEntry(Primitive.TextureEntry.WHITE_TEXTURE); | ||
544 | OSDMap inner_instance_list = (OSDMap)instance_list[i]; | ||
545 | 772 | ||
546 | OSDArray face_list = (OSDArray)inner_instance_list["face_list"]; | 773 | while (mismatchError) |
547 | for (uint face = 0; face < face_list.Count; face++) | ||
548 | { | 774 | { |
549 | OSDMap faceMap = (OSDMap)face_list[(int)face]; | 775 | mismatchError = false; |
550 | Primitive.TextureEntryFace f = pbs.Textures.CreateFace(face); | 776 | } |
551 | if(faceMap.ContainsKey("fullbright")) | ||
552 | f.Fullbright = faceMap["fullbright"].AsBoolean(); | ||
553 | if (faceMap.ContainsKey ("diffuse_color")) | ||
554 | f.RGBA = faceMap["diffuse_color"].AsColor4(); | ||
555 | 777 | ||
556 | int textureNum = faceMap["image"].AsInteger(); | 778 | if (mismatchError) |
557 | float imagerot = faceMap["imagerot"].AsInteger(); | 779 | { |
558 | float offsets = (float)faceMap["offsets"].AsReal(); | 780 | error = "Upload and fee estimation information don't match"; |
559 | float offsett = (float)faceMap["offsett"].AsReal(); | 781 | lock (m_ModelCost) |
560 | float scales = (float)faceMap["scales"].AsReal(); | 782 | m_FileAgentInventoryState = FileAgentInventoryState.idle; |
561 | float scalet = (float)faceMap["scalet"].AsReal(); | ||
562 | 783 | ||
563 | if(imagerot != 0) | 784 | return; |
564 | f.Rotation = imagerot; | 785 | } |
565 | 786 | ||
566 | if(offsets != 0) | 787 | OSDArray instance_list = (OSDArray)request["instance_list"]; |
567 | f.OffsetU = offsets; | 788 | OSDArray mesh_list = (OSDArray)request["mesh_list"]; |
789 | OSDArray texture_list = (OSDArray)request["texture_list"]; | ||
790 | SceneObjectGroup grp = null; | ||
568 | 791 | ||
569 | if (offsett != 0) | 792 | // create and store texture assets |
570 | f.OffsetV = offsett; | 793 | bool doTextInv = (!istest && m_enableModelUploadTextureToInventory && |
794 | texturesFolder != UUID.Zero); | ||
571 | 795 | ||
572 | if (scales != 0) | ||
573 | f.RepeatU = scales; | ||
574 | 796 | ||
575 | if (scalet != 0) | 797 | List<UUID> textures = new List<UUID>(); |
576 | f.RepeatV = scalet; | ||
577 | 798 | ||
578 | if (textures.Count > textureNum) | 799 | |
579 | f.TextureID = textures[textureNum]; | 800 | if (doTextInv) |
580 | else | 801 | m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client); |
581 | f.TextureID = Primitive.TextureEntry.WHITE_TEXTURE; | 802 | |
803 | if(client == null) // don't put textures in inventory if there is no client | ||
804 | doTextInv = false; | ||
805 | |||
806 | for (int i = 0; i < texture_list.Count; i++) | ||
807 | { | ||
808 | AssetBase textureAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Texture, creatorIDstr); | ||
809 | textureAsset.Data = texture_list[i].AsBinary(); | ||
810 | if (istest) | ||
811 | textureAsset.Local = true; | ||
812 | m_assetService.Store(textureAsset); | ||
813 | textures.Add(textureAsset.FullID); | ||
814 | |||
815 | if (doTextInv) | ||
816 | { | ||
817 | string name = assetName; | ||
818 | if (name.Length > 25) | ||
819 | name = name.Substring(0, 24); | ||
820 | name += "_Texture#" + i.ToString(); | ||
821 | InventoryItemBase texitem = new InventoryItemBase(); | ||
822 | texitem.Owner = m_HostCapsObj.AgentID; | ||
823 | texitem.CreatorId = creatorIDstr; | ||
824 | texitem.CreatorData = String.Empty; | ||
825 | texitem.ID = UUID.Random(); | ||
826 | texitem.AssetID = textureAsset.FullID; | ||
827 | texitem.Description = "mesh model texture"; | ||
828 | texitem.Name = name; | ||
829 | texitem.AssetType = (int)AssetType.Texture; | ||
830 | texitem.InvType = (int)InventoryType.Texture; | ||
831 | texitem.Folder = texturesFolder; | ||
832 | |||
833 | texitem.CurrentPermissions | ||
834 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Export); | ||
835 | |||
836 | texitem.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; | ||
837 | texitem.EveryOnePermissions = 0; | ||
838 | texitem.NextPermissions = (uint)PermissionMask.All; | ||
839 | texitem.CreationDate = Util.UnixTimeSinceEpoch(); | ||
840 | |||
841 | m_Scene.AddInventoryItem(client, texitem); | ||
842 | texitem = null; | ||
843 | } | ||
844 | } | ||
582 | 845 | ||
583 | textureEntry.FaceTextures[face] = f; | 846 | // create and store meshs assets |
847 | List<UUID> meshAssets = new List<UUID>(); | ||
848 | for (int i = 0; i < mesh_list.Count; i++) | ||
849 | { | ||
850 | AssetBase meshAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Mesh, creatorIDstr); | ||
851 | meshAsset.Data = mesh_list[i].AsBinary(); | ||
852 | if (istest) | ||
853 | meshAsset.Local = true; | ||
854 | m_assetService.Store(meshAsset); | ||
855 | meshAssets.Add(meshAsset.FullID); | ||
584 | } | 856 | } |
585 | 857 | ||
586 | pbs.TextureEntry = textureEntry.GetBytes(); | 858 | int skipedMeshs = 0; |
859 | // build prims from instances | ||
860 | for (int i = 0; i < instance_list.Count; i++) | ||
861 | { | ||
862 | OSDMap inner_instance_list = (OSDMap)instance_list[i]; | ||
863 | |||
864 | // skip prims that are 2 small | ||
865 | Vector3 scale = inner_instance_list["scale"].AsVector3(); | ||
866 | |||
867 | if (scale.X < m_PrimScaleMin || scale.Y < m_PrimScaleMin || scale.Z < m_PrimScaleMin) | ||
868 | { | ||
869 | skipedMeshs++; | ||
870 | continue; | ||
871 | } | ||
872 | |||
873 | PrimitiveBaseShape pbs = PrimitiveBaseShape.CreateBox(); | ||
874 | |||
875 | Primitive.TextureEntry textureEntry | ||
876 | = new Primitive.TextureEntry(Primitive.TextureEntry.WHITE_TEXTURE); | ||
587 | 877 | ||
588 | AssetBase meshAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Mesh, ""); | ||
589 | meshAsset.Data = mesh_list[i].AsBinary(); | ||
590 | m_assetService.Store(meshAsset); | ||
591 | 878 | ||
592 | pbs.SculptEntry = true; | 879 | OSDArray face_list = (OSDArray)inner_instance_list["face_list"]; |
593 | pbs.SculptTexture = meshAsset.FullID; | 880 | for (uint face = 0; face < face_list.Count; face++) |
594 | pbs.SculptType = (byte)SculptType.Mesh; | 881 | { |
595 | pbs.SculptData = meshAsset.Data; | 882 | OSDMap faceMap = (OSDMap)face_list[(int)face]; |
883 | Primitive.TextureEntryFace f = pbs.Textures.CreateFace(face); | ||
884 | if (faceMap.ContainsKey("fullbright")) | ||
885 | f.Fullbright = faceMap["fullbright"].AsBoolean(); | ||
886 | if (faceMap.ContainsKey("diffuse_color")) | ||
887 | f.RGBA = faceMap["diffuse_color"].AsColor4(); | ||
888 | |||
889 | int textureNum = faceMap["image"].AsInteger(); | ||
890 | float imagerot = faceMap["imagerot"].AsInteger(); | ||
891 | float offsets = (float)faceMap["offsets"].AsReal(); | ||
892 | float offsett = (float)faceMap["offsett"].AsReal(); | ||
893 | float scales = (float)faceMap["scales"].AsReal(); | ||
894 | float scalet = (float)faceMap["scalet"].AsReal(); | ||
895 | |||
896 | if (imagerot != 0) | ||
897 | f.Rotation = imagerot; | ||
898 | |||
899 | if (offsets != 0) | ||
900 | f.OffsetU = offsets; | ||
901 | |||
902 | if (offsett != 0) | ||
903 | f.OffsetV = offsett; | ||
904 | |||
905 | if (scales != 0) | ||
906 | f.RepeatU = scales; | ||
907 | |||
908 | if (scalet != 0) | ||
909 | f.RepeatV = scalet; | ||
910 | |||
911 | if (textures.Count > textureNum) | ||
912 | f.TextureID = textures[textureNum]; | ||
913 | else | ||
914 | f.TextureID = Primitive.TextureEntry.WHITE_TEXTURE; | ||
915 | |||
916 | textureEntry.FaceTextures[face] = f; | ||
917 | } | ||
918 | |||
919 | pbs.TextureEntry = textureEntry.GetBytes(); | ||
920 | |||
921 | bool hasmesh = false; | ||
922 | if (inner_instance_list.ContainsKey("mesh")) // seems to happen always but ... | ||
923 | { | ||
924 | int meshindx = inner_instance_list["mesh"].AsInteger(); | ||
925 | if (meshAssets.Count > meshindx) | ||
926 | { | ||
927 | pbs.SculptEntry = true; | ||
928 | pbs.SculptType = (byte)SculptType.Mesh; | ||
929 | pbs.SculptTexture = meshAssets[meshindx]; // actual asset UUID after meshs suport introduction | ||
930 | // data will be requested from asset on rez (i hope) | ||
931 | hasmesh = true; | ||
932 | } | ||
933 | } | ||
934 | |||
935 | Vector3 position = inner_instance_list["position"].AsVector3(); | ||
936 | Quaternion rotation = inner_instance_list["rotation"].AsQuaternion(); | ||
596 | 937 | ||
597 | Vector3 position = inner_instance_list["position"].AsVector3(); | 938 | // for now viwers do send fixed defaults |
598 | Vector3 scale = inner_instance_list["scale"].AsVector3(); | 939 | // but this may change |
599 | Quaternion rotation = inner_instance_list["rotation"].AsQuaternion(); | 940 | // int physicsShapeType = inner_instance_list["physics_shape_type"].AsInteger(); |
941 | byte physicsShapeType = (byte)PhysShapeType.prim; // default for mesh is simple convex | ||
942 | if(hasmesh) | ||
943 | physicsShapeType = (byte) PhysShapeType.convex; // default for mesh is simple convex | ||
944 | // int material = inner_instance_list["material"].AsInteger(); | ||
945 | byte material = (byte)Material.Wood; | ||
600 | 946 | ||
601 | // no longer used - begin ------------------------ | 947 | // no longer used - begin ------------------------ |
602 | // int physicsShapeType = inner_instance_list["physics_shape_type"].AsInteger(); | ||
603 | // int material = inner_instance_list["material"].AsInteger(); | ||
604 | // int mesh = inner_instance_list["mesh"].AsInteger(); | 948 | // int mesh = inner_instance_list["mesh"].AsInteger(); |
605 | 949 | ||
606 | // OSDMap permissions = (OSDMap)inner_instance_list["permissions"]; | 950 | // OSDMap permissions = (OSDMap)inner_instance_list["permissions"]; |
@@ -615,24 +959,42 @@ namespace OpenSim.Region.ClientStack.Linden | |||
615 | // UUID owner_id = permissions["owner_id"].AsUUID(); | 959 | // UUID owner_id = permissions["owner_id"].AsUUID(); |
616 | // int owner_mask = permissions["owner_mask"].AsInteger(); | 960 | // int owner_mask = permissions["owner_mask"].AsInteger(); |
617 | // no longer used - end ------------------------ | 961 | // no longer used - end ------------------------ |
962 | |||
963 | |||
964 | SceneObjectPart prim | ||
965 | = new SceneObjectPart(owner_id, pbs, position, Quaternion.Identity, Vector3.Zero); | ||
966 | |||
967 | prim.Scale = scale; | ||
968 | rotations.Add(rotation); | ||
969 | positions.Add(position); | ||
970 | prim.UUID = UUID.Random(); | ||
971 | prim.CreatorID = creatorID; | ||
972 | prim.OwnerID = owner_id; | ||
973 | prim.GroupID = UUID.Zero; | ||
974 | prim.LastOwnerID = creatorID; | ||
975 | prim.CreationDate = Util.UnixTimeSinceEpoch(); | ||
976 | |||
977 | if (grp == null) | ||
978 | prim.Name = assetName; | ||
979 | else | ||
980 | prim.Name = assetName + "#" + i.ToString(); | ||
618 | 981 | ||
619 | UUID owner_id = m_HostCapsObj.AgentID; | 982 | if (restrictPerms) |
983 | { | ||
984 | prim.BaseMask = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
985 | prim.EveryoneMask = 0; | ||
986 | prim.GroupMask = 0; | ||
987 | prim.NextOwnerMask = 0; | ||
988 | prim.OwnerMask = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
989 | } | ||
620 | 990 | ||
621 | SceneObjectPart prim | 991 | if(istest) |
622 | = new SceneObjectPart(owner_id, pbs, position, Quaternion.Identity, Vector3.Zero); | 992 | prim.Description = "For testing only. Other uses are prohibited"; |
993 | else | ||
994 | prim.Description = ""; | ||
623 | 995 | ||
624 | prim.Scale = scale; | 996 | prim.Material = material; |
625 | //prim.OffsetPosition = position; | 997 | prim.PhysicsShapeType = physicsShapeType; |
626 | rotations.Add(rotation); | ||
627 | positions.Add(position); | ||
628 | prim.UUID = UUID.Random(); | ||
629 | prim.CreatorID = owner_id; | ||
630 | prim.OwnerID = owner_id; | ||
631 | prim.GroupID = UUID.Zero; | ||
632 | prim.LastOwnerID = prim.OwnerID; | ||
633 | prim.CreationDate = Util.UnixTimeSinceEpoch(); | ||
634 | prim.Name = assetName; | ||
635 | prim.Description = ""; | ||
636 | 998 | ||
637 | // prim.BaseMask = (uint)base_mask; | 999 | // prim.BaseMask = (uint)base_mask; |
638 | // prim.EveryoneMask = (uint)everyone_mask; | 1000 | // prim.EveryoneMask = (uint)everyone_mask; |
@@ -640,52 +1002,64 @@ namespace OpenSim.Region.ClientStack.Linden | |||
640 | // prim.NextOwnerMask = (uint)next_owner_mask; | 1002 | // prim.NextOwnerMask = (uint)next_owner_mask; |
641 | // prim.OwnerMask = (uint)owner_mask; | 1003 | // prim.OwnerMask = (uint)owner_mask; |
642 | 1004 | ||
643 | if (grp == null) | 1005 | if (grp == null) |
644 | grp = new SceneObjectGroup(prim); | 1006 | { |
645 | else | 1007 | grp = new SceneObjectGroup(prim); |
646 | grp.AddPart(prim); | 1008 | grp.LastOwnerID = creatorID; |
647 | } | 1009 | } |
1010 | else | ||
1011 | grp.AddPart(prim); | ||
1012 | } | ||
648 | 1013 | ||
649 | Vector3 rootPos = positions[0]; | 1014 | Vector3 rootPos = positions[0]; |
650 | 1015 | ||
651 | if (grp.Parts.Length > 1) | 1016 | if (grp.Parts.Length > 1) |
652 | { | 1017 | { |
653 | // Fix first link number | 1018 | // Fix first link number |
654 | grp.RootPart.LinkNum++; | 1019 | grp.RootPart.LinkNum++; |
655 | 1020 | ||
656 | Quaternion rootRotConj = Quaternion.Conjugate(rotations[0]); | 1021 | Quaternion rootRotConj = Quaternion.Conjugate(rotations[0]); |
657 | Quaternion tmprot; | 1022 | Quaternion tmprot; |
658 | Vector3 offset; | 1023 | Vector3 offset; |
659 | 1024 | ||
660 | // fix children rotations and positions | 1025 | // fix children rotations and positions |
661 | for (int i = 1; i < rotations.Count; i++) | 1026 | for (int i = 1; i < rotations.Count; i++) |
662 | { | 1027 | { |
663 | tmprot = rotations[i]; | 1028 | tmprot = rotations[i]; |
664 | tmprot = rootRotConj * tmprot; | 1029 | tmprot = rootRotConj * tmprot; |
665 | 1030 | ||
666 | grp.Parts[i].RotationOffset = tmprot; | 1031 | grp.Parts[i].RotationOffset = tmprot; |
667 | 1032 | ||
668 | offset = positions[i] - rootPos; | 1033 | offset = positions[i] - rootPos; |
1034 | |||
1035 | offset *= rootRotConj; | ||
1036 | grp.Parts[i].OffsetPosition = offset; | ||
1037 | } | ||
669 | 1038 | ||
670 | offset *= rootRotConj; | 1039 | grp.AbsolutePosition = rootPos; |
671 | grp.Parts[i].OffsetPosition = offset; | 1040 | grp.UpdateGroupRotationR(rotations[0]); |
1041 | } | ||
1042 | else | ||
1043 | { | ||
1044 | grp.AbsolutePosition = rootPos; | ||
1045 | grp.UpdateGroupRotationR(rotations[0]); | ||
672 | } | 1046 | } |
673 | 1047 | ||
674 | grp.AbsolutePosition = rootPos; | 1048 | data = ASCIIEncoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(grp)); |
675 | grp.UpdateGroupRotationR(rotations[0]); | ||
676 | } | 1049 | } |
677 | else | 1050 | |
1051 | else // not a mesh model | ||
678 | { | 1052 | { |
679 | grp.AbsolutePosition = rootPos; | 1053 | m_log.ErrorFormat("[CAPS Asset Upload] got unsuported assetType for object upload"); |
680 | grp.UpdateGroupRotationR(rotations[0]); | 1054 | return; |
681 | } | 1055 | } |
682 | |||
683 | data = ASCIIEncoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(grp)); | ||
684 | } | 1056 | } |
685 | 1057 | ||
686 | AssetBase asset; | 1058 | AssetBase asset; |
687 | asset = new AssetBase(assetID, assetName, assType, m_HostCapsObj.AgentID.ToString()); | 1059 | asset = new AssetBase(assetID, assetName, assType, creatorIDstr); |
688 | asset.Data = data; | 1060 | asset.Data = data; |
1061 | if (istest) | ||
1062 | asset.Local = true; | ||
689 | if (AddNewAsset != null) | 1063 | if (AddNewAsset != null) |
690 | AddNewAsset(asset); | 1064 | AddNewAsset(asset); |
691 | else if (m_assetService != null) | 1065 | else if (m_assetService != null) |
@@ -693,11 +1067,17 @@ namespace OpenSim.Region.ClientStack.Linden | |||
693 | 1067 | ||
694 | InventoryItemBase item = new InventoryItemBase(); | 1068 | InventoryItemBase item = new InventoryItemBase(); |
695 | item.Owner = m_HostCapsObj.AgentID; | 1069 | item.Owner = m_HostCapsObj.AgentID; |
696 | item.CreatorId = m_HostCapsObj.AgentID.ToString(); | 1070 | item.CreatorId = creatorIDstr; |
697 | item.CreatorData = String.Empty; | 1071 | item.CreatorData = String.Empty; |
698 | item.ID = inventoryItem; | 1072 | item.ID = inventoryItem; |
699 | item.AssetID = asset.FullID; | 1073 | item.AssetID = asset.FullID; |
700 | item.Description = assetDescription; | 1074 | if (istest) |
1075 | { | ||
1076 | item.Description = "For testing only. Other uses are prohibited"; | ||
1077 | item.Flags = (uint) (InventoryItemFlags.SharedSingleReference); | ||
1078 | } | ||
1079 | else | ||
1080 | item.Description = assetDescription; | ||
701 | item.Name = assetName; | 1081 | item.Name = assetName; |
702 | item.AssetType = assType; | 1082 | item.AssetType = assType; |
703 | item.InvType = inType; | 1083 | item.InvType = inType; |
@@ -705,18 +1085,60 @@ namespace OpenSim.Region.ClientStack.Linden | |||
705 | 1085 | ||
706 | // If we set PermissionMask.All then when we rez the item the next permissions will replace the current | 1086 | // If we set PermissionMask.All then when we rez the item the next permissions will replace the current |
707 | // (owner) permissions. This becomes a problem if next permissions are changed. | 1087 | // (owner) permissions. This becomes a problem if next permissions are changed. |
708 | item.CurrentPermissions | ||
709 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Export); | ||
710 | 1088 | ||
711 | item.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; | 1089 | if (restrictPerms) |
712 | item.EveryOnePermissions = 0; | 1090 | { |
713 | item.NextPermissions = (uint)PermissionMask.All; | 1091 | item.CurrentPermissions |
1092 | = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
1093 | |||
1094 | item.BasePermissions = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
1095 | item.EveryOnePermissions = 0; | ||
1096 | item.NextPermissions = 0; | ||
1097 | } | ||
1098 | else | ||
1099 | { | ||
1100 | item.CurrentPermissions | ||
1101 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Export); | ||
1102 | |||
1103 | item.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; | ||
1104 | item.EveryOnePermissions = 0; | ||
1105 | item.NextPermissions = (uint)PermissionMask.All; | ||
1106 | } | ||
1107 | |||
714 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 1108 | item.CreationDate = Util.UnixTimeSinceEpoch(); |
715 | 1109 | ||
1110 | m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client); | ||
1111 | |||
716 | if (AddNewInventoryItem != null) | 1112 | if (AddNewInventoryItem != null) |
717 | { | 1113 | { |
718 | AddNewInventoryItem(m_HostCapsObj.AgentID, item); | 1114 | if (istest) |
1115 | { | ||
1116 | m_Scene.AddInventoryItem(client, item); | ||
1117 | /* | ||
1118 | AddNewInventoryItem(m_HostCapsObj.AgentID, item, 0); | ||
1119 | if (client != null) | ||
1120 | client.SendAgentAlertMessage("Upload will have no cost, for personal test purposes only. Other uses are forbiden. Items may not work on a another region" , true); | ||
1121 | */ | ||
1122 | } | ||
1123 | else | ||
1124 | { | ||
1125 | AddNewInventoryItem(m_HostCapsObj.AgentID, item, (uint)cost); | ||
1126 | // if (client != null) | ||
1127 | // { | ||
1128 | // // let users see anything.. i don't so far | ||
1129 | // string str; | ||
1130 | // if (cost > 0) | ||
1131 | // // dont remember where is money unit name to put here | ||
1132 | // str = "Upload complete. charged " + cost.ToString() + "$"; | ||
1133 | // else | ||
1134 | // str = "Upload complete"; | ||
1135 | // client.SendAgentAlertMessage(str, true); | ||
1136 | // } | ||
1137 | } | ||
719 | } | 1138 | } |
1139 | |||
1140 | lock (m_ModelCost) | ||
1141 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
720 | } | 1142 | } |
721 | 1143 | ||
722 | /// <summary> | 1144 | /// <summary> |
@@ -909,6 +1331,120 @@ namespace OpenSim.Region.ClientStack.Linden | |||
909 | return response; | 1331 | return response; |
910 | } | 1332 | } |
911 | 1333 | ||
1334 | public string GetObjectCost(string request, string path, | ||
1335 | string param, IOSHttpRequest httpRequest, | ||
1336 | IOSHttpResponse httpResponse) | ||
1337 | { | ||
1338 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | ||
1339 | OSDMap resp = new OSDMap(); | ||
1340 | |||
1341 | OSDArray object_ids = (OSDArray)req["object_ids"]; | ||
1342 | |||
1343 | for (int i = 0; i < object_ids.Count; i++) | ||
1344 | { | ||
1345 | UUID uuid = object_ids[i].AsUUID(); | ||
1346 | |||
1347 | SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid); | ||
1348 | |||
1349 | if (part != null) | ||
1350 | { | ||
1351 | SceneObjectGroup grp = part.ParentGroup; | ||
1352 | if (grp != null) | ||
1353 | { | ||
1354 | float linksetCost; | ||
1355 | float linksetPhysCost; | ||
1356 | float partCost; | ||
1357 | float partPhysCost; | ||
1358 | |||
1359 | grp.GetResourcesCosts(part, out linksetCost, out linksetPhysCost, out partCost, out partPhysCost); | ||
1360 | |||
1361 | OSDMap object_data = new OSDMap(); | ||
1362 | object_data["linked_set_resource_cost"] = linksetCost; | ||
1363 | object_data["resource_cost"] = partCost; | ||
1364 | object_data["physics_cost"] = partPhysCost; | ||
1365 | object_data["linked_set_physics_cost"] = linksetPhysCost; | ||
1366 | |||
1367 | resp[uuid.ToString()] = object_data; | ||
1368 | } | ||
1369 | } | ||
1370 | } | ||
1371 | |||
1372 | string response = OSDParser.SerializeLLSDXmlString(resp); | ||
1373 | return response; | ||
1374 | } | ||
1375 | |||
1376 | public string ResourceCostSelected(string request, string path, | ||
1377 | string param, IOSHttpRequest httpRequest, | ||
1378 | IOSHttpResponse httpResponse) | ||
1379 | { | ||
1380 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | ||
1381 | OSDMap resp = new OSDMap(); | ||
1382 | |||
1383 | |||
1384 | float phys=0; | ||
1385 | float stream=0; | ||
1386 | float simul=0; | ||
1387 | |||
1388 | if (req.ContainsKey("selected_roots")) | ||
1389 | { | ||
1390 | OSDArray object_ids = (OSDArray)req["selected_roots"]; | ||
1391 | |||
1392 | // should go by SOG suming costs for all parts | ||
1393 | // ll v3 works ok with several objects select we get the list and adds ok | ||
1394 | // FS calls per object so results are wrong guess fs bug | ||
1395 | for (int i = 0; i < object_ids.Count; i++) | ||
1396 | { | ||
1397 | UUID uuid = object_ids[i].AsUUID(); | ||
1398 | float Physc; | ||
1399 | float simulc; | ||
1400 | float streamc; | ||
1401 | |||
1402 | SceneObjectGroup grp = m_Scene.GetGroupByPrim(uuid); | ||
1403 | if (grp != null) | ||
1404 | { | ||
1405 | grp.GetSelectedCosts(out Physc, out streamc, out simulc); | ||
1406 | phys += Physc; | ||
1407 | stream += streamc; | ||
1408 | simul += simulc; | ||
1409 | } | ||
1410 | } | ||
1411 | } | ||
1412 | else if (req.ContainsKey("selected_prims")) | ||
1413 | { | ||
1414 | OSDArray object_ids = (OSDArray)req["selected_prims"]; | ||
1415 | |||
1416 | // don't see in use in any of the 2 viewers | ||
1417 | // guess it should be for edit linked but... nothing | ||
1418 | // should go to SOP per part | ||
1419 | for (int i = 0; i < object_ids.Count; i++) | ||
1420 | { | ||
1421 | UUID uuid = object_ids[i].AsUUID(); | ||
1422 | |||
1423 | SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid); | ||
1424 | if (part != null) | ||
1425 | { | ||
1426 | phys += part.PhysicsCost; | ||
1427 | stream += part.StreamingCost; | ||
1428 | simul += part.SimulationCost; | ||
1429 | } | ||
1430 | } | ||
1431 | } | ||
1432 | |||
1433 | if (simul != 0) | ||
1434 | { | ||
1435 | OSDMap object_data = new OSDMap(); | ||
1436 | |||
1437 | object_data["physics"] = phys; | ||
1438 | object_data["streaming"] = stream; | ||
1439 | object_data["simulation"] = simul; | ||
1440 | |||
1441 | resp["selected"] = object_data; | ||
1442 | } | ||
1443 | |||
1444 | string response = OSDParser.SerializeLLSDXmlString(resp); | ||
1445 | return response; | ||
1446 | } | ||
1447 | |||
912 | public string UpdateAgentInformation(string request, string path, | 1448 | public string UpdateAgentInformation(string request, string path, |
913 | string param, IOSHttpRequest httpRequest, | 1449 | string param, IOSHttpRequest httpRequest, |
914 | IOSHttpResponse httpResponse) | 1450 | IOSHttpResponse httpResponse) |
@@ -928,6 +1464,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
928 | 1464 | ||
929 | public class AssetUploader | 1465 | public class AssetUploader |
930 | { | 1466 | { |
1467 | private static readonly ILog m_log = | ||
1468 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
1469 | |||
1470 | |||
931 | public event UpLoadedAsset OnUpLoad; | 1471 | public event UpLoadedAsset OnUpLoad; |
932 | private UpLoadedAsset handlerUpLoad = null; | 1472 | private UpLoadedAsset handlerUpLoad = null; |
933 | 1473 | ||
@@ -942,10 +1482,21 @@ namespace OpenSim.Region.ClientStack.Linden | |||
942 | 1482 | ||
943 | private string m_invType = String.Empty; | 1483 | private string m_invType = String.Empty; |
944 | private string m_assetType = String.Empty; | 1484 | private string m_assetType = String.Empty; |
1485 | private int m_cost; | ||
1486 | private string m_error = String.Empty; | ||
1487 | |||
1488 | private Timer m_timeoutTimer = new Timer(); | ||
1489 | private UUID m_texturesFolder; | ||
1490 | private int m_nreqtextures; | ||
1491 | private int m_nreqmeshs; | ||
1492 | private int m_nreqinstances; | ||
1493 | private bool m_IsAtestUpload; | ||
945 | 1494 | ||
946 | public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem, | 1495 | public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem, |
947 | UUID parentFolderID, string invType, string assetType, string path, | 1496 | UUID parentFolderID, string invType, string assetType, string path, |
948 | IHttpServer httpServer, bool dumpAssetsToFile) | 1497 | IHttpServer httpServer, bool dumpAssetsToFile, |
1498 | int totalCost, UUID texturesFolder, int nreqtextures, int nreqmeshs, int nreqinstances, | ||
1499 | bool IsAtestUpload) | ||
949 | { | 1500 | { |
950 | m_assetName = assetName; | 1501 | m_assetName = assetName; |
951 | m_assetDes = description; | 1502 | m_assetDes = description; |
@@ -957,6 +1508,18 @@ namespace OpenSim.Region.ClientStack.Linden | |||
957 | m_assetType = assetType; | 1508 | m_assetType = assetType; |
958 | m_invType = invType; | 1509 | m_invType = invType; |
959 | m_dumpAssetsToFile = dumpAssetsToFile; | 1510 | m_dumpAssetsToFile = dumpAssetsToFile; |
1511 | m_cost = totalCost; | ||
1512 | |||
1513 | m_texturesFolder = texturesFolder; | ||
1514 | m_nreqtextures = nreqtextures; | ||
1515 | m_nreqmeshs = nreqmeshs; | ||
1516 | m_nreqinstances = nreqinstances; | ||
1517 | m_IsAtestUpload = IsAtestUpload; | ||
1518 | |||
1519 | m_timeoutTimer.Elapsed += TimedOut; | ||
1520 | m_timeoutTimer.Interval = 120000; | ||
1521 | m_timeoutTimer.AutoReset = false; | ||
1522 | m_timeoutTimer.Start(); | ||
960 | } | 1523 | } |
961 | 1524 | ||
962 | /// <summary> | 1525 | /// <summary> |
@@ -971,12 +1534,14 @@ namespace OpenSim.Region.ClientStack.Linden | |||
971 | UUID inv = inventoryItemID; | 1534 | UUID inv = inventoryItemID; |
972 | string res = String.Empty; | 1535 | string res = String.Empty; |
973 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); | 1536 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); |
1537 | /* | ||
974 | uploadComplete.new_asset = newAssetID.ToString(); | 1538 | uploadComplete.new_asset = newAssetID.ToString(); |
975 | uploadComplete.new_inventory_item = inv; | 1539 | uploadComplete.new_inventory_item = inv; |
976 | uploadComplete.state = "complete"; | 1540 | uploadComplete.state = "complete"; |
977 | 1541 | ||
978 | res = LLSDHelpers.SerialiseLLSDReply(uploadComplete); | 1542 | res = LLSDHelpers.SerialiseLLSDReply(uploadComplete); |
979 | 1543 | */ | |
1544 | m_timeoutTimer.Stop(); | ||
980 | httpListener.RemoveStreamHandler("POST", uploaderPath); | 1545 | httpListener.RemoveStreamHandler("POST", uploaderPath); |
981 | 1546 | ||
982 | // TODO: probably make this a better set of extensions here | 1547 | // TODO: probably make this a better set of extensions here |
@@ -993,12 +1558,49 @@ namespace OpenSim.Region.ClientStack.Linden | |||
993 | handlerUpLoad = OnUpLoad; | 1558 | handlerUpLoad = OnUpLoad; |
994 | if (handlerUpLoad != null) | 1559 | if (handlerUpLoad != null) |
995 | { | 1560 | { |
996 | handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType); | 1561 | handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType, |
1562 | m_cost, m_texturesFolder, m_nreqtextures, m_nreqmeshs, m_nreqinstances, m_IsAtestUpload, ref m_error); | ||
1563 | } | ||
1564 | if (m_IsAtestUpload) | ||
1565 | { | ||
1566 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); | ||
1567 | resperror.message = "Upload SUCESSEFULL for testing purposes only. Other uses are prohibited. Item will not work after 48 hours or on other regions"; | ||
1568 | resperror.identifier = inv; | ||
1569 | |||
1570 | uploadComplete.error = resperror; | ||
1571 | uploadComplete.state = "Upload4Testing"; | ||
997 | } | 1572 | } |
1573 | else | ||
1574 | { | ||
1575 | if (m_error == String.Empty) | ||
1576 | { | ||
1577 | uploadComplete.new_asset = newAssetID.ToString(); | ||
1578 | uploadComplete.new_inventory_item = inv; | ||
1579 | // if (m_texturesFolder != UUID.Zero) | ||
1580 | // uploadComplete.new_texture_folder_id = m_texturesFolder; | ||
1581 | uploadComplete.state = "complete"; | ||
1582 | } | ||
1583 | else | ||
1584 | { | ||
1585 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); | ||
1586 | resperror.message = m_error; | ||
1587 | resperror.identifier = inv; | ||
998 | 1588 | ||
1589 | uploadComplete.error = resperror; | ||
1590 | uploadComplete.state = "failed"; | ||
1591 | } | ||
1592 | } | ||
1593 | |||
1594 | res = LLSDHelpers.SerialiseLLSDReply(uploadComplete); | ||
999 | return res; | 1595 | return res; |
1000 | } | 1596 | } |
1001 | 1597 | ||
1598 | private void TimedOut(object sender, ElapsedEventArgs args) | ||
1599 | { | ||
1600 | m_log.InfoFormat("[CAPS]: Removing URL and handler for timed out mesh upload"); | ||
1601 | httpListener.RemoveStreamHandler("POST", uploaderPath); | ||
1602 | } | ||
1603 | |||
1002 | ///Left this in and commented in case there are unforseen issues | 1604 | ///Left this in and commented in case there are unforseen issues |
1003 | //private void SaveAssetToFile(string filename, byte[] data) | 1605 | //private void SaveAssetToFile(string filename, byte[] data) |
1004 | //{ | 1606 | //{ |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs new file mode 100644 index 0000000..4a3fae6 --- /dev/null +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs | |||
@@ -0,0 +1,671 @@ | |||
1 | // Proprietary code of Avination Virtual Limited | ||
2 | // (c) 2012 Melanie Thielker, Leal Duarte | ||
3 | // | ||
4 | |||
5 | using System; | ||
6 | using System.IO; | ||
7 | using System.Collections; | ||
8 | using System.Collections.Generic; | ||
9 | using System.Text; | ||
10 | |||
11 | using OpenMetaverse; | ||
12 | using OpenMetaverse.StructuredData; | ||
13 | |||
14 | using OpenSim.Framework; | ||
15 | using OpenSim.Region.Framework; | ||
16 | using OpenSim.Region.Framework.Scenes; | ||
17 | using OpenSim.Framework.Capabilities; | ||
18 | |||
19 | using ComponentAce.Compression.Libs.zlib; | ||
20 | |||
21 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; | ||
22 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; | ||
23 | |||
24 | namespace OpenSim.Region.ClientStack.Linden | ||
25 | { | ||
26 | public struct ModelPrimLimits | ||
27 | { | ||
28 | |||
29 | } | ||
30 | |||
31 | public class ModelCost | ||
32 | { | ||
33 | |||
34 | // upload fee defaults | ||
35 | // fees are normalized to 1.0 | ||
36 | // this parameters scale them to basic cost ( so 1.0 translates to 10 ) | ||
37 | |||
38 | public float ModelMeshCostFactor = 0.0f; // scale total cost relative to basic (excluding textures) | ||
39 | public float ModelTextureCostFactor = 1.0f; // scale textures fee to basic. | ||
40 | public float ModelMinCostFactor = 0.0f; // 0.5f; // minimum total model free excluding textures | ||
41 | |||
42 | // itens costs in normalized values | ||
43 | // ie will be multiplied by basicCost and factors above | ||
44 | public float primCreationCost = 0.002f; // extra cost for each prim creation overhead | ||
45 | // weigthed size to normalized cost | ||
46 | public float bytecost = 1e-5f; | ||
47 | |||
48 | // mesh upload fees based on compressed data sizes | ||
49 | // several data sections are counted more that once | ||
50 | // to promote user optimization | ||
51 | // following parameters control how many extra times they are added | ||
52 | // to global size. | ||
53 | // LOD meshs | ||
54 | const float medSizeWth = 1f; // 2x | ||
55 | const float lowSizeWth = 1.5f; // 2.5x | ||
56 | const float lowestSizeWth = 2f; // 3x | ||
57 | // favor potencially physical optimized meshs versus automatic decomposition | ||
58 | const float physMeshSizeWth = 6f; // counts 7x | ||
59 | const float physHullSizeWth = 8f; // counts 9x | ||
60 | |||
61 | // stream cost area factors | ||
62 | // more or less like SL | ||
63 | const float highLodFactor = 17.36f; | ||
64 | const float midLodFactor = 277.78f; | ||
65 | const float lowLodFactor = 1111.11f; | ||
66 | |||
67 | // physics cost is below, identical to SL, assuming shape type convex | ||
68 | // server cost is below identical to SL assuming non scripted non physical object | ||
69 | |||
70 | // internal | ||
71 | const int bytesPerCoord = 6; // 3 coords, 2 bytes per each | ||
72 | |||
73 | // control prims dimensions | ||
74 | public float PrimScaleMin = 0.001f; | ||
75 | public float NonPhysicalPrimScaleMax = 256f; | ||
76 | public float PhysicalPrimScaleMax = 10f; | ||
77 | public int ObjectLinkedPartsMax = 512; | ||
78 | |||
79 | // storage for a single mesh asset cost parameters | ||
80 | private class ameshCostParam | ||
81 | { | ||
82 | // LOD sizes for size dependent streaming cost | ||
83 | public int highLODSize; | ||
84 | public int medLODSize; | ||
85 | public int lowLODSize; | ||
86 | public int lowestLODSize; | ||
87 | // normalized fee based on compressed data sizes | ||
88 | public float costFee; | ||
89 | // physics cost | ||
90 | public float physicsCost; | ||
91 | } | ||
92 | |||
93 | // calculates a mesh model costs | ||
94 | // returns false on error, with a reason on parameter error | ||
95 | // resources input LLSD request | ||
96 | // basicCost input region assets upload cost | ||
97 | // totalcost returns model total upload fee | ||
98 | // meshcostdata returns detailed costs for viewer | ||
99 | public bool MeshModelCost(LLSDAssetResource resources, int basicCost, out int totalcost, | ||
100 | LLSDAssetUploadResponseData meshcostdata, out string error, ref string warning) | ||
101 | { | ||
102 | totalcost = 0; | ||
103 | error = string.Empty; | ||
104 | |||
105 | if (resources == null || | ||
106 | resources.instance_list == null || | ||
107 | resources.instance_list.Array.Count == 0) | ||
108 | { | ||
109 | error = "missing model information."; | ||
110 | return false; | ||
111 | } | ||
112 | |||
113 | int numberInstances = resources.instance_list.Array.Count; | ||
114 | |||
115 | if( numberInstances > ObjectLinkedPartsMax ) | ||
116 | { | ||
117 | error = "Model whould have more than " + ObjectLinkedPartsMax.ToString() + " linked prims"; | ||
118 | return false; | ||
119 | } | ||
120 | |||
121 | meshcostdata.model_streaming_cost = 0.0; | ||
122 | meshcostdata.simulation_cost = 0.0; | ||
123 | meshcostdata.physics_cost = 0.0; | ||
124 | meshcostdata.resource_cost = 0.0; | ||
125 | |||
126 | meshcostdata.upload_price_breakdown.mesh_instance = 0; | ||
127 | meshcostdata.upload_price_breakdown.mesh_physics = 0; | ||
128 | meshcostdata.upload_price_breakdown.mesh_streaming = 0; | ||
129 | meshcostdata.upload_price_breakdown.model = 0; | ||
130 | |||
131 | int itmp; | ||
132 | |||
133 | // textures cost | ||
134 | if (resources.texture_list != null && resources.texture_list.Array.Count > 0) | ||
135 | { | ||
136 | float textures_cost = (float)(resources.texture_list.Array.Count * basicCost); | ||
137 | textures_cost *= ModelTextureCostFactor; | ||
138 | |||
139 | itmp = (int)(textures_cost + 0.5f); // round | ||
140 | meshcostdata.upload_price_breakdown.texture = itmp; | ||
141 | totalcost += itmp; | ||
142 | } | ||
143 | |||
144 | // meshs assets cost | ||
145 | float meshsfee = 0; | ||
146 | int numberMeshs = 0; | ||
147 | bool haveMeshs = false; | ||
148 | List<ameshCostParam> meshsCosts = new List<ameshCostParam>(); | ||
149 | |||
150 | if (resources.mesh_list != null && resources.mesh_list.Array.Count > 0) | ||
151 | { | ||
152 | numberMeshs = resources.mesh_list.Array.Count; | ||
153 | |||
154 | for (int i = 0; i < numberMeshs; i++) | ||
155 | { | ||
156 | ameshCostParam curCost = new ameshCostParam(); | ||
157 | byte[] data = (byte[])resources.mesh_list.Array[i]; | ||
158 | |||
159 | if (!MeshCost(data, curCost, out error)) | ||
160 | { | ||
161 | return false; | ||
162 | } | ||
163 | meshsCosts.Add(curCost); | ||
164 | meshsfee += curCost.costFee; | ||
165 | } | ||
166 | haveMeshs = true; | ||
167 | } | ||
168 | |||
169 | // instances (prims) cost | ||
170 | |||
171 | |||
172 | int mesh; | ||
173 | int skipedSmall = 0; | ||
174 | for (int i = 0; i < numberInstances; i++) | ||
175 | { | ||
176 | Hashtable inst = (Hashtable)resources.instance_list.Array[i]; | ||
177 | |||
178 | ArrayList ascale = (ArrayList)inst["scale"]; | ||
179 | Vector3 scale; | ||
180 | double tmp; | ||
181 | tmp = (double)ascale[0]; | ||
182 | scale.X = (float)tmp; | ||
183 | tmp = (double)ascale[1]; | ||
184 | scale.Y = (float)tmp; | ||
185 | tmp = (double)ascale[2]; | ||
186 | scale.Z = (float)tmp; | ||
187 | |||
188 | if (scale.X < PrimScaleMin || scale.Y < PrimScaleMin || scale.Z < PrimScaleMin) | ||
189 | { | ||
190 | skipedSmall++; | ||
191 | continue; | ||
192 | } | ||
193 | |||
194 | if (scale.X > NonPhysicalPrimScaleMax || scale.Y > NonPhysicalPrimScaleMax || scale.Z > NonPhysicalPrimScaleMax) | ||
195 | { | ||
196 | error = "Model contains parts with sides larger than " + NonPhysicalPrimScaleMax.ToString() + "m. Please ajust scale"; | ||
197 | return false; | ||
198 | } | ||
199 | |||
200 | if (haveMeshs && inst.ContainsKey("mesh")) | ||
201 | { | ||
202 | mesh = (int)inst["mesh"]; | ||
203 | |||
204 | if (mesh >= numberMeshs) | ||
205 | { | ||
206 | error = "Incoerent model information."; | ||
207 | return false; | ||
208 | } | ||
209 | |||
210 | // streamming cost | ||
211 | |||
212 | float sqdiam = scale.LengthSquared(); | ||
213 | |||
214 | ameshCostParam curCost = meshsCosts[mesh]; | ||
215 | float mesh_streaming = streamingCost(curCost, sqdiam); | ||
216 | |||
217 | meshcostdata.model_streaming_cost += mesh_streaming; | ||
218 | meshcostdata.physics_cost += curCost.physicsCost; | ||
219 | } | ||
220 | else // instance as no mesh ?? | ||
221 | { | ||
222 | // to do later if needed | ||
223 | meshcostdata.model_streaming_cost += 0.5f; | ||
224 | meshcostdata.physics_cost += 1.0f; | ||
225 | } | ||
226 | |||
227 | // assume unscripted and static prim server cost | ||
228 | meshcostdata.simulation_cost += 0.5f; | ||
229 | // charge for prims creation | ||
230 | meshsfee += primCreationCost; | ||
231 | } | ||
232 | |||
233 | if (skipedSmall > 0) | ||
234 | { | ||
235 | if (skipedSmall > numberInstances / 2) | ||
236 | { | ||
237 | error = "Model contains too many prims smaller than " + PrimScaleMin.ToString() + | ||
238 | "m minimum allowed size. Please check scalling"; | ||
239 | return false; | ||
240 | } | ||
241 | else | ||
242 | warning += skipedSmall.ToString() + " of the requested " +numberInstances.ToString() + | ||
243 | " model prims will not upload because they are smaller than " + PrimScaleMin.ToString() + | ||
244 | "m minimum allowed size. Please check scalling "; | ||
245 | } | ||
246 | |||
247 | if (meshcostdata.physics_cost <= meshcostdata.model_streaming_cost) | ||
248 | meshcostdata.resource_cost = meshcostdata.model_streaming_cost; | ||
249 | else | ||
250 | meshcostdata.resource_cost = meshcostdata.physics_cost; | ||
251 | |||
252 | if (meshcostdata.resource_cost < meshcostdata.simulation_cost) | ||
253 | meshcostdata.resource_cost = meshcostdata.simulation_cost; | ||
254 | |||
255 | // scale cost | ||
256 | // at this point a cost of 1.0 whould mean basic cost | ||
257 | meshsfee *= ModelMeshCostFactor; | ||
258 | |||
259 | if (meshsfee < ModelMinCostFactor) | ||
260 | meshsfee = ModelMinCostFactor; | ||
261 | |||
262 | // actually scale it to basic cost | ||
263 | meshsfee *= (float)basicCost; | ||
264 | |||
265 | meshsfee += 0.5f; // rounding | ||
266 | |||
267 | totalcost += (int)meshsfee; | ||
268 | |||
269 | // breakdown prices | ||
270 | // don't seem to be in use so removed code for now | ||
271 | |||
272 | return true; | ||
273 | } | ||
274 | |||
275 | // single mesh asset cost | ||
276 | private bool MeshCost(byte[] data, ameshCostParam cost, out string error) | ||
277 | { | ||
278 | cost.highLODSize = 0; | ||
279 | cost.medLODSize = 0; | ||
280 | cost.lowLODSize = 0; | ||
281 | cost.lowestLODSize = 0; | ||
282 | cost.physicsCost = 0.0f; | ||
283 | cost.costFee = 0.0f; | ||
284 | |||
285 | error = string.Empty; | ||
286 | |||
287 | if (data == null || data.Length == 0) | ||
288 | { | ||
289 | error = "Missing model information."; | ||
290 | return false; | ||
291 | } | ||
292 | |||
293 | OSD meshOsd = null; | ||
294 | int start = 0; | ||
295 | |||
296 | error = "Invalid model data"; | ||
297 | |||
298 | using (MemoryStream ms = new MemoryStream(data)) | ||
299 | { | ||
300 | try | ||
301 | { | ||
302 | OSD osd = OSDParser.DeserializeLLSDBinary(ms); | ||
303 | if (osd is OSDMap) | ||
304 | meshOsd = (OSDMap)osd; | ||
305 | else | ||
306 | return false; | ||
307 | } | ||
308 | catch (Exception e) | ||
309 | { | ||
310 | return false; | ||
311 | } | ||
312 | start = (int)ms.Position; | ||
313 | } | ||
314 | |||
315 | OSDMap map = (OSDMap)meshOsd; | ||
316 | OSDMap tmpmap; | ||
317 | |||
318 | int highlod_size = 0; | ||
319 | int medlod_size = 0; | ||
320 | int lowlod_size = 0; | ||
321 | int lowestlod_size = 0; | ||
322 | int skin_size = 0; | ||
323 | |||
324 | int hulls_size = 0; | ||
325 | int phys_nhulls; | ||
326 | int phys_hullsvertices = 0; | ||
327 | |||
328 | int physmesh_size = 0; | ||
329 | int phys_ntriangles = 0; | ||
330 | |||
331 | int submesh_offset = -1; | ||
332 | |||
333 | if (map.ContainsKey("physics_convex")) | ||
334 | { | ||
335 | tmpmap = (OSDMap)map["physics_convex"]; | ||
336 | if (tmpmap.ContainsKey("offset")) | ||
337 | submesh_offset = tmpmap["offset"].AsInteger() + start; | ||
338 | if (tmpmap.ContainsKey("size")) | ||
339 | hulls_size = tmpmap["size"].AsInteger(); | ||
340 | } | ||
341 | |||
342 | if (submesh_offset < 0 || hulls_size == 0) | ||
343 | { | ||
344 | error = "Missing physics_convex block"; | ||
345 | return false; | ||
346 | } | ||
347 | |||
348 | if (!hulls(data, submesh_offset, hulls_size, out phys_hullsvertices, out phys_nhulls)) | ||
349 | { | ||
350 | error = "Bad physics_convex block"; | ||
351 | return false; | ||
352 | } | ||
353 | |||
354 | submesh_offset = -1; | ||
355 | |||
356 | // only look for LOD meshs sizes | ||
357 | |||
358 | if (map.ContainsKey("high_lod")) | ||
359 | { | ||
360 | tmpmap = (OSDMap)map["high_lod"]; | ||
361 | // see at least if there is a offset for this one | ||
362 | if (tmpmap.ContainsKey("offset")) | ||
363 | submesh_offset = tmpmap["offset"].AsInteger() + start; | ||
364 | if (tmpmap.ContainsKey("size")) | ||
365 | highlod_size = tmpmap["size"].AsInteger(); | ||
366 | } | ||
367 | |||
368 | if (submesh_offset < 0 || highlod_size <= 0) | ||
369 | { | ||
370 | error = "Missing high_lod block"; | ||
371 | return false; | ||
372 | } | ||
373 | |||
374 | bool haveprev = true; | ||
375 | |||
376 | if (map.ContainsKey("medium_lod")) | ||
377 | { | ||
378 | tmpmap = (OSDMap)map["medium_lod"]; | ||
379 | if (tmpmap.ContainsKey("size")) | ||
380 | medlod_size = tmpmap["size"].AsInteger(); | ||
381 | else | ||
382 | haveprev = false; | ||
383 | } | ||
384 | |||
385 | if (haveprev && map.ContainsKey("low_lod")) | ||
386 | { | ||
387 | tmpmap = (OSDMap)map["low_lod"]; | ||
388 | if (tmpmap.ContainsKey("size")) | ||
389 | lowlod_size = tmpmap["size"].AsInteger(); | ||
390 | else | ||
391 | haveprev = false; | ||
392 | } | ||
393 | |||
394 | if (haveprev && map.ContainsKey("lowest_lod")) | ||
395 | { | ||
396 | tmpmap = (OSDMap)map["lowest_lod"]; | ||
397 | if (tmpmap.ContainsKey("size")) | ||
398 | lowestlod_size = tmpmap["size"].AsInteger(); | ||
399 | } | ||
400 | |||
401 | if (map.ContainsKey("skin")) | ||
402 | { | ||
403 | tmpmap = (OSDMap)map["skin"]; | ||
404 | if (tmpmap.ContainsKey("size")) | ||
405 | skin_size = tmpmap["size"].AsInteger(); | ||
406 | } | ||
407 | |||
408 | cost.highLODSize = highlod_size; | ||
409 | cost.medLODSize = medlod_size; | ||
410 | cost.lowLODSize = lowlod_size; | ||
411 | cost.lowestLODSize = lowestlod_size; | ||
412 | |||
413 | submesh_offset = -1; | ||
414 | |||
415 | tmpmap = null; | ||
416 | if(map.ContainsKey("physics_mesh")) | ||
417 | tmpmap = (OSDMap)map["physics_mesh"]; | ||
418 | else if (map.ContainsKey("physics_shape")) // old naming | ||
419 | tmpmap = (OSDMap)map["physics_shape"]; | ||
420 | |||
421 | if(tmpmap != null) | ||
422 | { | ||
423 | if (tmpmap.ContainsKey("offset")) | ||
424 | submesh_offset = tmpmap["offset"].AsInteger() + start; | ||
425 | if (tmpmap.ContainsKey("size")) | ||
426 | physmesh_size = tmpmap["size"].AsInteger(); | ||
427 | |||
428 | if (submesh_offset >= 0 || physmesh_size > 0) | ||
429 | { | ||
430 | |||
431 | if (!submesh(data, submesh_offset, physmesh_size, out phys_ntriangles)) | ||
432 | { | ||
433 | error = "Model data parsing error"; | ||
434 | return false; | ||
435 | } | ||
436 | } | ||
437 | } | ||
438 | |||
439 | // upload is done in convex shape type so only one hull | ||
440 | phys_hullsvertices++; | ||
441 | cost.physicsCost = 0.04f * phys_hullsvertices; | ||
442 | |||
443 | float sfee; | ||
444 | |||
445 | sfee = data.Length; // start with total compressed data size | ||
446 | |||
447 | // penalize lod meshs that should be more builder optimized | ||
448 | sfee += medSizeWth * medlod_size; | ||
449 | sfee += lowSizeWth * lowlod_size; | ||
450 | sfee += lowestSizeWth * lowlod_size; | ||
451 | |||
452 | // physics | ||
453 | // favor potencial optimized meshs versus automatic decomposition | ||
454 | if (physmesh_size != 0) | ||
455 | sfee += physMeshSizeWth * (physmesh_size + hulls_size / 4); // reduce cost of mandatory convex hull | ||
456 | else | ||
457 | sfee += physHullSizeWth * hulls_size; | ||
458 | |||
459 | // bytes to money | ||
460 | sfee *= bytecost; | ||
461 | |||
462 | cost.costFee = sfee; | ||
463 | return true; | ||
464 | } | ||
465 | |||
466 | // parses a LOD or physics mesh component | ||
467 | private bool submesh(byte[] data, int offset, int size, out int ntriangles) | ||
468 | { | ||
469 | ntriangles = 0; | ||
470 | |||
471 | OSD decodedMeshOsd = new OSD(); | ||
472 | byte[] meshBytes = new byte[size]; | ||
473 | System.Buffer.BlockCopy(data, offset, meshBytes, 0, size); | ||
474 | try | ||
475 | { | ||
476 | using (MemoryStream inMs = new MemoryStream(meshBytes)) | ||
477 | { | ||
478 | using (MemoryStream outMs = new MemoryStream()) | ||
479 | { | ||
480 | using (ZOutputStream zOut = new ZOutputStream(outMs)) | ||
481 | { | ||
482 | byte[] readBuffer = new byte[4096]; | ||
483 | int readLen = 0; | ||
484 | while ((readLen = inMs.Read(readBuffer, 0, readBuffer.Length)) > 0) | ||
485 | { | ||
486 | zOut.Write(readBuffer, 0, readLen); | ||
487 | } | ||
488 | zOut.Flush(); | ||
489 | outMs.Seek(0, SeekOrigin.Begin); | ||
490 | |||
491 | byte[] decompressedBuf = outMs.GetBuffer(); | ||
492 | decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf); | ||
493 | } | ||
494 | } | ||
495 | } | ||
496 | } | ||
497 | catch (Exception e) | ||
498 | { | ||
499 | return false; | ||
500 | } | ||
501 | |||
502 | OSDArray decodedMeshOsdArray = null; | ||
503 | if ((!decodedMeshOsd is OSDArray)) | ||
504 | return false; | ||
505 | |||
506 | byte[] dummy; | ||
507 | |||
508 | decodedMeshOsdArray = (OSDArray)decodedMeshOsd; | ||
509 | foreach (OSD subMeshOsd in decodedMeshOsdArray) | ||
510 | { | ||
511 | if (subMeshOsd is OSDMap) | ||
512 | { | ||
513 | OSDMap subtmpmap = (OSDMap)subMeshOsd; | ||
514 | if (subtmpmap.ContainsKey("NoGeometry") && ((OSDBoolean)subtmpmap["NoGeometry"])) | ||
515 | continue; | ||
516 | |||
517 | if (!subtmpmap.ContainsKey("Position")) | ||
518 | return false; | ||
519 | |||
520 | if (subtmpmap.ContainsKey("TriangleList")) | ||
521 | { | ||
522 | dummy = subtmpmap["TriangleList"].AsBinary(); | ||
523 | ntriangles += dummy.Length / bytesPerCoord; | ||
524 | } | ||
525 | else | ||
526 | return false; | ||
527 | } | ||
528 | } | ||
529 | |||
530 | return true; | ||
531 | } | ||
532 | |||
533 | // parses convex hulls component | ||
534 | private bool hulls(byte[] data, int offset, int size, out int nvertices, out int nhulls) | ||
535 | { | ||
536 | nvertices = 0; | ||
537 | nhulls = 1; | ||
538 | |||
539 | OSD decodedMeshOsd = new OSD(); | ||
540 | byte[] meshBytes = new byte[size]; | ||
541 | System.Buffer.BlockCopy(data, offset, meshBytes, 0, size); | ||
542 | try | ||
543 | { | ||
544 | using (MemoryStream inMs = new MemoryStream(meshBytes)) | ||
545 | { | ||
546 | using (MemoryStream outMs = new MemoryStream()) | ||
547 | { | ||
548 | using (ZOutputStream zOut = new ZOutputStream(outMs)) | ||
549 | { | ||
550 | byte[] readBuffer = new byte[4096]; | ||
551 | int readLen = 0; | ||
552 | while ((readLen = inMs.Read(readBuffer, 0, readBuffer.Length)) > 0) | ||
553 | { | ||
554 | zOut.Write(readBuffer, 0, readLen); | ||
555 | } | ||
556 | zOut.Flush(); | ||
557 | outMs.Seek(0, SeekOrigin.Begin); | ||
558 | |||
559 | byte[] decompressedBuf = outMs.GetBuffer(); | ||
560 | decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf); | ||
561 | } | ||
562 | } | ||
563 | } | ||
564 | } | ||
565 | catch (Exception e) | ||
566 | { | ||
567 | return false; | ||
568 | } | ||
569 | |||
570 | OSDMap cmap = (OSDMap)decodedMeshOsd; | ||
571 | if (cmap == null) | ||
572 | return false; | ||
573 | |||
574 | byte[] dummy; | ||
575 | |||
576 | // must have one of this | ||
577 | if (cmap.ContainsKey("BoundingVerts")) | ||
578 | { | ||
579 | dummy = cmap["BoundingVerts"].AsBinary(); | ||
580 | nvertices = dummy.Length / bytesPerCoord; | ||
581 | } | ||
582 | else | ||
583 | return false; | ||
584 | |||
585 | /* upload is done with convex shape type | ||
586 | if (cmap.ContainsKey("HullList")) | ||
587 | { | ||
588 | dummy = cmap["HullList"].AsBinary(); | ||
589 | nhulls += dummy.Length; | ||
590 | } | ||
591 | |||
592 | |||
593 | if (cmap.ContainsKey("Positions")) | ||
594 | { | ||
595 | dummy = cmap["Positions"].AsBinary(); | ||
596 | nvertices = dummy.Length / bytesPerCoord; | ||
597 | } | ||
598 | */ | ||
599 | |||
600 | return true; | ||
601 | } | ||
602 | |||
603 | // returns streaming cost from on mesh LODs sizes in curCost and square of prim size length | ||
604 | private float streamingCost(ameshCostParam curCost, float sqdiam) | ||
605 | { | ||
606 | // compute efective areas | ||
607 | float ma = 262144f; | ||
608 | |||
609 | float mh = sqdiam * highLodFactor; | ||
610 | if (mh > ma) | ||
611 | mh = ma; | ||
612 | float mm = sqdiam * midLodFactor; | ||
613 | if (mm > ma) | ||
614 | mm = ma; | ||
615 | |||
616 | float ml = sqdiam * lowLodFactor; | ||
617 | if (ml > ma) | ||
618 | ml = ma; | ||
619 | |||
620 | float mlst = ma; | ||
621 | |||
622 | mlst -= ml; | ||
623 | ml -= mm; | ||
624 | mm -= mh; | ||
625 | |||
626 | if (mlst < 1.0f) | ||
627 | mlst = 1.0f; | ||
628 | if (ml < 1.0f) | ||
629 | ml = 1.0f; | ||
630 | if (mm < 1.0f) | ||
631 | mm = 1.0f; | ||
632 | if (mh < 1.0f) | ||
633 | mh = 1.0f; | ||
634 | |||
635 | ma = mlst + ml + mm + mh; | ||
636 | |||
637 | // get LODs compressed sizes | ||
638 | // giving 384 bytes bonus | ||
639 | int lst = curCost.lowestLODSize - 384; | ||
640 | int l = curCost.lowLODSize - 384; | ||
641 | int m = curCost.medLODSize - 384; | ||
642 | int h = curCost.highLODSize - 384; | ||
643 | |||
644 | // use previus higher LOD size on missing ones | ||
645 | if (m <= 0) | ||
646 | m = h; | ||
647 | if (l <= 0) | ||
648 | l = m; | ||
649 | if (lst <= 0) | ||
650 | lst = l; | ||
651 | |||
652 | // force minumum sizes | ||
653 | if (lst < 16) | ||
654 | lst = 16; | ||
655 | if (l < 16) | ||
656 | l = 16; | ||
657 | if (m < 16) | ||
658 | m = 16; | ||
659 | if (h < 16) | ||
660 | h = 16; | ||
661 | |||
662 | // compute cost weighted by relative effective areas | ||
663 | float cost = (float)lst * mlst + (float)l * ml + (float)m * mm + (float)h * mh; | ||
664 | cost /= ma; | ||
665 | |||
666 | cost *= 0.004f; // overall tunning parameter | ||
667 | |||
668 | return cost; | ||
669 | } | ||
670 | } | ||
671 | } | ||
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 3cc3950..f6e501d 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
@@ -353,7 +353,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
353 | // TODO: Add EventQueueGet name/description for diagnostics | 353 | // TODO: Add EventQueueGet name/description for diagnostics |
354 | MainServer.Instance.AddPollServiceHTTPHandler( | 354 | MainServer.Instance.AddPollServiceHTTPHandler( |
355 | eventQueueGetPath, | 355 | eventQueueGetPath, |
356 | new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID)); | 356 | new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID, 1000)); |
357 | 357 | ||
358 | // m_log.DebugFormat( | 358 | // m_log.DebugFormat( |
359 | // "[EVENT QUEUE GET MODULE]: Registered EQG handler {0} for {1} in {2}", | 359 | // "[EVENT QUEUE GET MODULE]: Registered EQG handler {0} for {1} in {2}", |
@@ -395,7 +395,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
395 | } | 395 | } |
396 | } | 396 | } |
397 | 397 | ||
398 | public Hashtable GetEvents(UUID requestID, UUID pAgentId, string request) | 398 | public Hashtable GetEvents(UUID requestID, UUID pAgentId) |
399 | { | 399 | { |
400 | if (DebugLevel >= 2) | 400 | if (DebugLevel >= 2) |
401 | m_log.DebugFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName); | 401 | m_log.DebugFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName); |
@@ -467,8 +467,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
467 | responsedata["content_type"] = "text/plain"; | 467 | responsedata["content_type"] = "text/plain"; |
468 | responsedata["keepalive"] = false; | 468 | responsedata["keepalive"] = false; |
469 | responsedata["reusecontext"] = false; | 469 | responsedata["reusecontext"] = false; |
470 | responsedata["str_response_string"] = "Upstream error: "; | 470 | responsedata["str_response_string"] = "<llsd></llsd>"; |
471 | responsedata["error_status_text"] = "Upstream error:"; | 471 | responsedata["error_status_text"] = "<llsd></llsd>"; |
472 | responsedata["http_protocol_version"] = "HTTP/1.0"; | 472 | responsedata["http_protocol_version"] = "HTTP/1.0"; |
473 | return responsedata; | 473 | return responsedata; |
474 | } | 474 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs index dab727f..7dcf137 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs | |||
@@ -151,6 +151,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
151 | ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, | 151 | ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, |
152 | uint locationID, uint flags, string capsURL, UUID agentID) | 152 | uint locationID, uint flags, string capsURL, UUID agentID) |
153 | { | 153 | { |
154 | // not sure why flags get overwritten here | ||
155 | if ((flags & (uint)TeleportFlags.IsFlying) != 0) | ||
156 | flags = (uint)TeleportFlags.ViaLocation | (uint)TeleportFlags.IsFlying; | ||
157 | else | ||
158 | flags = (uint)TeleportFlags.ViaLocation; | ||
159 | |||
154 | OSDMap info = new OSDMap(); | 160 | OSDMap info = new OSDMap(); |
155 | info.Add("AgentID", OSD.FromUUID(agentID)); | 161 | info.Add("AgentID", OSD.FromUUID(agentID)); |
156 | info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this? | 162 | info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this? |
@@ -159,7 +165,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
159 | info.Add("SimAccess", OSD.FromInteger(simAccess)); | 165 | info.Add("SimAccess", OSD.FromInteger(simAccess)); |
160 | info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes())); | 166 | info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes())); |
161 | info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port)); | 167 | info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port)); |
162 | info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation | 168 | // info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation |
169 | info.Add("TeleportFlags", OSD.FromUInteger(flags)); | ||
163 | 170 | ||
164 | OSDArray infoArr = new OSDArray(); | 171 | OSDArray infoArr = new OSDArray(); |
165 | infoArr.Add(info); | 172 | infoArr.Add(info); |
@@ -398,7 +405,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
398 | public static OSD partPhysicsProperties(uint localID, byte physhapetype, | 405 | public static OSD partPhysicsProperties(uint localID, byte physhapetype, |
399 | float density, float friction, float bounce, float gravmod) | 406 | float density, float friction, float bounce, float gravmod) |
400 | { | 407 | { |
401 | 408 | ||
402 | OSDMap physinfo = new OSDMap(6); | 409 | OSDMap physinfo = new OSDMap(6); |
403 | physinfo["LocalID"] = localID; | 410 | physinfo["LocalID"] = localID; |
404 | physinfo["Density"] = density; | 411 | physinfo["Density"] = density; |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs index 8e1f63a..6ec1115 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | |||
@@ -27,11 +27,14 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | ||
30 | using System.Collections.Specialized; | 31 | using System.Collections.Specialized; |
31 | using System.Reflection; | 32 | using System.Reflection; |
32 | using System.IO; | 33 | using System.IO; |
34 | using System.Threading; | ||
33 | using System.Web; | 35 | using System.Web; |
34 | using Mono.Addins; | 36 | using Mono.Addins; |
37 | using OpenSim.Framework.Monitoring; | ||
35 | using log4net; | 38 | using log4net; |
36 | using Nini.Config; | 39 | using Nini.Config; |
37 | using OpenMetaverse; | 40 | using OpenMetaverse; |
@@ -57,9 +60,45 @@ namespace OpenSim.Region.ClientStack.Linden | |||
57 | private IAssetService m_AssetService; | 60 | private IAssetService m_AssetService; |
58 | private bool m_Enabled = true; | 61 | private bool m_Enabled = true; |
59 | private string m_URL; | 62 | private string m_URL; |
63 | |||
64 | struct aPollRequest | ||
65 | { | ||
66 | public PollServiceMeshEventArgs thepoll; | ||
67 | public UUID reqID; | ||
68 | public Hashtable request; | ||
69 | } | ||
70 | |||
71 | public class aPollResponse | ||
72 | { | ||
73 | public Hashtable response; | ||
74 | public int bytes; | ||
75 | public int lod; | ||
76 | } | ||
77 | |||
78 | |||
79 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
80 | |||
81 | private static GetMeshHandler m_getMeshHandler; | ||
82 | |||
83 | private IAssetService m_assetService = null; | ||
84 | |||
85 | private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>(); | ||
86 | private static Thread[] m_workerThreads = null; | ||
87 | |||
88 | private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue = | ||
89 | new OpenMetaverse.BlockingQueue<aPollRequest>(); | ||
90 | |||
91 | private Dictionary<UUID, PollServiceMeshEventArgs> m_pollservices = new Dictionary<UUID, PollServiceMeshEventArgs>(); | ||
60 | 92 | ||
61 | #region Region Module interfaceBase Members | 93 | #region Region Module interfaceBase Members |
62 | 94 | ||
95 | ~GetMeshModule() | ||
96 | { | ||
97 | foreach (Thread t in m_workerThreads) | ||
98 | Watchdog.AbortThread(t.ManagedThreadId); | ||
99 | |||
100 | } | ||
101 | |||
63 | public Type ReplaceableInterface | 102 | public Type ReplaceableInterface |
64 | { | 103 | { |
65 | get { return null; } | 104 | get { return null; } |
@@ -75,6 +114,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
75 | // Cap doesn't exist | 114 | // Cap doesn't exist |
76 | if (m_URL != string.Empty) | 115 | if (m_URL != string.Empty) |
77 | m_Enabled = true; | 116 | m_Enabled = true; |
117 | |||
78 | } | 118 | } |
79 | 119 | ||
80 | public void AddRegion(Scene pScene) | 120 | public void AddRegion(Scene pScene) |
@@ -83,6 +123,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
83 | return; | 123 | return; |
84 | 124 | ||
85 | m_scene = pScene; | 125 | m_scene = pScene; |
126 | |||
127 | m_assetService = pScene.AssetService; | ||
86 | } | 128 | } |
87 | 129 | ||
88 | public void RemoveRegion(Scene scene) | 130 | public void RemoveRegion(Scene scene) |
@@ -91,6 +133,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
91 | return; | 133 | return; |
92 | 134 | ||
93 | m_scene.EventManager.OnRegisterCaps -= RegisterCaps; | 135 | m_scene.EventManager.OnRegisterCaps -= RegisterCaps; |
136 | m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps; | ||
137 | m_scene.EventManager.OnThrottleUpdate -= ThrottleUpdate; | ||
138 | |||
94 | m_scene = null; | 139 | m_scene = null; |
95 | } | 140 | } |
96 | 141 | ||
@@ -101,6 +146,27 @@ namespace OpenSim.Region.ClientStack.Linden | |||
101 | 146 | ||
102 | m_AssetService = m_scene.RequestModuleInterface<IAssetService>(); | 147 | m_AssetService = m_scene.RequestModuleInterface<IAssetService>(); |
103 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | 148 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; |
149 | // We'll reuse the same handler for all requests. | ||
150 | m_getMeshHandler = new GetMeshHandler(m_assetService); | ||
151 | m_scene.EventManager.OnDeregisterCaps += DeregisterCaps; | ||
152 | m_scene.EventManager.OnThrottleUpdate += ThrottleUpdate; | ||
153 | |||
154 | if (m_workerThreads == null) | ||
155 | { | ||
156 | m_workerThreads = new Thread[2]; | ||
157 | |||
158 | for (uint i = 0; i < 2; i++) | ||
159 | { | ||
160 | m_workerThreads[i] = Watchdog.StartThread(DoMeshRequests, | ||
161 | String.Format("MeshWorkerThread{0}", i), | ||
162 | ThreadPriority.Normal, | ||
163 | false, | ||
164 | false, | ||
165 | null, | ||
166 | int.MaxValue); | ||
167 | } | ||
168 | } | ||
169 | |||
104 | } | 170 | } |
105 | 171 | ||
106 | 172 | ||
@@ -110,25 +176,212 @@ namespace OpenSim.Region.ClientStack.Linden | |||
110 | 176 | ||
111 | #endregion | 177 | #endregion |
112 | 178 | ||
179 | private void DoMeshRequests() | ||
180 | { | ||
181 | while (true) | ||
182 | { | ||
183 | aPollRequest poolreq = m_queue.Dequeue(); | ||
184 | |||
185 | poolreq.thepoll.Process(poolreq); | ||
186 | } | ||
187 | } | ||
188 | |||
189 | // Now we know when the throttle is changed by the client in the case of a root agent or by a neighbor region in the case of a child agent. | ||
190 | public void ThrottleUpdate(ScenePresence p) | ||
191 | { | ||
192 | byte[] throttles = p.ControllingClient.GetThrottlesPacked(1); | ||
193 | UUID user = p.UUID; | ||
194 | int imagethrottle = ExtractTaskThrottle(throttles); | ||
195 | PollServiceMeshEventArgs args; | ||
196 | if (m_pollservices.TryGetValue(user, out args)) | ||
197 | { | ||
198 | args.UpdateThrottle(imagethrottle, p); | ||
199 | } | ||
200 | } | ||
201 | |||
202 | private int ExtractTaskThrottle(byte[] pthrottles) | ||
203 | { | ||
204 | |||
205 | byte[] adjData; | ||
206 | int pos = 0; | ||
207 | |||
208 | if (!BitConverter.IsLittleEndian) | ||
209 | { | ||
210 | byte[] newData = new byte[7 * 4]; | ||
211 | Buffer.BlockCopy(pthrottles, 0, newData, 0, 7 * 4); | ||
212 | |||
213 | for (int i = 0; i < 7; i++) | ||
214 | Array.Reverse(newData, i * 4, 4); | ||
215 | |||
216 | adjData = newData; | ||
217 | } | ||
218 | else | ||
219 | { | ||
220 | adjData = pthrottles; | ||
221 | } | ||
222 | |||
223 | // 0.125f converts from bits to bytes | ||
224 | //int resend = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); | ||
225 | //pos += 4; | ||
226 | // int land = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); | ||
227 | //pos += 4; | ||
228 | // int wind = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); | ||
229 | // pos += 4; | ||
230 | // int cloud = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); | ||
231 | // pos += 4; | ||
232 | pos += 16; | ||
233 | int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); | ||
234 | // pos += 4; | ||
235 | //int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); //pos += 4; | ||
236 | //int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); | ||
237 | return task; | ||
238 | } | ||
239 | |||
240 | private class PollServiceMeshEventArgs : PollServiceEventArgs | ||
241 | { | ||
242 | private List<Hashtable> requests = | ||
243 | new List<Hashtable>(); | ||
244 | private Dictionary<UUID, aPollResponse> responses = | ||
245 | new Dictionary<UUID, aPollResponse>(); | ||
246 | |||
247 | private Scene m_scene; | ||
248 | private MeshCapsDataThrottler m_throttler; | ||
249 | public PollServiceMeshEventArgs(UUID pId, Scene scene) : | ||
250 | base(null, null, null, null, pId, int.MaxValue) | ||
251 | { | ||
252 | m_scene = scene; | ||
253 | m_throttler = new MeshCapsDataThrottler(100000, 1400000, 10000, scene, pId); | ||
254 | // x is request id, y is userid | ||
255 | HasEvents = (x, y) => | ||
256 | { | ||
257 | lock (responses) | ||
258 | { | ||
259 | bool ret = m_throttler.hasEvents(x, responses); | ||
260 | m_throttler.ProcessTime(); | ||
261 | return ret; | ||
262 | |||
263 | } | ||
264 | }; | ||
265 | GetEvents = (x, y) => | ||
266 | { | ||
267 | lock (responses) | ||
268 | { | ||
269 | try | ||
270 | { | ||
271 | return responses[x].response; | ||
272 | } | ||
273 | finally | ||
274 | { | ||
275 | m_throttler.ProcessTime(); | ||
276 | responses.Remove(x); | ||
277 | } | ||
278 | } | ||
279 | }; | ||
280 | // x is request id, y is request data hashtable | ||
281 | Request = (x, y) => | ||
282 | { | ||
283 | aPollRequest reqinfo = new aPollRequest(); | ||
284 | reqinfo.thepoll = this; | ||
285 | reqinfo.reqID = x; | ||
286 | reqinfo.request = y; | ||
287 | |||
288 | m_queue.Enqueue(reqinfo); | ||
289 | }; | ||
290 | |||
291 | // this should never happen except possible on shutdown | ||
292 | NoEvents = (x, y) => | ||
293 | { | ||
294 | /* | ||
295 | lock (requests) | ||
296 | { | ||
297 | Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString()); | ||
298 | requests.Remove(request); | ||
299 | } | ||
300 | */ | ||
301 | Hashtable response = new Hashtable(); | ||
302 | |||
303 | response["int_response_code"] = 500; | ||
304 | response["str_response_string"] = "Script timeout"; | ||
305 | response["content_type"] = "text/plain"; | ||
306 | response["keepalive"] = false; | ||
307 | response["reusecontext"] = false; | ||
308 | |||
309 | return response; | ||
310 | }; | ||
311 | } | ||
312 | |||
313 | public void Process(aPollRequest requestinfo) | ||
314 | { | ||
315 | Hashtable response; | ||
316 | |||
317 | UUID requestID = requestinfo.reqID; | ||
318 | |||
319 | // If the avatar is gone, don't bother to get the texture | ||
320 | if (m_scene.GetScenePresence(Id) == null) | ||
321 | { | ||
322 | response = new Hashtable(); | ||
323 | |||
324 | response["int_response_code"] = 500; | ||
325 | response["str_response_string"] = "Script timeout"; | ||
326 | response["content_type"] = "text/plain"; | ||
327 | response["keepalive"] = false; | ||
328 | response["reusecontext"] = false; | ||
329 | |||
330 | lock (responses) | ||
331 | responses[requestID] = new aPollResponse() { bytes = 0, response = response, lod = 0 }; | ||
332 | |||
333 | return; | ||
334 | } | ||
335 | |||
336 | response = m_getMeshHandler.Handle(requestinfo.request); | ||
337 | lock (responses) | ||
338 | { | ||
339 | responses[requestID] = new aPollResponse() | ||
340 | { | ||
341 | bytes = (int)response["int_bytes"], | ||
342 | lod = (int)response["int_lod"], | ||
343 | response = response | ||
344 | }; | ||
345 | |||
346 | } | ||
347 | m_throttler.ProcessTime(); | ||
348 | } | ||
349 | |||
350 | internal void UpdateThrottle(int pimagethrottle, ScenePresence p) | ||
351 | { | ||
352 | m_throttler.UpdateThrottle(pimagethrottle, p); | ||
353 | } | ||
354 | } | ||
113 | 355 | ||
114 | public void RegisterCaps(UUID agentID, Caps caps) | 356 | public void RegisterCaps(UUID agentID, Caps caps) |
115 | { | 357 | { |
116 | // UUID capID = UUID.Random(); | 358 | // UUID capID = UUID.Random(); |
117 | |||
118 | //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); | ||
119 | if (m_URL == "localhost") | 359 | if (m_URL == "localhost") |
120 | { | 360 | { |
121 | // m_log.DebugFormat("[GETMESH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); | 361 | string capUrl = "/CAPS/" + UUID.Random() + "/"; |
122 | GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService); | 362 | |
123 | IRequestHandler reqHandler | 363 | // Register this as a poll service |
124 | = new RestHTTPHandler( | 364 | PollServiceMeshEventArgs args = new PollServiceMeshEventArgs(agentID, m_scene); |
125 | "GET", | 365 | |
126 | "/CAPS/" + UUID.Random(), | 366 | args.Type = PollServiceEventArgs.EventType.Mesh; |
127 | httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null), | 367 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); |
128 | "GetMesh", | 368 | |
129 | agentID.ToString()); | 369 | string hostName = m_scene.RegionInfo.ExternalHostName; |
370 | uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port; | ||
371 | string protocol = "http"; | ||
130 | 372 | ||
131 | caps.RegisterHandler("GetMesh", reqHandler); | 373 | if (MainServer.Instance.UseSSL) |
374 | { | ||
375 | hostName = MainServer.Instance.SSLCommonName; | ||
376 | port = MainServer.Instance.SSLPort; | ||
377 | protocol = "https"; | ||
378 | } | ||
379 | caps.RegisterHandler("GetMesh", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); | ||
380 | m_pollservices[agentID] = args; | ||
381 | m_capsDict[agentID] = capUrl; | ||
382 | |||
383 | |||
384 | |||
132 | } | 385 | } |
133 | else | 386 | else |
134 | { | 387 | { |
@@ -136,6 +389,177 @@ namespace OpenSim.Region.ClientStack.Linden | |||
136 | caps.RegisterHandler("GetMesh", m_URL); | 389 | caps.RegisterHandler("GetMesh", m_URL); |
137 | } | 390 | } |
138 | } | 391 | } |
392 | private void DeregisterCaps(UUID agentID, Caps caps) | ||
393 | { | ||
394 | string capUrl; | ||
395 | PollServiceMeshEventArgs args; | ||
396 | if (m_capsDict.TryGetValue(agentID, out capUrl)) | ||
397 | { | ||
398 | MainServer.Instance.RemoveHTTPHandler("", capUrl); | ||
399 | m_capsDict.Remove(agentID); | ||
400 | } | ||
401 | if (m_pollservices.TryGetValue(agentID, out args)) | ||
402 | { | ||
403 | m_pollservices.Remove(agentID); | ||
404 | } | ||
405 | } | ||
406 | |||
407 | internal sealed class MeshCapsDataThrottler | ||
408 | { | ||
409 | |||
410 | private volatile int currenttime = 0; | ||
411 | private volatile int lastTimeElapsed = 0; | ||
412 | private volatile int BytesSent = 0; | ||
413 | private int Lod3 = 0; | ||
414 | private int Lod2 = 0; | ||
415 | private int Lod1 = 0; | ||
416 | private int UserSetThrottle = 0; | ||
417 | private int UDPSetThrottle = 0; | ||
418 | private int CapSetThrottle = 0; | ||
419 | private float CapThrottleDistributon = 0.30f; | ||
420 | private readonly Scene m_scene; | ||
421 | private ThrottleOutPacketType Throttle; | ||
422 | private readonly UUID User; | ||
423 | |||
424 | public MeshCapsDataThrottler(int pBytes, int max, int min, Scene pScene, UUID puser) | ||
425 | { | ||
426 | ThrottleBytes = pBytes; | ||
427 | lastTimeElapsed = Util.EnvironmentTickCount(); | ||
428 | Throttle = ThrottleOutPacketType.Task; | ||
429 | m_scene = pScene; | ||
430 | User = puser; | ||
431 | } | ||
432 | |||
433 | |||
434 | public bool hasEvents(UUID key, Dictionary<UUID, aPollResponse> responses) | ||
435 | { | ||
436 | const float ThirtyPercent = 0.30f; | ||
437 | const float FivePercent = 0.05f; | ||
438 | PassTime(); | ||
439 | // Note, this is called IN LOCK | ||
440 | bool haskey = responses.ContainsKey(key); | ||
441 | |||
442 | if (responses.Count > 2) | ||
443 | { | ||
444 | SplitThrottle(ThirtyPercent); | ||
445 | } | ||
446 | else | ||
447 | { | ||
448 | SplitThrottle(FivePercent); | ||
449 | } | ||
450 | |||
451 | if (!haskey) | ||
452 | { | ||
453 | return false; | ||
454 | } | ||
455 | aPollResponse response; | ||
456 | if (responses.TryGetValue(key, out response)) | ||
457 | { | ||
458 | float LOD3Over = (((ThrottleBytes*CapThrottleDistributon)%50000) + 1); | ||
459 | float LOD2Over = (((ThrottleBytes*CapThrottleDistributon)%10000) + 1); | ||
460 | // Normal | ||
461 | if (BytesSent + response.bytes <= ThrottleBytes) | ||
462 | { | ||
463 | BytesSent += response.bytes; | ||
464 | |||
465 | return true; | ||
466 | } | ||
467 | // Lod3 Over Throttle protection to keep things processing even when the throttle bandwidth is set too little. | ||
468 | else if (response.bytes > ThrottleBytes && Lod3 <= ((LOD3Over < 1)? 1: LOD3Over) ) | ||
469 | { | ||
470 | Interlocked.Increment(ref Lod3); | ||
471 | BytesSent += response.bytes; | ||
472 | |||
473 | return true; | ||
474 | } | ||
475 | // Lod2 Over Throttle protection to keep things processing even when the throttle bandwidth is set too little. | ||
476 | else if (response.bytes > ThrottleBytes && Lod2 <= ((LOD2Over < 1) ? 1 : LOD2Over)) | ||
477 | { | ||
478 | Interlocked.Increment(ref Lod2); | ||
479 | BytesSent += response.bytes; | ||
480 | |||
481 | return true; | ||
482 | } | ||
483 | else | ||
484 | { | ||
485 | return false; | ||
486 | } | ||
487 | } | ||
488 | |||
489 | return haskey; | ||
490 | } | ||
491 | public void SubtractBytes(int bytes,int lod) | ||
492 | { | ||
493 | BytesSent -= bytes; | ||
494 | } | ||
495 | private void SplitThrottle(float percentMultiplier) | ||
496 | { | ||
497 | |||
498 | if (CapThrottleDistributon != percentMultiplier) // don't switch it if it's already set at the % multipler | ||
499 | { | ||
500 | CapThrottleDistributon = percentMultiplier; | ||
501 | ScenePresence p; | ||
502 | if (m_scene.TryGetScenePresence(User, out p)) // If we don't get a user they're not here anymore. | ||
503 | { | ||
504 | // AlterThrottle(UserSetThrottle, p); | ||
505 | UpdateThrottle(UserSetThrottle, p); | ||
506 | } | ||
507 | } | ||
508 | } | ||
509 | |||
510 | public void ProcessTime() | ||
511 | { | ||
512 | PassTime(); | ||
513 | } | ||
514 | |||
515 | |||
516 | private void PassTime() | ||
517 | { | ||
518 | currenttime = Util.EnvironmentTickCount(); | ||
519 | int timeElapsed = Util.EnvironmentTickCountSubtract(currenttime, lastTimeElapsed); | ||
520 | //processTimeBasedActions(responses); | ||
521 | if (currenttime - timeElapsed >= 1000) | ||
522 | { | ||
523 | lastTimeElapsed = Util.EnvironmentTickCount(); | ||
524 | BytesSent -= ThrottleBytes; | ||
525 | if (BytesSent < 0) BytesSent = 0; | ||
526 | if (BytesSent < ThrottleBytes) | ||
527 | { | ||
528 | Lod3 = 0; | ||
529 | Lod2 = 0; | ||
530 | Lod1 = 0; | ||
531 | } | ||
532 | } | ||
533 | } | ||
534 | private void AlterThrottle(int setting, ScenePresence p) | ||
535 | { | ||
536 | p.ControllingClient.SetAgentThrottleSilent((int)Throttle,setting); | ||
537 | } | ||
538 | |||
539 | public int ThrottleBytes | ||
540 | { | ||
541 | get { return CapSetThrottle; } | ||
542 | set { CapSetThrottle = value; } | ||
543 | } | ||
544 | |||
545 | internal void UpdateThrottle(int pimagethrottle, ScenePresence p) | ||
546 | { | ||
547 | // Client set throttle ! | ||
548 | UserSetThrottle = pimagethrottle; | ||
549 | CapSetThrottle = (int)(pimagethrottle*CapThrottleDistributon); | ||
550 | // UDPSetThrottle = (int) (pimagethrottle*(100 - CapThrottleDistributon)); | ||
551 | |||
552 | float udp = 1.0f - CapThrottleDistributon; | ||
553 | if(udp < 0.5f) | ||
554 | udp = 0.5f; | ||
555 | UDPSetThrottle = (int) ((float)pimagethrottle * udp); | ||
556 | if (CapSetThrottle < 4068) | ||
557 | CapSetThrottle = 4068; // at least two discovery mesh | ||
558 | p.ControllingClient.SetAgentThrottleSilent((int) Throttle, UDPSetThrottle); | ||
559 | ProcessTime(); | ||
560 | |||
561 | } | ||
562 | } | ||
139 | 563 | ||
140 | } | 564 | } |
141 | } | 565 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs index 13415f8..d4dbfb9 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |||
@@ -27,18 +27,13 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Specialized; | 30 | using System.Collections.Generic; |
31 | using System.Drawing; | ||
32 | using System.Drawing.Imaging; | ||
33 | using System.Reflection; | 31 | using System.Reflection; |
34 | using System.IO; | 32 | using System.Threading; |
35 | using System.Web; | ||
36 | using log4net; | 33 | using log4net; |
37 | using Nini.Config; | 34 | using Nini.Config; |
38 | using Mono.Addins; | 35 | using Mono.Addins; |
39 | using OpenMetaverse; | 36 | using OpenMetaverse; |
40 | using OpenMetaverse.StructuredData; | ||
41 | using OpenMetaverse.Imaging; | ||
42 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
43 | using OpenSim.Framework.Servers; | 38 | using OpenSim.Framework.Servers; |
44 | using OpenSim.Framework.Servers.HttpServer; | 39 | using OpenSim.Framework.Servers.HttpServer; |
@@ -47,6 +42,7 @@ using OpenSim.Region.Framework.Scenes; | |||
47 | using OpenSim.Services.Interfaces; | 42 | using OpenSim.Services.Interfaces; |
48 | using Caps = OpenSim.Framework.Capabilities.Caps; | 43 | using Caps = OpenSim.Framework.Capabilities.Caps; |
49 | using OpenSim.Capabilities.Handlers; | 44 | using OpenSim.Capabilities.Handlers; |
45 | using OpenSim.Framework.Monitoring; | ||
50 | 46 | ||
51 | namespace OpenSim.Region.ClientStack.Linden | 47 | namespace OpenSim.Region.ClientStack.Linden |
52 | { | 48 | { |
@@ -54,57 +50,131 @@ namespace OpenSim.Region.ClientStack.Linden | |||
54 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GetTextureModule")] | 50 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GetTextureModule")] |
55 | public class GetTextureModule : INonSharedRegionModule | 51 | public class GetTextureModule : INonSharedRegionModule |
56 | { | 52 | { |
57 | // private static readonly ILog m_log = | 53 | |
58 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | struct aPollRequest |
59 | 55 | { | |
56 | public PollServiceTextureEventArgs thepoll; | ||
57 | public UUID reqID; | ||
58 | public Hashtable request; | ||
59 | } | ||
60 | |||
61 | public class aPollResponse | ||
62 | { | ||
63 | public Hashtable response; | ||
64 | public int bytes; | ||
65 | } | ||
66 | |||
67 | |||
68 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
69 | |||
60 | private Scene m_scene; | 70 | private Scene m_scene; |
61 | private IAssetService m_assetService; | ||
62 | 71 | ||
63 | private bool m_Enabled = false; | 72 | private static GetTextureHandler m_getTextureHandler; |
73 | |||
74 | private IAssetService m_assetService = null; | ||
75 | |||
76 | private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>(); | ||
77 | private static Thread[] m_workerThreads = null; | ||
64 | 78 | ||
65 | // TODO: Change this to a config option | 79 | private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue = |
66 | const string REDIRECT_URL = null; | 80 | new OpenMetaverse.BlockingQueue<aPollRequest>(); |
67 | 81 | ||
68 | private string m_URL; | 82 | private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>(); |
69 | 83 | ||
70 | #region ISharedRegionModule Members | 84 | #region ISharedRegionModule Members |
71 | 85 | ||
72 | public void Initialise(IConfigSource source) | 86 | public void Initialise(IConfigSource source) |
73 | { | 87 | { |
74 | IConfig config = source.Configs["ClientStack.LindenCaps"]; | ||
75 | if (config == null) | ||
76 | return; | ||
77 | |||
78 | m_URL = config.GetString("Cap_GetTexture", string.Empty); | ||
79 | // Cap doesn't exist | ||
80 | if (m_URL != string.Empty) | ||
81 | m_Enabled = true; | ||
82 | } | 88 | } |
83 | 89 | ||
84 | public void AddRegion(Scene s) | 90 | public void AddRegion(Scene s) |
85 | { | 91 | { |
86 | if (!m_Enabled) | ||
87 | return; | ||
88 | |||
89 | m_scene = s; | 92 | m_scene = s; |
93 | m_assetService = s.AssetService; | ||
90 | } | 94 | } |
91 | 95 | ||
92 | public void RemoveRegion(Scene s) | 96 | public void RemoveRegion(Scene s) |
93 | { | 97 | { |
94 | if (!m_Enabled) | ||
95 | return; | ||
96 | |||
97 | m_scene.EventManager.OnRegisterCaps -= RegisterCaps; | 98 | m_scene.EventManager.OnRegisterCaps -= RegisterCaps; |
99 | m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps; | ||
100 | m_scene.EventManager.OnThrottleUpdate -= ThrottleUpdate; | ||
98 | m_scene = null; | 101 | m_scene = null; |
99 | } | 102 | } |
100 | 103 | ||
101 | public void RegionLoaded(Scene s) | 104 | public void RegionLoaded(Scene s) |
102 | { | 105 | { |
103 | if (!m_Enabled) | 106 | // We'll reuse the same handler for all requests. |
104 | return; | 107 | m_getTextureHandler = new GetTextureHandler(m_assetService); |
105 | 108 | ||
106 | m_assetService = m_scene.RequestModuleInterface<IAssetService>(); | ||
107 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | 109 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; |
110 | m_scene.EventManager.OnDeregisterCaps += DeregisterCaps; | ||
111 | m_scene.EventManager.OnThrottleUpdate += ThrottleUpdate; | ||
112 | |||
113 | if (m_workerThreads == null) | ||
114 | { | ||
115 | m_workerThreads = new Thread[2]; | ||
116 | |||
117 | for (uint i = 0; i < 2; i++) | ||
118 | { | ||
119 | m_workerThreads[i] = Watchdog.StartThread(DoTextureRequests, | ||
120 | String.Format("TextureWorkerThread{0}", i), | ||
121 | ThreadPriority.Normal, | ||
122 | false, | ||
123 | false, | ||
124 | null, | ||
125 | int.MaxValue); | ||
126 | } | ||
127 | } | ||
128 | } | ||
129 | private int ExtractImageThrottle(byte[] pthrottles) | ||
130 | { | ||
131 | |||
132 | byte[] adjData; | ||
133 | int pos = 0; | ||
134 | |||
135 | if (!BitConverter.IsLittleEndian) | ||
136 | { | ||
137 | byte[] newData = new byte[7 * 4]; | ||
138 | Buffer.BlockCopy(pthrottles, 0, newData, 0, 7 * 4); | ||
139 | |||
140 | for (int i = 0; i < 7; i++) | ||
141 | Array.Reverse(newData, i * 4, 4); | ||
142 | |||
143 | adjData = newData; | ||
144 | } | ||
145 | else | ||
146 | { | ||
147 | adjData = pthrottles; | ||
148 | } | ||
149 | |||
150 | // 0.125f converts from bits to bytes | ||
151 | //int resend = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); | ||
152 | //pos += 4; | ||
153 | // int land = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); | ||
154 | //pos += 4; | ||
155 | // int wind = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); | ||
156 | // pos += 4; | ||
157 | // int cloud = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); | ||
158 | // pos += 4; | ||
159 | // int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); | ||
160 | // pos += 4; | ||
161 | pos = pos + 20; | ||
162 | int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); //pos += 4; | ||
163 | //int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); | ||
164 | return texture; | ||
165 | } | ||
166 | |||
167 | // Now we know when the throttle is changed by the client in the case of a root agent or by a neighbor region in the case of a child agent. | ||
168 | public void ThrottleUpdate(ScenePresence p) | ||
169 | { | ||
170 | byte[] throttles = p.ControllingClient.GetThrottlesPacked(1); | ||
171 | UUID user = p.UUID; | ||
172 | int imagethrottle = ExtractImageThrottle(throttles); | ||
173 | PollServiceTextureEventArgs args; | ||
174 | if (m_pollservices.TryGetValue(user,out args)) | ||
175 | { | ||
176 | args.UpdateThrottle(imagethrottle); | ||
177 | } | ||
108 | } | 178 | } |
109 | 179 | ||
110 | public void PostInitialise() | 180 | public void PostInitialise() |
@@ -122,24 +192,250 @@ namespace OpenSim.Region.ClientStack.Linden | |||
122 | 192 | ||
123 | #endregion | 193 | #endregion |
124 | 194 | ||
125 | public void RegisterCaps(UUID agentID, Caps caps) | 195 | ~GetTextureModule() |
196 | { | ||
197 | foreach (Thread t in m_workerThreads) | ||
198 | Watchdog.AbortThread(t.ManagedThreadId); | ||
199 | |||
200 | } | ||
201 | |||
202 | private class PollServiceTextureEventArgs : PollServiceEventArgs | ||
126 | { | 203 | { |
127 | UUID capID = UUID.Random(); | 204 | private List<Hashtable> requests = |
205 | new List<Hashtable>(); | ||
206 | private Dictionary<UUID, aPollResponse> responses = | ||
207 | new Dictionary<UUID, aPollResponse>(); | ||
128 | 208 | ||
129 | //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); | 209 | private Scene m_scene; |
130 | if (m_URL == "localhost") | 210 | private CapsDataThrottler m_throttler = new CapsDataThrottler(100000, 1400000,10000); |
211 | public PollServiceTextureEventArgs(UUID pId, Scene scene) : | ||
212 | base(null, null, null, null, pId, int.MaxValue) | ||
131 | { | 213 | { |
132 | // m_log.DebugFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); | 214 | m_scene = scene; |
133 | caps.RegisterHandler( | 215 | // x is request id, y is userid |
134 | "GetTexture", | 216 | HasEvents = (x, y) => |
135 | new GetTextureHandler("/CAPS/" + capID + "/", m_assetService, "GetTexture", agentID.ToString())); | 217 | { |
218 | lock (responses) | ||
219 | { | ||
220 | bool ret = m_throttler.hasEvents(x, responses); | ||
221 | m_throttler.ProcessTime(); | ||
222 | return ret; | ||
223 | |||
224 | } | ||
225 | }; | ||
226 | GetEvents = (x, y) => | ||
227 | { | ||
228 | lock (responses) | ||
229 | { | ||
230 | try | ||
231 | { | ||
232 | return responses[x].response; | ||
233 | } | ||
234 | finally | ||
235 | { | ||
236 | responses.Remove(x); | ||
237 | } | ||
238 | } | ||
239 | }; | ||
240 | // x is request id, y is request data hashtable | ||
241 | Request = (x, y) => | ||
242 | { | ||
243 | aPollRequest reqinfo = new aPollRequest(); | ||
244 | reqinfo.thepoll = this; | ||
245 | reqinfo.reqID = x; | ||
246 | reqinfo.request = y; | ||
247 | |||
248 | m_queue.Enqueue(reqinfo); | ||
249 | }; | ||
250 | |||
251 | // this should never happen except possible on shutdown | ||
252 | NoEvents = (x, y) => | ||
253 | { | ||
254 | /* | ||
255 | lock (requests) | ||
256 | { | ||
257 | Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString()); | ||
258 | requests.Remove(request); | ||
259 | } | ||
260 | */ | ||
261 | Hashtable response = new Hashtable(); | ||
262 | |||
263 | response["int_response_code"] = 500; | ||
264 | response["str_response_string"] = "Script timeout"; | ||
265 | response["content_type"] = "text/plain"; | ||
266 | response["keepalive"] = false; | ||
267 | response["reusecontext"] = false; | ||
268 | |||
269 | return response; | ||
270 | }; | ||
136 | } | 271 | } |
137 | else | 272 | |
273 | public void Process(aPollRequest requestinfo) | ||
274 | { | ||
275 | Hashtable response; | ||
276 | |||
277 | UUID requestID = requestinfo.reqID; | ||
278 | |||
279 | // If the avatar is gone, don't bother to get the texture | ||
280 | if (m_scene.GetScenePresence(Id) == null) | ||
281 | { | ||
282 | response = new Hashtable(); | ||
283 | |||
284 | response["int_response_code"] = 500; | ||
285 | response["str_response_string"] = "Script timeout"; | ||
286 | response["content_type"] = "text/plain"; | ||
287 | response["keepalive"] = false; | ||
288 | response["reusecontext"] = false; | ||
289 | |||
290 | lock (responses) | ||
291 | responses[requestID] = new aPollResponse() {bytes = 0, response = response}; | ||
292 | |||
293 | return; | ||
294 | } | ||
295 | |||
296 | response = m_getTextureHandler.Handle(requestinfo.request); | ||
297 | lock (responses) | ||
298 | { | ||
299 | responses[requestID] = new aPollResponse() | ||
300 | { | ||
301 | bytes = (int) response["int_bytes"], | ||
302 | response = response | ||
303 | }; | ||
304 | |||
305 | } | ||
306 | m_throttler.ProcessTime(); | ||
307 | } | ||
308 | |||
309 | internal void UpdateThrottle(int pimagethrottle) | ||
310 | { | ||
311 | m_throttler.ThrottleBytes = pimagethrottle; | ||
312 | } | ||
313 | } | ||
314 | |||
315 | private void RegisterCaps(UUID agentID, Caps caps) | ||
316 | { | ||
317 | string capUrl = "/CAPS/" + UUID.Random() + "/"; | ||
318 | |||
319 | // Register this as a poll service | ||
320 | PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene); | ||
321 | |||
322 | args.Type = PollServiceEventArgs.EventType.Texture; | ||
323 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); | ||
324 | |||
325 | string hostName = m_scene.RegionInfo.ExternalHostName; | ||
326 | uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port; | ||
327 | string protocol = "http"; | ||
328 | |||
329 | if (MainServer.Instance.UseSSL) | ||
330 | { | ||
331 | hostName = MainServer.Instance.SSLCommonName; | ||
332 | port = MainServer.Instance.SSLPort; | ||
333 | protocol = "https"; | ||
334 | } | ||
335 | caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); | ||
336 | m_pollservices[agentID] = args; | ||
337 | m_capsDict[agentID] = capUrl; | ||
338 | } | ||
339 | |||
340 | private void DeregisterCaps(UUID agentID, Caps caps) | ||
341 | { | ||
342 | string capUrl; | ||
343 | PollServiceTextureEventArgs args; | ||
344 | if (m_capsDict.TryGetValue(agentID, out capUrl)) | ||
345 | { | ||
346 | MainServer.Instance.RemoveHTTPHandler("", capUrl); | ||
347 | m_capsDict.Remove(agentID); | ||
348 | } | ||
349 | if (m_pollservices.TryGetValue(agentID, out args)) | ||
138 | { | 350 | { |
139 | // m_log.DebugFormat("[GETTEXTURE]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName); | 351 | m_pollservices.Remove(agentID); |
140 | caps.RegisterHandler("GetTexture", m_URL); | ||
141 | } | 352 | } |
142 | } | 353 | } |
143 | 354 | ||
355 | private void DoTextureRequests() | ||
356 | { | ||
357 | while (true) | ||
358 | { | ||
359 | aPollRequest poolreq = m_queue.Dequeue(); | ||
360 | |||
361 | poolreq.thepoll.Process(poolreq); | ||
362 | } | ||
363 | } | ||
364 | internal sealed class CapsDataThrottler | ||
365 | { | ||
366 | |||
367 | private volatile int currenttime = 0; | ||
368 | private volatile int lastTimeElapsed = 0; | ||
369 | private volatile int BytesSent = 0; | ||
370 | private int oversizedImages = 0; | ||
371 | public CapsDataThrottler(int pBytes, int max, int min) | ||
372 | { | ||
373 | ThrottleBytes = pBytes; | ||
374 | lastTimeElapsed = Util.EnvironmentTickCount(); | ||
375 | } | ||
376 | public bool hasEvents(UUID key, Dictionary<UUID, GetTextureModule.aPollResponse> responses) | ||
377 | { | ||
378 | PassTime(); | ||
379 | // Note, this is called IN LOCK | ||
380 | bool haskey = responses.ContainsKey(key); | ||
381 | if (!haskey) | ||
382 | { | ||
383 | return false; | ||
384 | } | ||
385 | GetTextureModule.aPollResponse response; | ||
386 | if (responses.TryGetValue(key, out response)) | ||
387 | { | ||
388 | |||
389 | // Normal | ||
390 | if (BytesSent + response.bytes <= ThrottleBytes) | ||
391 | { | ||
392 | BytesSent += response.bytes; | ||
393 | //TimeBasedAction timeBasedAction = new TimeBasedAction { byteRemoval = response.bytes, requestId = key, timeMS = currenttime + 1000, unlockyn = false }; | ||
394 | //m_actions.Add(timeBasedAction); | ||
395 | return true; | ||
396 | } | ||
397 | // Big textures | ||
398 | else if (response.bytes > ThrottleBytes && oversizedImages <= ((ThrottleBytes % 50000) + 1)) | ||
399 | { | ||
400 | Interlocked.Increment(ref oversizedImages); | ||
401 | BytesSent += response.bytes; | ||
402 | //TimeBasedAction timeBasedAction = new TimeBasedAction { byteRemoval = response.bytes, requestId = key, timeMS = currenttime + (((response.bytes % ThrottleBytes)+1)*1000) , unlockyn = false }; | ||
403 | //m_actions.Add(timeBasedAction); | ||
404 | return true; | ||
405 | } | ||
406 | else | ||
407 | { | ||
408 | return false; | ||
409 | } | ||
410 | } | ||
411 | |||
412 | return haskey; | ||
413 | } | ||
414 | public void ProcessTime() | ||
415 | { | ||
416 | PassTime(); | ||
417 | } | ||
418 | |||
419 | |||
420 | private void PassTime() | ||
421 | { | ||
422 | currenttime = Util.EnvironmentTickCount(); | ||
423 | int timeElapsed = Util.EnvironmentTickCountSubtract(currenttime, lastTimeElapsed); | ||
424 | //processTimeBasedActions(responses); | ||
425 | if (Util.EnvironmentTickCountSubtract(currenttime, timeElapsed) >= 1000) | ||
426 | { | ||
427 | lastTimeElapsed = Util.EnvironmentTickCount(); | ||
428 | BytesSent -= ThrottleBytes; | ||
429 | if (BytesSent < 0) BytesSent = 0; | ||
430 | if (BytesSent < ThrottleBytes) | ||
431 | { | ||
432 | oversizedImages = 0; | ||
433 | } | ||
434 | } | ||
435 | } | ||
436 | public int ThrottleBytes; | ||
437 | } | ||
144 | } | 438 | } |
439 | |||
440 | |||
145 | } | 441 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs index 45d33cd..1b68603 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs | |||
@@ -129,15 +129,15 @@ namespace OpenSim.Region.ClientStack.Linden | |||
129 | // m_log.DebugFormat("[MESH UPLOAD FLAG MODULE]: MeshUploadFlag request"); | 129 | // m_log.DebugFormat("[MESH UPLOAD FLAG MODULE]: MeshUploadFlag request"); |
130 | 130 | ||
131 | OSDMap data = new OSDMap(); | 131 | OSDMap data = new OSDMap(); |
132 | ScenePresence sp = m_scene.GetScenePresence(agentID); | 132 | // ScenePresence sp = m_scene.GetScenePresence(m_agentID); |
133 | data["username"] = sp.Firstname + "." + sp.Lastname; | 133 | // data["username"] = sp.Firstname + "." + sp.Lastname; |
134 | data["display_name_next_update"] = new OSDDate(DateTime.Now); | 134 | // data["display_name_next_update"] = new OSDDate(DateTime.Now); |
135 | data["legacy_first_name"] = sp.Firstname; | 135 | // data["legacy_first_name"] = sp.Firstname; |
136 | data["mesh_upload_status"] = "valid"; | 136 | data["mesh_upload_status"] = "valid"; |
137 | data["display_name"] = sp.Firstname + " " + sp.Lastname; | 137 | // data["display_name"] = sp.Firstname + " " + sp.Lastname; |
138 | data["legacy_last_name"] = sp.Lastname; | 138 | // data["legacy_last_name"] = sp.Lastname; |
139 | data["id"] = agentID; | 139 | // data["id"] = m_agentID; |
140 | data["is_display_name_default"] = true; | 140 | // data["is_display_name_default"] = true; |
141 | 141 | ||
142 | //Send back data | 142 | //Send back data |
143 | Hashtable responsedata = new Hashtable(); | 143 | Hashtable responsedata = new Hashtable(); |
@@ -148,4 +148,4 @@ namespace OpenSim.Region.ClientStack.Linden | |||
148 | return responsedata; | 148 | return responsedata; |
149 | } | 149 | } |
150 | } | 150 | } |
151 | } \ No newline at end of file | 151 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs deleted file mode 100644 index f69a0bb..0000000 --- a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs +++ /dev/null | |||
@@ -1,297 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Specialized; | ||
31 | using System.Reflection; | ||
32 | using System.IO; | ||
33 | using System.Web; | ||
34 | using Mono.Addins; | ||
35 | using log4net; | ||
36 | using Nini.Config; | ||
37 | using OpenMetaverse; | ||
38 | using OpenMetaverse.StructuredData; | ||
39 | using OpenSim.Framework; | ||
40 | using OpenSim.Framework.Servers; | ||
41 | using OpenSim.Framework.Servers.HttpServer; | ||
42 | using OpenSim.Region.Framework.Interfaces; | ||
43 | using OpenSim.Region.Framework.Scenes; | ||
44 | using OpenSim.Services.Interfaces; | ||
45 | using Caps = OpenSim.Framework.Capabilities.Caps; | ||
46 | using OpenSim.Framework.Capabilities; | ||
47 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
48 | |||
49 | namespace OpenSim.Region.ClientStack.Linden | ||
50 | { | ||
51 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "NewFileAgentInventoryVariablePriceModule")] | ||
52 | public class NewFileAgentInventoryVariablePriceModule : INonSharedRegionModule | ||
53 | { | ||
54 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
55 | |||
56 | private Scene m_scene; | ||
57 | // private IAssetService m_assetService; | ||
58 | private bool m_dumpAssetsToFile = false; | ||
59 | private bool m_enabled = true; | ||
60 | private int m_levelUpload = 0; | ||
61 | |||
62 | #region Region Module interfaceBase Members | ||
63 | |||
64 | |||
65 | public Type ReplaceableInterface | ||
66 | { | ||
67 | get { return null; } | ||
68 | } | ||
69 | |||
70 | public void Initialise(IConfigSource source) | ||
71 | { | ||
72 | IConfig meshConfig = source.Configs["Mesh"]; | ||
73 | if (meshConfig == null) | ||
74 | return; | ||
75 | |||
76 | m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true); | ||
77 | m_levelUpload = meshConfig.GetInt("LevelUpload", 0); | ||
78 | } | ||
79 | |||
80 | public void AddRegion(Scene pScene) | ||
81 | { | ||
82 | m_scene = pScene; | ||
83 | } | ||
84 | |||
85 | public void RemoveRegion(Scene scene) | ||
86 | { | ||
87 | |||
88 | m_scene.EventManager.OnRegisterCaps -= RegisterCaps; | ||
89 | m_scene = null; | ||
90 | } | ||
91 | |||
92 | public void RegionLoaded(Scene scene) | ||
93 | { | ||
94 | |||
95 | // m_assetService = m_scene.RequestModuleInterface<IAssetService>(); | ||
96 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | ||
97 | } | ||
98 | |||
99 | #endregion | ||
100 | |||
101 | |||
102 | #region Region Module interface | ||
103 | |||
104 | |||
105 | |||
106 | public void Close() { } | ||
107 | |||
108 | public string Name { get { return "NewFileAgentInventoryVariablePriceModule"; } } | ||
109 | |||
110 | |||
111 | public void RegisterCaps(UUID agentID, Caps caps) | ||
112 | { | ||
113 | if(!m_enabled) | ||
114 | return; | ||
115 | |||
116 | UUID capID = UUID.Random(); | ||
117 | |||
118 | // m_log.Debug("[NEW FILE AGENT INVENTORY VARIABLE PRICE]: /CAPS/" + capID); | ||
119 | caps.RegisterHandler( | ||
120 | "NewFileAgentInventoryVariablePrice", | ||
121 | new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDNewFileAngentInventoryVariablePriceReplyResponse>( | ||
122 | "POST", | ||
123 | "/CAPS/" + capID.ToString(), | ||
124 | req => NewAgentInventoryRequest(req, agentID), | ||
125 | "NewFileAgentInventoryVariablePrice", | ||
126 | agentID.ToString())); | ||
127 | } | ||
128 | |||
129 | #endregion | ||
130 | |||
131 | public LLSDNewFileAngentInventoryVariablePriceReplyResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest, UUID agentID) | ||
132 | { | ||
133 | //TODO: The Mesh uploader uploads many types of content. If you're going to implement a Money based limit | ||
134 | // you need to be aware of this | ||
135 | |||
136 | //if (llsdRequest.asset_type == "texture" || | ||
137 | // llsdRequest.asset_type == "animation" || | ||
138 | // llsdRequest.asset_type == "sound") | ||
139 | // { | ||
140 | // check user level | ||
141 | |||
142 | ScenePresence avatar = null; | ||
143 | IClientAPI client = null; | ||
144 | m_scene.TryGetScenePresence(agentID, out avatar); | ||
145 | |||
146 | if (avatar != null) | ||
147 | { | ||
148 | client = avatar.ControllingClient; | ||
149 | |||
150 | if (avatar.UserLevel < m_levelUpload) | ||
151 | { | ||
152 | if (client != null) | ||
153 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false); | ||
154 | |||
155 | LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse(); | ||
156 | errorResponse.rsvp = ""; | ||
157 | errorResponse.state = "error"; | ||
158 | return errorResponse; | ||
159 | } | ||
160 | } | ||
161 | |||
162 | // check funds | ||
163 | IMoneyModule mm = m_scene.RequestModuleInterface<IMoneyModule>(); | ||
164 | |||
165 | if (mm != null) | ||
166 | { | ||
167 | if (!mm.UploadCovered(agentID, mm.UploadCharge)) | ||
168 | { | ||
169 | if (client != null) | ||
170 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); | ||
171 | |||
172 | LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse(); | ||
173 | errorResponse.rsvp = ""; | ||
174 | errorResponse.state = "error"; | ||
175 | return errorResponse; | ||
176 | } | ||
177 | } | ||
178 | |||
179 | // } | ||
180 | |||
181 | string assetName = llsdRequest.name; | ||
182 | string assetDes = llsdRequest.description; | ||
183 | string capsBase = "/CAPS/NewFileAgentInventoryVariablePrice/"; | ||
184 | UUID newAsset = UUID.Random(); | ||
185 | UUID newInvItem = UUID.Random(); | ||
186 | UUID parentFolder = llsdRequest.folder_id; | ||
187 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000") + "/"; | ||
188 | |||
189 | AssetUploader uploader = | ||
190 | new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type, | ||
191 | llsdRequest.asset_type, capsBase + uploaderPath, MainServer.Instance, m_dumpAssetsToFile); | ||
192 | |||
193 | MainServer.Instance.AddStreamHandler( | ||
194 | new BinaryStreamHandler( | ||
195 | "POST", | ||
196 | capsBase + uploaderPath, | ||
197 | uploader.uploaderCaps, | ||
198 | "NewFileAgentInventoryVariablePrice", | ||
199 | agentID.ToString())); | ||
200 | |||
201 | string protocol = "http://"; | ||
202 | |||
203 | if (MainServer.Instance.UseSSL) | ||
204 | protocol = "https://"; | ||
205 | |||
206 | string uploaderURL = protocol + m_scene.RegionInfo.ExternalHostName + ":" + MainServer.Instance.Port.ToString() + capsBase + | ||
207 | uploaderPath; | ||
208 | |||
209 | |||
210 | LLSDNewFileAngentInventoryVariablePriceReplyResponse uploadResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse(); | ||
211 | |||
212 | uploadResponse.rsvp = uploaderURL; | ||
213 | uploadResponse.state = "upload"; | ||
214 | uploadResponse.resource_cost = 0; | ||
215 | uploadResponse.upload_price = 0; | ||
216 | |||
217 | uploader.OnUpLoad += //UploadCompleteHandler; | ||
218 | |||
219 | delegate( | ||
220 | string passetName, string passetDescription, UUID passetID, | ||
221 | UUID pinventoryItem, UUID pparentFolder, byte[] pdata, string pinventoryType, | ||
222 | string passetType) | ||
223 | { | ||
224 | UploadCompleteHandler(passetName, passetDescription, passetID, | ||
225 | pinventoryItem, pparentFolder, pdata, pinventoryType, | ||
226 | passetType,agentID); | ||
227 | }; | ||
228 | |||
229 | return uploadResponse; | ||
230 | } | ||
231 | |||
232 | public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID, | ||
233 | UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType, | ||
234 | string assetType,UUID AgentID) | ||
235 | { | ||
236 | // m_log.DebugFormat( | ||
237 | // "[NEW FILE AGENT INVENTORY VARIABLE PRICE MODULE]: Upload complete for {0}", inventoryItem); | ||
238 | |||
239 | sbyte assType = 0; | ||
240 | sbyte inType = 0; | ||
241 | |||
242 | if (inventoryType == "sound") | ||
243 | { | ||
244 | inType = 1; | ||
245 | assType = 1; | ||
246 | } | ||
247 | else if (inventoryType == "animation") | ||
248 | { | ||
249 | inType = 19; | ||
250 | assType = 20; | ||
251 | } | ||
252 | else if (inventoryType == "wearable") | ||
253 | { | ||
254 | inType = 18; | ||
255 | switch (assetType) | ||
256 | { | ||
257 | case "bodypart": | ||
258 | assType = 13; | ||
259 | break; | ||
260 | case "clothing": | ||
261 | assType = 5; | ||
262 | break; | ||
263 | } | ||
264 | } | ||
265 | else if (inventoryType == "mesh") | ||
266 | { | ||
267 | inType = (sbyte)InventoryType.Mesh; | ||
268 | assType = (sbyte)AssetType.Mesh; | ||
269 | } | ||
270 | |||
271 | AssetBase asset; | ||
272 | asset = new AssetBase(assetID, assetName, assType, AgentID.ToString()); | ||
273 | asset.Data = data; | ||
274 | |||
275 | if (m_scene.AssetService != null) | ||
276 | m_scene.AssetService.Store(asset); | ||
277 | |||
278 | InventoryItemBase item = new InventoryItemBase(); | ||
279 | item.Owner = AgentID; | ||
280 | item.CreatorId = AgentID.ToString(); | ||
281 | item.ID = inventoryItem; | ||
282 | item.AssetID = asset.FullID; | ||
283 | item.Description = assetDescription; | ||
284 | item.Name = assetName; | ||
285 | item.AssetType = assType; | ||
286 | item.InvType = inType; | ||
287 | item.Folder = parentFolder; | ||
288 | item.CurrentPermissions | ||
289 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer); | ||
290 | item.BasePermissions = (uint)PermissionMask.All; | ||
291 | item.EveryOnePermissions = 0; | ||
292 | item.NextPermissions = (uint)PermissionMask.All; | ||
293 | item.CreationDate = Util.UnixTimeSinceEpoch(); | ||
294 | m_scene.AddInventoryItem(item); | ||
295 | } | ||
296 | } | ||
297 | } | ||
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs index 69dd76f..79d56c4 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | |||
@@ -64,6 +64,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
64 | private Commands m_commands = new Commands(); | 64 | private Commands m_commands = new Commands(); |
65 | public ICommands Commands { get { return m_commands; } } | 65 | public ICommands Commands { get { return m_commands; } } |
66 | 66 | ||
67 | public event ConsoleMessage OnConsoleMessage; | ||
68 | |||
67 | public void Initialise(IConfigSource source) | 69 | public void Initialise(IConfigSource source) |
68 | { | 70 | { |
69 | m_commands.AddCommand( "Help", false, "help", "help [<item>]", "Display help on a particular command or on a list of commands in a category", Help); | 71 | m_commands.AddCommand( "Help", false, "help", "help [<item>]", "Display help on a particular command or on a list of commands in a category", Help); |
@@ -102,7 +104,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
102 | 104 | ||
103 | public void RegisterCaps(UUID agentID, Caps caps) | 105 | public void RegisterCaps(UUID agentID, Caps caps) |
104 | { | 106 | { |
105 | if (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(agentID)) | 107 | if (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(agentID) && !m_scene.Permissions.IsGod(agentID)) |
106 | return; | 108 | return; |
107 | 109 | ||
108 | UUID capID = UUID.Random(); | 110 | UUID capID = UUID.Random(); |
@@ -118,6 +120,11 @@ namespace OpenSim.Region.ClientStack.Linden | |||
118 | OSD osd = OSD.FromString(message); | 120 | OSD osd = OSD.FromString(message); |
119 | 121 | ||
120 | m_eventQueue.Enqueue(EventQueueHelper.BuildEvent("SimConsoleResponse", osd), agentID); | 122 | m_eventQueue.Enqueue(EventQueueHelper.BuildEvent("SimConsoleResponse", osd), agentID); |
123 | |||
124 | ConsoleMessage handlerConsoleMessage = OnConsoleMessage; | ||
125 | |||
126 | if (handlerConsoleMessage != null) | ||
127 | handlerConsoleMessage( agentID, message); | ||
121 | } | 128 | } |
122 | 129 | ||
123 | public bool RunCommand(string command, UUID invokerID) | 130 | public bool RunCommand(string command, UUID invokerID) |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs index 3b0ccd7..eca576d 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | ||
30 | using System.Collections.Specialized; | 31 | using System.Collections.Specialized; |
31 | using System.Drawing; | 32 | using System.Drawing; |
32 | using System.Drawing.Imaging; | 33 | using System.Drawing.Imaging; |
@@ -53,8 +54,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
53 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UploadBakedTextureModule")] | 54 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UploadBakedTextureModule")] |
54 | public class UploadBakedTextureModule : INonSharedRegionModule | 55 | public class UploadBakedTextureModule : INonSharedRegionModule |
55 | { | 56 | { |
56 | // private static readonly ILog m_log = | 57 | private static readonly ILog m_log = |
57 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 58 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
58 | 59 | ||
59 | /// <summary> | 60 | /// <summary> |
60 | /// For historical reasons this is fixed, but there | 61 | /// For historical reasons this is fixed, but there |
@@ -64,31 +65,210 @@ namespace OpenSim.Region.ClientStack.Linden | |||
64 | private Scene m_scene; | 65 | private Scene m_scene; |
65 | private bool m_persistBakedTextures; | 66 | private bool m_persistBakedTextures; |
66 | 67 | ||
68 | private IBakedTextureModule m_BakedTextureModule; | ||
69 | |||
67 | public void Initialise(IConfigSource source) | 70 | public void Initialise(IConfigSource source) |
68 | { | 71 | { |
69 | IConfig appearanceConfig = source.Configs["Appearance"]; | 72 | IConfig appearanceConfig = source.Configs["Appearance"]; |
70 | if (appearanceConfig != null) | 73 | if (appearanceConfig != null) |
71 | m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures); | 74 | m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures); |
75 | |||
76 | |||
72 | } | 77 | } |
73 | 78 | ||
74 | public void AddRegion(Scene s) | 79 | public void AddRegion(Scene s) |
75 | { | 80 | { |
76 | m_scene = s; | 81 | m_scene = s; |
82 | |||
77 | } | 83 | } |
78 | 84 | ||
79 | public void RemoveRegion(Scene s) | 85 | public void RemoveRegion(Scene s) |
80 | { | 86 | { |
87 | s.EventManager.OnRegisterCaps -= RegisterCaps; | ||
88 | s.EventManager.OnNewPresence -= RegisterNewPresence; | ||
89 | s.EventManager.OnRemovePresence -= DeRegisterPresence; | ||
90 | m_BakedTextureModule = null; | ||
91 | m_scene = null; | ||
81 | } | 92 | } |
82 | 93 | ||
94 | |||
95 | |||
83 | public void RegionLoaded(Scene s) | 96 | public void RegionLoaded(Scene s) |
84 | { | 97 | { |
85 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | 98 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; |
99 | m_scene.EventManager.OnNewPresence += RegisterNewPresence; | ||
100 | m_scene.EventManager.OnRemovePresence += DeRegisterPresence; | ||
101 | |||
102 | } | ||
103 | |||
104 | private void DeRegisterPresence(UUID agentId) | ||
105 | { | ||
106 | ScenePresence presence = null; | ||
107 | if (m_scene.TryGetScenePresence(agentId, out presence)) | ||
108 | { | ||
109 | presence.ControllingClient.OnSetAppearance -= CaptureAppearanceSettings; | ||
110 | } | ||
111 | |||
112 | } | ||
113 | |||
114 | private void RegisterNewPresence(ScenePresence presence) | ||
115 | { | ||
116 | presence.ControllingClient.OnSetAppearance += CaptureAppearanceSettings; | ||
117 | |||
118 | } | ||
119 | |||
120 | private void CaptureAppearanceSettings(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize, WearableCacheItem[] cacheItems) | ||
121 | { | ||
122 | int maxCacheitemsLoop = cacheItems.Length; | ||
123 | if (maxCacheitemsLoop > AvatarWearable.MAX_WEARABLES) | ||
124 | { | ||
125 | maxCacheitemsLoop = AvatarWearable.MAX_WEARABLES; | ||
126 | m_log.WarnFormat("[CACHEDBAKES]: Too Many Cache items Provided {0}, the max is {1}. Truncating!", cacheItems.Length, AvatarWearable.MAX_WEARABLES); | ||
127 | } | ||
128 | |||
129 | m_BakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>(); | ||
130 | if (cacheItems.Length > 0) | ||
131 | { | ||
132 | m_log.Debug("[Cacheitems]: " + cacheItems.Length); | ||
133 | for (int iter = 0; iter < maxCacheitemsLoop; iter++) | ||
134 | { | ||
135 | m_log.Debug("[Cacheitems] {" + iter + "/" + cacheItems[iter].TextureIndex + "}: c-" + cacheItems[iter].CacheId + ", t-" + | ||
136 | cacheItems[iter].TextureID); | ||
137 | } | ||
138 | |||
139 | ScenePresence p = null; | ||
140 | if (m_scene.TryGetScenePresence(remoteClient.AgentId, out p)) | ||
141 | { | ||
142 | |||
143 | WearableCacheItem[] existingitems = p.Appearance.WearableCacheItems; | ||
144 | if (existingitems == null) | ||
145 | { | ||
146 | if (m_BakedTextureModule != null) | ||
147 | { | ||
148 | WearableCacheItem[] savedcache = null; | ||
149 | try | ||
150 | { | ||
151 | if (p.Appearance.WearableCacheItemsDirty) | ||
152 | { | ||
153 | savedcache = m_BakedTextureModule.Get(p.UUID); | ||
154 | p.Appearance.WearableCacheItems = savedcache; | ||
155 | p.Appearance.WearableCacheItemsDirty = false; | ||
156 | } | ||
157 | |||
158 | } | ||
159 | /* | ||
160 | * The following Catch types DO NOT WORK with m_BakedTextureModule.Get | ||
161 | * it jumps to the General Packet Exception Handler if you don't catch Exception! | ||
162 | * | ||
163 | catch (System.Net.Sockets.SocketException) | ||
164 | { | ||
165 | cacheItems = null; | ||
166 | } | ||
167 | catch (WebException) | ||
168 | { | ||
169 | cacheItems = null; | ||
170 | } | ||
171 | catch (InvalidOperationException) | ||
172 | { | ||
173 | cacheItems = null; | ||
174 | } */ | ||
175 | catch (Exception) | ||
176 | { | ||
177 | // The service logs a sufficient error message. | ||
178 | } | ||
179 | |||
180 | |||
181 | if (savedcache != null) | ||
182 | existingitems = savedcache; | ||
183 | } | ||
184 | } | ||
185 | // Existing items null means it's a fully new appearance | ||
186 | if (existingitems == null) | ||
187 | { | ||
188 | |||
189 | for (int i = 0; i < maxCacheitemsLoop; i++) | ||
190 | { | ||
191 | if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex) | ||
192 | { | ||
193 | Primitive.TextureEntryFace face = textureEntry.FaceTextures[cacheItems[i].TextureIndex]; | ||
194 | if (face == null) | ||
195 | { | ||
196 | textureEntry.CreateFace(cacheItems[i].TextureIndex); | ||
197 | textureEntry.FaceTextures[cacheItems[i].TextureIndex].TextureID = | ||
198 | AppearanceManager.DEFAULT_AVATAR_TEXTURE; | ||
199 | continue; | ||
200 | } | ||
201 | cacheItems[i].TextureID =face.TextureID; | ||
202 | if (m_scene.AssetService != null) | ||
203 | cacheItems[i].TextureAsset = | ||
204 | m_scene.AssetService.GetCached(cacheItems[i].TextureID.ToString()); | ||
205 | } | ||
206 | else | ||
207 | { | ||
208 | m_log.WarnFormat("[CACHEDBAKES]: Invalid Texture Index Provided, Texture doesn't exist or hasn't been uploaded yet {0}, the max is {1}. Skipping!", cacheItems[i].TextureIndex, textureEntry.FaceTextures.Length); | ||
209 | } | ||
210 | |||
211 | |||
212 | } | ||
213 | } | ||
214 | else | ||
215 | |||
216 | |||
217 | { | ||
218 | // for each uploaded baked texture | ||
219 | for (int i = 0; i < maxCacheitemsLoop; i++) | ||
220 | { | ||
221 | if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex) | ||
222 | { | ||
223 | Primitive.TextureEntryFace face = textureEntry.FaceTextures[cacheItems[i].TextureIndex]; | ||
224 | if (face == null) | ||
225 | { | ||
226 | textureEntry.CreateFace(cacheItems[i].TextureIndex); | ||
227 | textureEntry.FaceTextures[cacheItems[i].TextureIndex].TextureID = | ||
228 | AppearanceManager.DEFAULT_AVATAR_TEXTURE; | ||
229 | continue; | ||
230 | } | ||
231 | cacheItems[i].TextureID = | ||
232 | face.TextureID; | ||
233 | } | ||
234 | else | ||
235 | { | ||
236 | m_log.WarnFormat("[CACHEDBAKES]: Invalid Texture Index Provided, Texture doesn't exist or hasn't been uploaded yet {0}, the max is {1}. Skipping!", cacheItems[i].TextureIndex, textureEntry.FaceTextures.Length); | ||
237 | } | ||
238 | } | ||
239 | |||
240 | for (int i = 0; i < maxCacheitemsLoop; i++) | ||
241 | { | ||
242 | if (cacheItems[i].TextureAsset == null) | ||
243 | { | ||
244 | cacheItems[i].TextureAsset = | ||
245 | m_scene.AssetService.GetCached(cacheItems[i].TextureID.ToString()); | ||
246 | } | ||
247 | } | ||
248 | } | ||
249 | |||
250 | |||
251 | |||
252 | p.Appearance.WearableCacheItems = cacheItems; | ||
253 | |||
254 | |||
255 | |||
256 | if (m_BakedTextureModule != null) | ||
257 | { | ||
258 | m_BakedTextureModule.Store(remoteClient.AgentId, cacheItems); | ||
259 | p.Appearance.WearableCacheItemsDirty = true; | ||
260 | |||
261 | } | ||
262 | } | ||
263 | } | ||
86 | } | 264 | } |
87 | 265 | ||
88 | public void PostInitialise() | 266 | public void PostInitialise() |
89 | { | 267 | { |
90 | } | 268 | } |
91 | 269 | ||
270 | |||
271 | |||
92 | public void Close() { } | 272 | public void Close() { } |
93 | 273 | ||
94 | public string Name { get { return "UploadBakedTextureModule"; } } | 274 | public string Name { get { return "UploadBakedTextureModule"; } } |
@@ -100,15 +280,23 @@ namespace OpenSim.Region.ClientStack.Linden | |||
100 | 280 | ||
101 | public void RegisterCaps(UUID agentID, Caps caps) | 281 | public void RegisterCaps(UUID agentID, Caps caps) |
102 | { | 282 | { |
283 | UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler( | ||
284 | caps, m_scene.AssetService, m_persistBakedTextures); | ||
285 | |||
286 | |||
287 | |||
103 | caps.RegisterHandler( | 288 | caps.RegisterHandler( |
104 | "UploadBakedTexture", | 289 | "UploadBakedTexture", |
105 | new RestStreamHandler( | 290 | new RestStreamHandler( |
106 | "POST", | 291 | "POST", |
107 | "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath, | 292 | "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath, |
108 | new UploadBakedTextureHandler( | 293 | avatarhandler.UploadBakedTexture, |
109 | caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture, | ||
110 | "UploadBakedTexture", | 294 | "UploadBakedTexture", |
111 | agentID.ToString())); | 295 | agentID.ToString())); |
296 | |||
297 | |||
298 | |||
299 | |||
112 | } | 300 | } |
113 | } | 301 | } |
114 | } \ No newline at end of file | 302 | } \ No newline at end of file |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 6890f4a..707cc93 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -27,18 +27,25 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | ||
30 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Threading; | ||
31 | using log4net; | 33 | using log4net; |
32 | using Nini.Config; | 34 | using Nini.Config; |
33 | using Mono.Addins; | 35 | using Mono.Addins; |
34 | using OpenMetaverse; | 36 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Servers; | ||
36 | using OpenSim.Framework.Servers.HttpServer; | 39 | using OpenSim.Framework.Servers.HttpServer; |
37 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenSim.Framework.Capabilities; | ||
39 | using OpenSim.Services.Interfaces; | 43 | using OpenSim.Services.Interfaces; |
40 | using Caps = OpenSim.Framework.Capabilities.Caps; | 44 | using Caps = OpenSim.Framework.Capabilities.Caps; |
41 | using OpenSim.Capabilities.Handlers; | 45 | using OpenSim.Capabilities.Handlers; |
46 | using OpenSim.Framework.Monitoring; | ||
47 | using OpenMetaverse; | ||
48 | using OpenMetaverse.StructuredData; | ||
42 | 49 | ||
43 | namespace OpenSim.Region.ClientStack.Linden | 50 | namespace OpenSim.Region.ClientStack.Linden |
44 | { | 51 | { |
@@ -48,67 +55,74 @@ namespace OpenSim.Region.ClientStack.Linden | |||
48 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WebFetchInvDescModule")] | 55 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WebFetchInvDescModule")] |
49 | public class WebFetchInvDescModule : INonSharedRegionModule | 56 | public class WebFetchInvDescModule : INonSharedRegionModule |
50 | { | 57 | { |
51 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 58 | class aPollRequest |
59 | { | ||
60 | public PollServiceInventoryEventArgs thepoll; | ||
61 | public UUID reqID; | ||
62 | public Hashtable request; | ||
63 | public ScenePresence presence; | ||
64 | public List<UUID> folders; | ||
65 | } | ||
66 | |||
67 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
52 | 68 | ||
53 | private Scene m_scene; | 69 | private Scene m_scene; |
54 | 70 | ||
55 | private IInventoryService m_InventoryService; | 71 | private IInventoryService m_InventoryService; |
56 | private ILibraryService m_LibraryService; | 72 | private ILibraryService m_LibraryService; |
57 | 73 | ||
58 | private bool m_Enabled; | 74 | private static WebFetchInvDescHandler m_webFetchHandler; |
59 | 75 | ||
60 | private string m_fetchInventoryDescendents2Url; | 76 | private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>(); |
61 | private string m_webFetchInventoryDescendentsUrl; | 77 | private static Thread[] m_workerThreads = null; |
62 | 78 | ||
63 | private WebFetchInvDescHandler m_webFetchHandler; | 79 | private static DoubleQueue<aPollRequest> m_queue = |
80 | new DoubleQueue<aPollRequest>(); | ||
64 | 81 | ||
65 | #region ISharedRegionModule Members | 82 | #region ISharedRegionModule Members |
66 | 83 | ||
67 | public void Initialise(IConfigSource source) | 84 | public void Initialise(IConfigSource source) |
68 | { | 85 | { |
69 | IConfig config = source.Configs["ClientStack.LindenCaps"]; | ||
70 | if (config == null) | ||
71 | return; | ||
72 | |||
73 | m_fetchInventoryDescendents2Url = config.GetString("Cap_FetchInventoryDescendents2", string.Empty); | ||
74 | m_webFetchInventoryDescendentsUrl = config.GetString("Cap_WebFetchInventoryDescendents", string.Empty); | ||
75 | |||
76 | if (m_fetchInventoryDescendents2Url != string.Empty || m_webFetchInventoryDescendentsUrl != string.Empty) | ||
77 | { | ||
78 | m_Enabled = true; | ||
79 | } | ||
80 | } | 86 | } |
81 | 87 | ||
82 | public void AddRegion(Scene s) | 88 | public void AddRegion(Scene s) |
83 | { | 89 | { |
84 | if (!m_Enabled) | ||
85 | return; | ||
86 | |||
87 | m_scene = s; | 90 | m_scene = s; |
88 | } | 91 | } |
89 | 92 | ||
90 | public void RemoveRegion(Scene s) | 93 | public void RemoveRegion(Scene s) |
91 | { | 94 | { |
92 | if (!m_Enabled) | ||
93 | return; | ||
94 | |||
95 | m_scene.EventManager.OnRegisterCaps -= RegisterCaps; | 95 | m_scene.EventManager.OnRegisterCaps -= RegisterCaps; |
96 | m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps; | ||
96 | m_scene = null; | 97 | m_scene = null; |
97 | } | 98 | } |
98 | 99 | ||
99 | public void RegionLoaded(Scene s) | 100 | public void RegionLoaded(Scene s) |
100 | { | 101 | { |
101 | if (!m_Enabled) | ||
102 | return; | ||
103 | |||
104 | m_InventoryService = m_scene.InventoryService; | 102 | m_InventoryService = m_scene.InventoryService; |
105 | m_LibraryService = m_scene.LibraryService; | 103 | m_LibraryService = m_scene.LibraryService; |
106 | 104 | ||
107 | // We'll reuse the same handler for all requests. | 105 | // We'll reuse the same handler for all requests. |
108 | if (m_fetchInventoryDescendents2Url == "localhost" || m_webFetchInventoryDescendentsUrl == "localhost") | 106 | m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService); |
109 | m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService); | ||
110 | 107 | ||
111 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | 108 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; |
109 | m_scene.EventManager.OnDeregisterCaps += DeregisterCaps; | ||
110 | |||
111 | if (m_workerThreads == null) | ||
112 | { | ||
113 | m_workerThreads = new Thread[2]; | ||
114 | |||
115 | for (uint i = 0; i < 2; i++) | ||
116 | { | ||
117 | m_workerThreads[i] = Watchdog.StartThread(DoInventoryRequests, | ||
118 | String.Format("InventoryWorkerThread{0}", i), | ||
119 | ThreadPriority.Normal, | ||
120 | false, | ||
121 | true, | ||
122 | null, | ||
123 | int.MaxValue); | ||
124 | } | ||
125 | } | ||
112 | } | 126 | } |
113 | 127 | ||
114 | public void PostInitialise() | 128 | public void PostInitialise() |
@@ -126,43 +140,192 @@ namespace OpenSim.Region.ClientStack.Linden | |||
126 | 140 | ||
127 | #endregion | 141 | #endregion |
128 | 142 | ||
129 | private void RegisterCaps(UUID agentID, Caps caps) | 143 | ~WebFetchInvDescModule() |
130 | { | 144 | { |
131 | if (m_webFetchInventoryDescendentsUrl != "") | 145 | foreach (Thread t in m_workerThreads) |
132 | RegisterFetchCap(agentID, caps, "WebFetchInventoryDescendents", m_webFetchInventoryDescendentsUrl); | 146 | Watchdog.AbortThread(t.ManagedThreadId); |
133 | |||
134 | if (m_fetchInventoryDescendents2Url != "") | ||
135 | RegisterFetchCap(agentID, caps, "FetchInventoryDescendents2", m_fetchInventoryDescendents2Url); | ||
136 | } | 147 | } |
137 | 148 | ||
138 | private void RegisterFetchCap(UUID agentID, Caps caps, string capName, string url) | 149 | private class PollServiceInventoryEventArgs : PollServiceEventArgs |
139 | { | 150 | { |
140 | string capUrl; | 151 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
152 | |||
153 | private Dictionary<UUID, Hashtable> responses = | ||
154 | new Dictionary<UUID, Hashtable>(); | ||
155 | |||
156 | private Scene m_scene; | ||
141 | 157 | ||
142 | if (url == "localhost") | 158 | public PollServiceInventoryEventArgs(Scene scene, UUID pId) : |
159 | base(null, null, null, null, pId, int.MaxValue) | ||
143 | { | 160 | { |
144 | capUrl = "/CAPS/" + UUID.Random(); | 161 | m_scene = scene; |
162 | |||
163 | HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); }; | ||
164 | GetEvents = (x, y) => | ||
165 | { | ||
166 | lock (responses) | ||
167 | { | ||
168 | try | ||
169 | { | ||
170 | return responses[x]; | ||
171 | } | ||
172 | finally | ||
173 | { | ||
174 | responses.Remove(x); | ||
175 | } | ||
176 | } | ||
177 | }; | ||
178 | |||
179 | Request = (x, y) => | ||
180 | { | ||
181 | ScenePresence sp = m_scene.GetScenePresence(Id); | ||
182 | if (sp == null) | ||
183 | { | ||
184 | m_log.ErrorFormat("[INVENTORY]: Unable to find ScenePresence for {0}", Id); | ||
185 | return; | ||
186 | } | ||
187 | |||
188 | aPollRequest reqinfo = new aPollRequest(); | ||
189 | reqinfo.thepoll = this; | ||
190 | reqinfo.reqID = x; | ||
191 | reqinfo.request = y; | ||
192 | reqinfo.presence = sp; | ||
193 | reqinfo.folders = new List<UUID>(); | ||
194 | |||
195 | // Decode the request here | ||
196 | string request = y["body"].ToString(); | ||
197 | |||
198 | request = request.Replace("<string>00000000-0000-0000-0000-000000000000</string>", "<uuid>00000000-0000-0000-0000-000000000000</uuid>"); | ||
199 | |||
200 | request = request.Replace("<key>fetch_folders</key><integer>0</integer>", "<key>fetch_folders</key><boolean>0</boolean>"); | ||
201 | request = request.Replace("<key>fetch_folders</key><integer>1</integer>", "<key>fetch_folders</key><boolean>1</boolean>"); | ||
202 | |||
203 | Hashtable hash = new Hashtable(); | ||
204 | try | ||
205 | { | ||
206 | hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request)); | ||
207 | } | ||
208 | catch (LLSD.LLSDParseException e) | ||
209 | { | ||
210 | m_log.ErrorFormat("[INVENTORY]: Fetch error: {0}{1}" + e.Message, e.StackTrace); | ||
211 | m_log.Error("Request: " + request); | ||
212 | return; | ||
213 | } | ||
214 | catch (System.Xml.XmlException) | ||
215 | { | ||
216 | m_log.ErrorFormat("[INVENTORY]: XML Format error"); | ||
217 | } | ||
218 | |||
219 | ArrayList foldersrequested = (ArrayList)hash["folders"]; | ||
220 | |||
221 | bool highPriority = false; | ||
222 | |||
223 | for (int i = 0; i < foldersrequested.Count; i++) | ||
224 | { | ||
225 | Hashtable inventoryhash = (Hashtable)foldersrequested[i]; | ||
226 | string folder = inventoryhash["folder_id"].ToString(); | ||
227 | UUID folderID; | ||
228 | if (UUID.TryParse(folder, out folderID)) | ||
229 | { | ||
230 | if (!reqinfo.folders.Contains(folderID)) | ||
231 | { | ||
232 | if (sp.COF != UUID.Zero && sp.COF == folderID) | ||
233 | highPriority = true; | ||
234 | reqinfo.folders.Add(folderID); | ||
235 | } | ||
236 | } | ||
237 | } | ||
238 | |||
239 | if (highPriority) | ||
240 | m_queue.EnqueueHigh(reqinfo); | ||
241 | else | ||
242 | m_queue.EnqueueLow(reqinfo); | ||
243 | }; | ||
244 | |||
245 | NoEvents = (x, y) => | ||
246 | { | ||
247 | /* | ||
248 | lock (requests) | ||
249 | { | ||
250 | Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString()); | ||
251 | requests.Remove(request); | ||
252 | } | ||
253 | */ | ||
254 | Hashtable response = new Hashtable(); | ||
255 | |||
256 | response["int_response_code"] = 500; | ||
257 | response["str_response_string"] = "Script timeout"; | ||
258 | response["content_type"] = "text/plain"; | ||
259 | response["keepalive"] = false; | ||
260 | response["reusecontext"] = false; | ||
261 | |||
262 | return response; | ||
263 | }; | ||
264 | } | ||
145 | 265 | ||
146 | IRequestHandler reqHandler | 266 | public void Process(aPollRequest requestinfo) |
147 | = new RestStreamHandler( | 267 | { |
148 | "POST", | 268 | UUID requestID = requestinfo.reqID; |
149 | capUrl, | 269 | |
150 | m_webFetchHandler.FetchInventoryDescendentsRequest, | 270 | Hashtable response = new Hashtable(); |
151 | "FetchInventoryDescendents2", | 271 | |
152 | agentID.ToString()); | 272 | response["int_response_code"] = 200; |
273 | response["content_type"] = "text/plain"; | ||
274 | response["keepalive"] = false; | ||
275 | response["reusecontext"] = false; | ||
153 | 276 | ||
154 | caps.RegisterHandler(capName, reqHandler); | 277 | response["str_response_string"] = m_webFetchHandler.FetchInventoryDescendentsRequest( |
278 | requestinfo.request["body"].ToString(), String.Empty, String.Empty, null, null); | ||
279 | |||
280 | lock (responses) | ||
281 | responses[requestID] = response; | ||
155 | } | 282 | } |
156 | else | 283 | } |
284 | |||
285 | private void RegisterCaps(UUID agentID, Caps caps) | ||
286 | { | ||
287 | string capUrl = "/CAPS/" + UUID.Random() + "/"; | ||
288 | |||
289 | // Register this as a poll service | ||
290 | PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(m_scene, agentID); | ||
291 | |||
292 | args.Type = PollServiceEventArgs.EventType.Inventory; | ||
293 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); | ||
294 | |||
295 | string hostName = m_scene.RegionInfo.ExternalHostName; | ||
296 | uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port; | ||
297 | string protocol = "http"; | ||
298 | |||
299 | if (MainServer.Instance.UseSSL) | ||
157 | { | 300 | { |
158 | capUrl = url; | 301 | hostName = MainServer.Instance.SSLCommonName; |
302 | port = MainServer.Instance.SSLPort; | ||
303 | protocol = "https"; | ||
304 | } | ||
305 | caps.RegisterHandler("FetchInventoryDescendents2", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); | ||
306 | |||
307 | m_capsDict[agentID] = capUrl; | ||
308 | } | ||
159 | 309 | ||
160 | caps.RegisterHandler(capName, capUrl); | 310 | private void DeregisterCaps(UUID agentID, Caps caps) |
311 | { | ||
312 | string capUrl; | ||
313 | |||
314 | if (m_capsDict.TryGetValue(agentID, out capUrl)) | ||
315 | { | ||
316 | MainServer.Instance.RemoveHTTPHandler("", capUrl); | ||
317 | m_capsDict.Remove(agentID); | ||
161 | } | 318 | } |
319 | } | ||
162 | 320 | ||
163 | // m_log.DebugFormat( | 321 | private void DoInventoryRequests() |
164 | // "[WEB FETCH INV DESC MODULE]: Registered capability {0} at {1} in region {2} for {3}", | 322 | { |
165 | // capName, capUrl, m_scene.RegionInfo.RegionName, agentID); | 323 | while (true) |
324 | { | ||
325 | aPollRequest poolreq = m_queue.Dequeue(); | ||
326 | |||
327 | poolreq.thepoll.Process(poolreq); | ||
328 | } | ||
166 | } | 329 | } |
167 | } | 330 | } |
168 | } \ No newline at end of file | 331 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs index afbe56b..3995620 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | |||
@@ -234,6 +234,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
234 | m_stopPacket = TexturePacketCount(); | 234 | m_stopPacket = TexturePacketCount(); |
235 | } | 235 | } |
236 | 236 | ||
237 | //Give them at least two packets, to play nice with some broken viewers (SL also behaves this way) | ||
238 | if (m_stopPacket == 1 && m_layers[0].End > FIRST_PACKET_SIZE) m_stopPacket++; | ||
239 | |||
237 | m_currentPacket = StartPacket; | 240 | m_currentPacket = StartPacket; |
238 | } | 241 | } |
239 | } | 242 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 110e50e..f8b9352 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -100,6 +100,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
100 | public event AvatarPickerRequest OnAvatarPickerRequest; | 100 | public event AvatarPickerRequest OnAvatarPickerRequest; |
101 | public event StartAnim OnStartAnim; | 101 | public event StartAnim OnStartAnim; |
102 | public event StopAnim OnStopAnim; | 102 | public event StopAnim OnStopAnim; |
103 | public event ChangeAnim OnChangeAnim; | ||
103 | public event Action<IClientAPI> OnRequestAvatarsData; | 104 | public event Action<IClientAPI> OnRequestAvatarsData; |
104 | public event LinkObjects OnLinkObjects; | 105 | public event LinkObjects OnLinkObjects; |
105 | public event DelinkObjects OnDelinkObjects; | 106 | public event DelinkObjects OnDelinkObjects; |
@@ -127,6 +128,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
127 | public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; | 128 | public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; |
128 | public event UpdatePrimFlags OnUpdatePrimFlags; | 129 | public event UpdatePrimFlags OnUpdatePrimFlags; |
129 | public event UpdatePrimTexture OnUpdatePrimTexture; | 130 | public event UpdatePrimTexture OnUpdatePrimTexture; |
131 | public event ClientChangeObject onClientChangeObject; | ||
130 | public event UpdateVector OnUpdatePrimGroupPosition; | 132 | public event UpdateVector OnUpdatePrimGroupPosition; |
131 | public event UpdateVector OnUpdatePrimSinglePosition; | 133 | public event UpdateVector OnUpdatePrimSinglePosition; |
132 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; | 134 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; |
@@ -160,6 +162,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
160 | public event RequestTaskInventory OnRequestTaskInventory; | 162 | public event RequestTaskInventory OnRequestTaskInventory; |
161 | public event UpdateInventoryItem OnUpdateInventoryItem; | 163 | public event UpdateInventoryItem OnUpdateInventoryItem; |
162 | public event CopyInventoryItem OnCopyInventoryItem; | 164 | public event CopyInventoryItem OnCopyInventoryItem; |
165 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | ||
163 | public event MoveInventoryItem OnMoveInventoryItem; | 166 | public event MoveInventoryItem OnMoveInventoryItem; |
164 | public event RemoveInventoryItem OnRemoveInventoryItem; | 167 | public event RemoveInventoryItem OnRemoveInventoryItem; |
165 | public event RemoveInventoryFolder OnRemoveInventoryFolder; | 168 | public event RemoveInventoryFolder OnRemoveInventoryFolder; |
@@ -258,7 +261,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
258 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; | 261 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; |
259 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; | 262 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; |
260 | public event ClassifiedDelete OnClassifiedDelete; | 263 | public event ClassifiedDelete OnClassifiedDelete; |
261 | public event ClassifiedDelete OnClassifiedGodDelete; | 264 | public event ClassifiedGodDelete OnClassifiedGodDelete; |
262 | public event EventNotificationAddRequest OnEventNotificationAddRequest; | 265 | public event EventNotificationAddRequest OnEventNotificationAddRequest; |
263 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; | 266 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; |
264 | public event EventGodDelete OnEventGodDelete; | 267 | public event EventGodDelete OnEventGodDelete; |
@@ -289,10 +292,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
289 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 292 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
290 | public event SimWideDeletesDelegate OnSimWideDeletes; | 293 | public event SimWideDeletesDelegate OnSimWideDeletes; |
291 | public event SendPostcard OnSendPostcard; | 294 | public event SendPostcard OnSendPostcard; |
295 | public event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
292 | public event MuteListEntryUpdate OnUpdateMuteListEntry; | 296 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
293 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 297 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
294 | public event GodlikeMessage onGodlikeMessage; | 298 | public event GodlikeMessage onGodlikeMessage; |
295 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; | 299 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
300 | public event GenericCall2 OnUpdateThrottles; | ||
296 | 301 | ||
297 | #endregion Events | 302 | #endregion Events |
298 | 303 | ||
@@ -327,6 +332,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
327 | private Prioritizer m_prioritizer; | 332 | private Prioritizer m_prioritizer; |
328 | private bool m_disableFacelights = false; | 333 | private bool m_disableFacelights = false; |
329 | 334 | ||
335 | private bool m_VelocityInterpolate = false; | ||
336 | private const uint MaxTransferBytesPerPacket = 600; | ||
337 | |||
338 | |||
330 | /// <value> | 339 | /// <value> |
331 | /// List used in construction of data blocks for an object update packet. This is to stop us having to | 340 | /// List used in construction of data blocks for an object update packet. This is to stop us having to |
332 | /// continually recreate it. | 341 | /// continually recreate it. |
@@ -338,14 +347,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
338 | /// thread servicing the m_primFullUpdates queue after a kill. If this happens the object persists as an | 347 | /// thread servicing the m_primFullUpdates queue after a kill. If this happens the object persists as an |
339 | /// ownerless phantom. | 348 | /// ownerless phantom. |
340 | /// | 349 | /// |
341 | /// All manipulation of this set has to occur under a lock | 350 | /// All manipulation of this set has to occur under an m_entityUpdates.SyncRoot lock |
342 | /// | 351 | /// |
343 | /// </value> | 352 | /// </value> |
344 | protected HashSet<uint> m_killRecord; | 353 | // protected HashSet<uint> m_killRecord; |
345 | 354 | ||
346 | // protected HashSet<uint> m_attachmentsSent; | 355 | // protected HashSet<uint> m_attachmentsSent; |
347 | 356 | ||
348 | private int m_moneyBalance; | 357 | private int m_moneyBalance; |
358 | private bool m_deliverPackets = true; | ||
349 | private int m_animationSequenceNumber = 1; | 359 | private int m_animationSequenceNumber = 1; |
350 | private bool m_SendLogoutPacketWhenClosing = true; | 360 | private bool m_SendLogoutPacketWhenClosing = true; |
351 | 361 | ||
@@ -392,6 +402,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
392 | get { return m_startpos; } | 402 | get { return m_startpos; } |
393 | set { m_startpos = value; } | 403 | set { m_startpos = value; } |
394 | } | 404 | } |
405 | public bool DeliverPackets | ||
406 | { | ||
407 | get { return m_deliverPackets; } | ||
408 | set { | ||
409 | m_deliverPackets = value; | ||
410 | m_udpClient.m_deliverPackets = value; | ||
411 | } | ||
412 | } | ||
395 | public UUID AgentId { get { return m_agentId; } } | 413 | public UUID AgentId { get { return m_agentId; } } |
396 | public ISceneAgent SceneAgent { get; set; } | 414 | public ISceneAgent SceneAgent { get; set; } |
397 | public UUID ActiveGroupId { get { return m_activeGroupID; } } | 415 | public UUID ActiveGroupId { get { return m_activeGroupID; } } |
@@ -443,6 +461,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
443 | } | 461 | } |
444 | 462 | ||
445 | public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } } | 463 | public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } } |
464 | |||
446 | 465 | ||
447 | #endregion Properties | 466 | #endregion Properties |
448 | 467 | ||
@@ -469,7 +488,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
469 | m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); | 488 | m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); |
470 | m_entityProps = new PriorityQueue(m_scene.Entities.Count); | 489 | m_entityProps = new PriorityQueue(m_scene.Entities.Count); |
471 | m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>(); | 490 | m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>(); |
472 | m_killRecord = new HashSet<uint>(); | 491 | // m_killRecord = new HashSet<uint>(); |
473 | // m_attachmentsSent = new HashSet<uint>(); | 492 | // m_attachmentsSent = new HashSet<uint>(); |
474 | 493 | ||
475 | m_assetService = m_scene.RequestModuleInterface<IAssetService>(); | 494 | m_assetService = m_scene.RequestModuleInterface<IAssetService>(); |
@@ -499,12 +518,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
499 | 518 | ||
500 | #region Client Methods | 519 | #region Client Methods |
501 | 520 | ||
521 | |||
522 | /// <summary> | ||
523 | /// Close down the client view | ||
524 | /// </summary> | ||
502 | public void Close() | 525 | public void Close() |
503 | { | 526 | { |
504 | Close(false); | 527 | Close(true, false); |
505 | } | 528 | } |
506 | 529 | ||
507 | public void Close(bool force) | 530 | public void Close(bool sendStop, bool force) |
508 | { | 531 | { |
509 | // We lock here to prevent race conditions between two threads calling close simultaneously (e.g. | 532 | // We lock here to prevent race conditions between two threads calling close simultaneously (e.g. |
510 | // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection. | 533 | // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection. |
@@ -516,7 +539,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
516 | return; | 539 | return; |
517 | 540 | ||
518 | IsActive = false; | 541 | IsActive = false; |
519 | CloseWithoutChecks(); | 542 | CloseWithoutChecks(sendStop); |
520 | } | 543 | } |
521 | } | 544 | } |
522 | 545 | ||
@@ -529,12 +552,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
529 | /// | 552 | /// |
530 | /// Callers must lock ClosingSyncLock before calling. | 553 | /// Callers must lock ClosingSyncLock before calling. |
531 | /// </remarks> | 554 | /// </remarks> |
532 | public void CloseWithoutChecks() | 555 | public void CloseWithoutChecks(bool sendStop) |
533 | { | 556 | { |
534 | m_log.DebugFormat( | 557 | m_log.DebugFormat( |
535 | "[CLIENT]: Close has been called for {0} attached to scene {1}", | 558 | "[CLIENT]: Close has been called for {0} attached to scene {1}", |
536 | Name, m_scene.RegionInfo.RegionName); | 559 | Name, m_scene.RegionInfo.RegionName); |
537 | 560 | ||
561 | if (sendStop) | ||
562 | { | ||
563 | // Send the STOP packet | ||
564 | DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator); | ||
565 | OutPacket(disable, ThrottleOutPacketType.Unknown); | ||
566 | } | ||
567 | |||
538 | // Shutdown the image manager | 568 | // Shutdown the image manager |
539 | ImageManager.Close(); | 569 | ImageManager.Close(); |
540 | 570 | ||
@@ -557,6 +587,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
557 | // Disable UDP handling for this client | 587 | // Disable UDP handling for this client |
558 | m_udpClient.Shutdown(); | 588 | m_udpClient.Shutdown(); |
559 | 589 | ||
590 | |||
560 | //m_log.InfoFormat("[CLIENTVIEW] Memory pre GC {0}", System.GC.GetTotalMemory(false)); | 591 | //m_log.InfoFormat("[CLIENTVIEW] Memory pre GC {0}", System.GC.GetTotalMemory(false)); |
561 | //GC.Collect(); | 592 | //GC.Collect(); |
562 | //m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true)); | 593 | //m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true)); |
@@ -791,9 +822,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
791 | handshake.RegionInfo3.ColoName = Utils.EmptyBytes; | 822 | handshake.RegionInfo3.ColoName = Utils.EmptyBytes; |
792 | handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType); | 823 | handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType); |
793 | handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes; | 824 | handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes; |
825 | |||
794 | handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[0]; | 826 | handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[0]; |
795 | 827 | // OutPacket(handshake, ThrottleOutPacketType.Task); | |
796 | OutPacket(handshake, ThrottleOutPacketType.Task); | 828 | // use same as MoveAgentIntoRegion (both should be task ) |
829 | OutPacket(handshake, ThrottleOutPacketType.Unknown); | ||
797 | } | 830 | } |
798 | 831 | ||
799 | public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) | 832 | public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) |
@@ -833,7 +866,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
833 | reply.ChatData.OwnerID = ownerID; | 866 | reply.ChatData.OwnerID = ownerID; |
834 | reply.ChatData.SourceID = fromAgentID; | 867 | reply.ChatData.SourceID = fromAgentID; |
835 | 868 | ||
836 | OutPacket(reply, ThrottleOutPacketType.Task); | 869 | OutPacket(reply, ThrottleOutPacketType.Unknown); |
837 | } | 870 | } |
838 | 871 | ||
839 | /// <summary> | 872 | /// <summary> |
@@ -866,32 +899,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
866 | msg.MessageBlock.Message = Util.StringToBytes1024(im.message); | 899 | msg.MessageBlock.Message = Util.StringToBytes1024(im.message); |
867 | msg.MessageBlock.BinaryBucket = im.binaryBucket; | 900 | msg.MessageBlock.BinaryBucket = im.binaryBucket; |
868 | 901 | ||
869 | if (im.message.StartsWith("[grouptest]")) | 902 | OutPacket(msg, ThrottleOutPacketType.Task); |
870 | { // this block is test code for implementing group IM - delete when group IM is finished | ||
871 | IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); | ||
872 | if (eq != null) | ||
873 | { | ||
874 | im.dialog = 17; | ||
875 | |||
876 | //eq.ChatterboxInvitation( | ||
877 | // new UUID("00000000-68f9-1111-024e-222222111123"), | ||
878 | // "OpenSimulator Testing", im.fromAgentID, im.message, im.toAgentID, im.fromAgentName, im.dialog, 0, | ||
879 | // false, 0, new Vector3(), 1, im.imSessionID, im.fromGroup, im.binaryBucket); | ||
880 | |||
881 | eq.ChatterboxInvitation( | ||
882 | new UUID("00000000-68f9-1111-024e-222222111123"), | ||
883 | "OpenSimulator Testing", new UUID(im.fromAgentID), im.message, new UUID(im.toAgentID), im.fromAgentName, im.dialog, 0, | ||
884 | false, 0, new Vector3(), 1, new UUID(im.imSessionID), im.fromGroup, Util.StringToBytes256("OpenSimulator Testing")); | ||
885 | |||
886 | eq.ChatterBoxSessionAgentListUpdates( | ||
887 | new UUID("00000000-68f9-1111-024e-222222111123"), | ||
888 | new UUID(im.fromAgentID), new UUID(im.toAgentID), false, false, false); | ||
889 | } | ||
890 | |||
891 | Console.WriteLine("SendInstantMessage: " + msg); | ||
892 | } | ||
893 | else | ||
894 | OutPacket(msg, ThrottleOutPacketType.Task); | ||
895 | } | 903 | } |
896 | } | 904 | } |
897 | 905 | ||
@@ -1119,6 +1127,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1119 | public virtual void SendLayerData(float[] map) | 1127 | public virtual void SendLayerData(float[] map) |
1120 | { | 1128 | { |
1121 | Util.FireAndForget(DoSendLayerData, map); | 1129 | Util.FireAndForget(DoSendLayerData, map); |
1130 | |||
1131 | // Send it sync, and async. It's not that much data | ||
1132 | // and it improves user experience just so much! | ||
1133 | DoSendLayerData(map); | ||
1122 | } | 1134 | } |
1123 | 1135 | ||
1124 | /// <summary> | 1136 | /// <summary> |
@@ -1131,16 +1143,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1131 | 1143 | ||
1132 | try | 1144 | try |
1133 | { | 1145 | { |
1134 | //for (int y = 0; y < 16; y++) | 1146 | for (int y = 0; y < 16; y++) |
1135 | //{ | 1147 | { |
1136 | // for (int x = 0; x < 16; x++) | 1148 | for (int x = 0; x < 16; x+=4) |
1137 | // { | 1149 | { |
1138 | // SendLayerData(x, y, map); | 1150 | SendLayerPacket(x, y, map); |
1139 | // } | 1151 | } |
1140 | //} | 1152 | } |
1141 | |||
1142 | // Send LayerData in a spiral pattern. Fun! | ||
1143 | SendLayerTopRight(map, 0, 0, 15, 15); | ||
1144 | } | 1153 | } |
1145 | catch (Exception e) | 1154 | catch (Exception e) |
1146 | { | 1155 | { |
@@ -1148,51 +1157,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1148 | } | 1157 | } |
1149 | } | 1158 | } |
1150 | 1159 | ||
1151 | private void SendLayerTopRight(float[] map, int x1, int y1, int x2, int y2) | ||
1152 | { | ||
1153 | // Row | ||
1154 | for (int i = x1; i <= x2; i++) | ||
1155 | SendLayerData(i, y1, map); | ||
1156 | |||
1157 | // Column | ||
1158 | for (int j = y1 + 1; j <= y2; j++) | ||
1159 | SendLayerData(x2, j, map); | ||
1160 | |||
1161 | if (x2 - x1 > 0) | ||
1162 | SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2); | ||
1163 | } | ||
1164 | |||
1165 | void SendLayerBottomLeft(float[] map, int x1, int y1, int x2, int y2) | ||
1166 | { | ||
1167 | // Row in reverse | ||
1168 | for (int i = x2; i >= x1; i--) | ||
1169 | SendLayerData(i, y2, map); | ||
1170 | |||
1171 | // Column in reverse | ||
1172 | for (int j = y2 - 1; j >= y1; j--) | ||
1173 | SendLayerData(x1, j, map); | ||
1174 | |||
1175 | if (x2 - x1 > 0) | ||
1176 | SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1); | ||
1177 | } | ||
1178 | |||
1179 | /// <summary> | 1160 | /// <summary> |
1180 | /// Sends a set of four patches (x, x+1, ..., x+3) to the client | 1161 | /// Sends a set of four patches (x, x+1, ..., x+3) to the client |
1181 | /// </summary> | 1162 | /// </summary> |
1182 | /// <param name="map">heightmap</param> | 1163 | /// <param name="map">heightmap</param> |
1183 | /// <param name="px">X coordinate for patches 0..12</param> | 1164 | /// <param name="px">X coordinate for patches 0..12</param> |
1184 | /// <param name="py">Y coordinate for patches 0..15</param> | 1165 | /// <param name="py">Y coordinate for patches 0..15</param> |
1185 | // private void SendLayerPacket(float[] map, int y, int x) | 1166 | private void SendLayerPacket(int x, int y, float[] map) |
1186 | // { | 1167 | { |
1187 | // int[] patches = new int[4]; | 1168 | int[] patches = new int[4]; |
1188 | // patches[0] = x + 0 + y * 16; | 1169 | patches[0] = x + 0 + y * 16; |
1189 | // patches[1] = x + 1 + y * 16; | 1170 | patches[1] = x + 1 + y * 16; |
1190 | // patches[2] = x + 2 + y * 16; | 1171 | patches[2] = x + 2 + y * 16; |
1191 | // patches[3] = x + 3 + y * 16; | 1172 | patches[3] = x + 3 + y * 16; |
1192 | 1173 | ||
1193 | // Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches); | 1174 | float[] heightmap = (map.Length == 65536) ? |
1194 | // OutPacket(layerpack, ThrottleOutPacketType.Land); | 1175 | map : |
1195 | // } | 1176 | LLHeightFieldMoronize(map); |
1177 | |||
1178 | try | ||
1179 | { | ||
1180 | Packet layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches); | ||
1181 | OutPacket(layerpack, ThrottleOutPacketType.Land); | ||
1182 | } | ||
1183 | catch | ||
1184 | { | ||
1185 | for (int px = x ; px < x + 4 ; px++) | ||
1186 | SendLayerData(px, y, map); | ||
1187 | } | ||
1188 | } | ||
1196 | 1189 | ||
1197 | /// <summary> | 1190 | /// <summary> |
1198 | /// Sends a specified patch to a client | 1191 | /// Sends a specified patch to a client |
@@ -1212,7 +1205,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1212 | LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches); | 1205 | LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches); |
1213 | layerpack.Header.Reliable = true; | 1206 | layerpack.Header.Reliable = true; |
1214 | 1207 | ||
1215 | OutPacket(layerpack, ThrottleOutPacketType.Land); | 1208 | OutPacket(layerpack, ThrottleOutPacketType.Task); |
1216 | } | 1209 | } |
1217 | catch (Exception e) | 1210 | catch (Exception e) |
1218 | { | 1211 | { |
@@ -1575,7 +1568,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1575 | 1568 | ||
1576 | public void SendKillObject(ulong regionHandle, List<uint> localIDs) | 1569 | public void SendKillObject(ulong regionHandle, List<uint> localIDs) |
1577 | { | 1570 | { |
1578 | // m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle); | 1571 | // foreach (uint id in localIDs) |
1572 | // m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle); | ||
1579 | 1573 | ||
1580 | KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); | 1574 | KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); |
1581 | // TODO: don't create new blocks if recycling an old packet | 1575 | // TODO: don't create new blocks if recycling an old packet |
@@ -1597,17 +1591,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1597 | // We MUST lock for both manipulating the kill record and sending the packet, in order to avoid a race | 1591 | // We MUST lock for both manipulating the kill record and sending the packet, in order to avoid a race |
1598 | // condition where a kill can be processed before an out-of-date update for the same object. | 1592 | // condition where a kill can be processed before an out-of-date update for the same object. |
1599 | // ProcessEntityUpdates() also takes the m_killRecord lock. | 1593 | // ProcessEntityUpdates() also takes the m_killRecord lock. |
1600 | lock (m_killRecord) | 1594 | // lock (m_killRecord) |
1601 | { | 1595 | // { |
1602 | foreach (uint localID in localIDs) | 1596 | // foreach (uint localID in localIDs) |
1603 | m_killRecord.Add(localID); | 1597 | // m_killRecord.Add(localID); |
1604 | 1598 | ||
1605 | // The throttle queue used here must match that being used for updates. Otherwise, there is a | 1599 | // The throttle queue used here must match that being used for updates. Otherwise, there is a |
1606 | // chance that a kill packet put on a separate queue will be sent to the client before an existing | 1600 | // chance that a kill packet put on a separate queue will be sent to the client before an existing |
1607 | // update packet on another queue. Receiving updates after kills results in unowned and undeletable | 1601 | // update packet on another queue. Receiving updates after kills results in unowned and undeletable |
1608 | // scene objects in a viewer until that viewer is relogged in. | 1602 | // scene objects in a viewer until that viewer is relogged in. |
1609 | OutPacket(kill, ThrottleOutPacketType.Task); | 1603 | OutPacket(kill, ThrottleOutPacketType.Task); |
1610 | } | 1604 | // } |
1611 | } | 1605 | } |
1612 | } | 1606 | } |
1613 | 1607 | ||
@@ -2066,9 +2060,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2066 | OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); | 2060 | OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); |
2067 | } | 2061 | } |
2068 | 2062 | ||
2069 | /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see> | ||
2070 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId) | 2063 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId) |
2071 | { | 2064 | { |
2065 | SendInventoryItemCreateUpdate(Item, UUID.Zero, callbackId); | ||
2066 | } | ||
2067 | |||
2068 | /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see> | ||
2069 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId) | ||
2070 | { | ||
2072 | const uint FULL_MASK_PERMISSIONS = (uint)0x7fffffff; | 2071 | const uint FULL_MASK_PERMISSIONS = (uint)0x7fffffff; |
2073 | 2072 | ||
2074 | UpdateCreateInventoryItemPacket InventoryReply | 2073 | UpdateCreateInventoryItemPacket InventoryReply |
@@ -2078,6 +2077,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2078 | // TODO: don't create new blocks if recycling an old packet | 2077 | // TODO: don't create new blocks if recycling an old packet |
2079 | InventoryReply.AgentData.AgentID = AgentId; | 2078 | InventoryReply.AgentData.AgentID = AgentId; |
2080 | InventoryReply.AgentData.SimApproved = true; | 2079 | InventoryReply.AgentData.SimApproved = true; |
2080 | InventoryReply.AgentData.TransactionID = transactionID; | ||
2081 | InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1]; | 2081 | InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1]; |
2082 | InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock(); | 2082 | InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock(); |
2083 | InventoryReply.InventoryData[0].ItemID = Item.ID; | 2083 | InventoryReply.InventoryData[0].ItemID = Item.ID; |
@@ -2147,16 +2147,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2147 | replytask.InventoryData.TaskID = taskID; | 2147 | replytask.InventoryData.TaskID = taskID; |
2148 | replytask.InventoryData.Serial = serial; | 2148 | replytask.InventoryData.Serial = serial; |
2149 | replytask.InventoryData.Filename = fileName; | 2149 | replytask.InventoryData.Filename = fileName; |
2150 | OutPacket(replytask, ThrottleOutPacketType.Asset); | 2150 | OutPacket(replytask, ThrottleOutPacketType.Task); |
2151 | } | 2151 | } |
2152 | 2152 | ||
2153 | public void SendXferPacket(ulong xferID, uint packet, byte[] data) | 2153 | public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory) |
2154 | { | 2154 | { |
2155 | ThrottleOutPacketType type = ThrottleOutPacketType.Asset; | ||
2156 | if (isTaskInventory) | ||
2157 | type = ThrottleOutPacketType.Task; | ||
2158 | |||
2155 | SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket); | 2159 | SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket); |
2156 | sendXfer.XferID.ID = xferID; | 2160 | sendXfer.XferID.ID = xferID; |
2157 | sendXfer.XferID.Packet = packet; | 2161 | sendXfer.XferID.Packet = packet; |
2158 | sendXfer.DataPacket.Data = data; | 2162 | sendXfer.DataPacket.Data = data; |
2159 | OutPacket(sendXfer, ThrottleOutPacketType.Asset); | 2163 | OutPacket(sendXfer, type); |
2160 | } | 2164 | } |
2161 | 2165 | ||
2162 | public void SendAbortXferPacket(ulong xferID) | 2166 | public void SendAbortXferPacket(ulong xferID) |
@@ -2338,6 +2342,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2338 | OutPacket(sound, ThrottleOutPacketType.Task); | 2342 | OutPacket(sound, ThrottleOutPacketType.Task); |
2339 | } | 2343 | } |
2340 | 2344 | ||
2345 | public void SendTransferAbort(TransferRequestPacket transferRequest) | ||
2346 | { | ||
2347 | TransferAbortPacket abort = (TransferAbortPacket)PacketPool.Instance.GetPacket(PacketType.TransferAbort); | ||
2348 | abort.TransferInfo.TransferID = transferRequest.TransferInfo.TransferID; | ||
2349 | abort.TransferInfo.ChannelType = transferRequest.TransferInfo.ChannelType; | ||
2350 | m_log.Debug("[Assets] Aborting transfer; asset request failed"); | ||
2351 | OutPacket(abort, ThrottleOutPacketType.Task); | ||
2352 | } | ||
2353 | |||
2341 | public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain) | 2354 | public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain) |
2342 | { | 2355 | { |
2343 | SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger); | 2356 | SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger); |
@@ -2646,6 +2659,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2646 | float friction = part.Friction; | 2659 | float friction = part.Friction; |
2647 | float bounce = part.Restitution; | 2660 | float bounce = part.Restitution; |
2648 | float gravmod = part.GravityModifier; | 2661 | float gravmod = part.GravityModifier; |
2662 | |||
2649 | eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId); | 2663 | eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId); |
2650 | } | 2664 | } |
2651 | } | 2665 | } |
@@ -2716,8 +2730,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2716 | req.AssetInf.ID, req.AssetInf.Metadata.ContentType); | 2730 | req.AssetInf.ID, req.AssetInf.Metadata.ContentType); |
2717 | return; | 2731 | return; |
2718 | } | 2732 | } |
2733 | int WearableOut = 0; | ||
2734 | bool isWearable = false; | ||
2719 | 2735 | ||
2720 | //m_log.Debug("sending asset " + req.RequestAssetID); | 2736 | if (req.AssetInf != null) |
2737 | isWearable = | ||
2738 | ((AssetType) req.AssetInf.Type == | ||
2739 | AssetType.Bodypart || (AssetType) req.AssetInf.Type == AssetType.Clothing); | ||
2740 | |||
2741 | |||
2742 | //m_log.Debug("sending asset " + req.RequestAssetID + ", iswearable: " + isWearable); | ||
2743 | |||
2744 | |||
2745 | //if (isWearable) | ||
2746 | // m_log.Debug((AssetType)req.AssetInf.Type); | ||
2747 | |||
2721 | TransferInfoPacket Transfer = new TransferInfoPacket(); | 2748 | TransferInfoPacket Transfer = new TransferInfoPacket(); |
2722 | Transfer.TransferInfo.ChannelType = 2; | 2749 | Transfer.TransferInfo.ChannelType = 2; |
2723 | Transfer.TransferInfo.Status = 0; | 2750 | Transfer.TransferInfo.Status = 0; |
@@ -2739,7 +2766,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2739 | Transfer.TransferInfo.Size = req.AssetInf.Data.Length; | 2766 | Transfer.TransferInfo.Size = req.AssetInf.Data.Length; |
2740 | Transfer.TransferInfo.TransferID = req.TransferRequestID; | 2767 | Transfer.TransferInfo.TransferID = req.TransferRequestID; |
2741 | Transfer.Header.Zerocoded = true; | 2768 | Transfer.Header.Zerocoded = true; |
2742 | OutPacket(Transfer, ThrottleOutPacketType.Asset); | 2769 | OutPacket(Transfer, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset); |
2743 | 2770 | ||
2744 | if (req.NumPackets == 1) | 2771 | if (req.NumPackets == 1) |
2745 | { | 2772 | { |
@@ -2750,12 +2777,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2750 | TransferPacket.TransferData.Data = req.AssetInf.Data; | 2777 | TransferPacket.TransferData.Data = req.AssetInf.Data; |
2751 | TransferPacket.TransferData.Status = 1; | 2778 | TransferPacket.TransferData.Status = 1; |
2752 | TransferPacket.Header.Zerocoded = true; | 2779 | TransferPacket.Header.Zerocoded = true; |
2753 | OutPacket(TransferPacket, ThrottleOutPacketType.Asset); | 2780 | OutPacket(TransferPacket, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset); |
2754 | } | 2781 | } |
2755 | else | 2782 | else |
2756 | { | 2783 | { |
2757 | int processedLength = 0; | 2784 | int processedLength = 0; |
2758 | int maxChunkSize = Settings.MAX_PACKET_SIZE - 100; | 2785 | // int maxChunkSize = Settings.MAX_PACKET_SIZE - 100; |
2786 | |||
2787 | int maxChunkSize = (int) MaxTransferBytesPerPacket; | ||
2759 | int packetNumber = 0; | 2788 | int packetNumber = 0; |
2760 | 2789 | ||
2761 | while (processedLength < req.AssetInf.Data.Length) | 2790 | while (processedLength < req.AssetInf.Data.Length) |
@@ -2781,7 +2810,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2781 | TransferPacket.TransferData.Status = 1; | 2810 | TransferPacket.TransferData.Status = 1; |
2782 | } | 2811 | } |
2783 | TransferPacket.Header.Zerocoded = true; | 2812 | TransferPacket.Header.Zerocoded = true; |
2784 | OutPacket(TransferPacket, ThrottleOutPacketType.Asset); | 2813 | OutPacket(TransferPacket, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset); |
2785 | 2814 | ||
2786 | processedLength += chunkSize; | 2815 | processedLength += chunkSize; |
2787 | packetNumber++; | 2816 | packetNumber++; |
@@ -2826,7 +2855,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2826 | reply.Data.ParcelID = parcelID; | 2855 | reply.Data.ParcelID = parcelID; |
2827 | reply.Data.OwnerID = land.OwnerID; | 2856 | reply.Data.OwnerID = land.OwnerID; |
2828 | reply.Data.Name = Utils.StringToBytes(land.Name); | 2857 | reply.Data.Name = Utils.StringToBytes(land.Name); |
2829 | reply.Data.Desc = Utils.StringToBytes(land.Description); | 2858 | if (land != null && land.Description != null && land.Description != String.Empty) |
2859 | reply.Data.Desc = Utils.StringToBytes(land.Description.Substring(0, land.Description.Length > 254 ? 254: land.Description.Length)); | ||
2860 | else | ||
2861 | reply.Data.Desc = new Byte[0]; | ||
2830 | reply.Data.ActualArea = land.Area; | 2862 | reply.Data.ActualArea = land.Area; |
2831 | reply.Data.BillableArea = land.Area; // TODO: what is this? | 2863 | reply.Data.BillableArea = land.Area; // TODO: what is this? |
2832 | 2864 | ||
@@ -3533,24 +3565,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3533 | aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[count]; | 3565 | aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[count]; |
3534 | AgentWearablesUpdatePacket.WearableDataBlock awb; | 3566 | AgentWearablesUpdatePacket.WearableDataBlock awb; |
3535 | int idx = 0; | 3567 | int idx = 0; |
3536 | for (int i = 0; i < wearables.Length; i++) | 3568 | |
3537 | { | 3569 | for (int i = 0; i < wearables.Length; i++) |
3538 | for (int j = 0; j < wearables[i].Count; j++) | 3570 | { |
3539 | { | 3571 | for (int j = 0; j < wearables[i].Count; j++) |
3540 | awb = new AgentWearablesUpdatePacket.WearableDataBlock(); | 3572 | { |
3541 | awb.WearableType = (byte)i; | 3573 | awb = new AgentWearablesUpdatePacket.WearableDataBlock(); |
3542 | awb.AssetID = wearables[i][j].AssetID; | 3574 | awb.WearableType = (byte) i; |
3543 | awb.ItemID = wearables[i][j].ItemID; | 3575 | awb.AssetID = wearables[i][j].AssetID; |
3544 | aw.WearableData[idx] = awb; | 3576 | awb.ItemID = wearables[i][j].ItemID; |
3545 | idx++; | 3577 | aw.WearableData[idx] = awb; |
3546 | 3578 | idx++; | |
3547 | // m_log.DebugFormat( | 3579 | |
3548 | // "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}", | 3580 | // m_log.DebugFormat( |
3549 | // awb.ItemID, awb.AssetID, i, Name); | 3581 | // "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}", |
3550 | } | 3582 | // awb.ItemID, awb.AssetID, i, Name); |
3551 | } | 3583 | } |
3584 | } | ||
3552 | 3585 | ||
3553 | OutPacket(aw, ThrottleOutPacketType.Task); | 3586 | OutPacket(aw, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority); |
3554 | } | 3587 | } |
3555 | 3588 | ||
3556 | public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) | 3589 | public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) |
@@ -3561,7 +3594,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3561 | 3594 | ||
3562 | AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance); | 3595 | AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance); |
3563 | // TODO: don't create new blocks if recycling an old packet | 3596 | // TODO: don't create new blocks if recycling an old packet |
3564 | avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218]; | 3597 | avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[visualParams.Length]; |
3565 | avp.ObjectData.TextureEntry = textureEntry; | 3598 | avp.ObjectData.TextureEntry = textureEntry; |
3566 | 3599 | ||
3567 | AvatarAppearancePacket.VisualParamBlock avblock = null; | 3600 | AvatarAppearancePacket.VisualParamBlock avblock = null; |
@@ -3692,7 +3725,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3692 | /// </summary> | 3725 | /// </summary> |
3693 | public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) | 3726 | public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) |
3694 | { | 3727 | { |
3695 | //double priority = m_prioritizer.GetUpdatePriority(this, entity); | 3728 | if (entity is SceneObjectPart) |
3729 | { | ||
3730 | SceneObjectPart e = (SceneObjectPart)entity; | ||
3731 | SceneObjectGroup g = e.ParentGroup; | ||
3732 | if (g.RootPart.Shape.State > 30) // HUD | ||
3733 | if (g.OwnerID != AgentId) | ||
3734 | return; // Don't send updates for other people's HUDs | ||
3735 | } | ||
3736 | |||
3696 | uint priority = m_prioritizer.GetUpdatePriority(this, entity); | 3737 | uint priority = m_prioritizer.GetUpdatePriority(this, entity); |
3697 | 3738 | ||
3698 | lock (m_entityUpdates.SyncRoot) | 3739 | lock (m_entityUpdates.SyncRoot) |
@@ -3759,27 +3800,74 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3759 | 3800 | ||
3760 | // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race | 3801 | // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race |
3761 | // condition where a kill can be processed before an out-of-date update for the same object. | 3802 | // condition where a kill can be processed before an out-of-date update for the same object. |
3762 | lock (m_killRecord) | 3803 | float avgTimeDilation = 1.0f; |
3804 | IEntityUpdate iupdate; | ||
3805 | Int32 timeinqueue; // this is just debugging code & can be dropped later | ||
3806 | |||
3807 | while (updatesThisCall < maxUpdates) | ||
3763 | { | 3808 | { |
3764 | float avgTimeDilation = 1.0f; | 3809 | lock (m_entityUpdates.SyncRoot) |
3765 | IEntityUpdate iupdate; | 3810 | if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue)) |
3766 | Int32 timeinqueue; // this is just debugging code & can be dropped later | 3811 | break; |
3812 | |||
3813 | EntityUpdate update = (EntityUpdate)iupdate; | ||
3814 | |||
3815 | avgTimeDilation += update.TimeDilation; | ||
3816 | avgTimeDilation *= 0.5f; | ||
3767 | 3817 | ||
3768 | while (updatesThisCall < maxUpdates) | 3818 | if (update.Entity is SceneObjectPart) |
3769 | { | 3819 | { |
3770 | lock (m_entityUpdates.SyncRoot) | 3820 | SceneObjectPart part = (SceneObjectPart)update.Entity; |
3771 | if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue)) | ||
3772 | break; | ||
3773 | 3821 | ||
3774 | EntityUpdate update = (EntityUpdate)iupdate; | 3822 | if (part.ParentGroup.IsDeleted) |
3775 | 3823 | continue; | |
3776 | avgTimeDilation += update.TimeDilation; | ||
3777 | avgTimeDilation *= 0.5f; | ||
3778 | 3824 | ||
3779 | if (update.Entity is SceneObjectPart) | 3825 | if (part.ParentGroup.IsAttachment) |
3826 | { // Someone else's HUD, why are we getting these? | ||
3827 | if (part.ParentGroup.OwnerID != AgentId && | ||
3828 | part.ParentGroup.RootPart.Shape.State > 30) | ||
3829 | continue; | ||
3830 | ScenePresence sp; | ||
3831 | // Owner is not in the sim, don't update it to | ||
3832 | // anyone | ||
3833 | if (!m_scene.TryGetScenePresence(part.OwnerID, out sp)) | ||
3834 | continue; | ||
3835 | |||
3836 | List<SceneObjectGroup> atts = sp.GetAttachments(); | ||
3837 | bool found = false; | ||
3838 | foreach (SceneObjectGroup att in atts) | ||
3839 | { | ||
3840 | if (att == part.ParentGroup) | ||
3841 | { | ||
3842 | found = true; | ||
3843 | break; | ||
3844 | } | ||
3845 | } | ||
3846 | |||
3847 | // It's an attachment of a valid avatar, but | ||
3848 | // doesn't seem to be attached, skip | ||
3849 | if (!found) | ||
3850 | continue; | ||
3851 | |||
3852 | // On vehicle crossing, the attachments are received | ||
3853 | // while the avatar is still a child. Don't send | ||
3854 | // updates here because the LocalId has not yet | ||
3855 | // been updated and the viewer will derender the | ||
3856 | // attachments until the avatar becomes root. | ||
3857 | if (sp.IsChildAgent) | ||
3858 | continue; | ||
3859 | |||
3860 | // If the object is an attachment we don't want it to be in the kill | ||
3861 | // record. Else attaching from inworld and subsequently dropping | ||
3862 | // it will no longer work. | ||
3863 | // lock (m_killRecord) | ||
3864 | // { | ||
3865 | // m_killRecord.Remove(part.LocalId); | ||
3866 | // m_killRecord.Remove(part.ParentGroup.RootPart.LocalId); | ||
3867 | // } | ||
3868 | } | ||
3869 | else | ||
3780 | { | 3870 | { |
3781 | SceneObjectPart part = (SceneObjectPart)update.Entity; | ||
3782 | |||
3783 | // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client | 3871 | // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client |
3784 | // will never receive an update after a prim kill. Even then, keeping the kill record may be a good | 3872 | // will never receive an update after a prim kill. Even then, keeping the kill record may be a good |
3785 | // safety measure. | 3873 | // safety measure. |
@@ -3790,21 +3878,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3790 | // | 3878 | // |
3791 | // This doesn't appear to apply to child prims - a client will happily ignore these updates | 3879 | // This doesn't appear to apply to child prims - a client will happily ignore these updates |
3792 | // after the root prim has been deleted. | 3880 | // after the root prim has been deleted. |
3793 | if (m_killRecord.Contains(part.LocalId)) | 3881 | // |
3794 | { | 3882 | // We ignore this for attachments because attaching something from inworld breaks unless we do. |
3795 | // m_log.WarnFormat( | 3883 | // lock (m_killRecord) |
3796 | // "[CLIENT]: Preventing update for prim with local id {0} after client for user {1} told it was deleted", | 3884 | // { |
3797 | // part.LocalId, Name); | 3885 | // if (m_killRecord.Contains(part.LocalId)) |
3798 | continue; | 3886 | // continue; |
3799 | } | 3887 | // if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId)) |
3800 | 3888 | // continue; | |
3801 | if (part.ParentGroup.IsAttachment && m_disableFacelights) | 3889 | // } |
3890 | } | ||
3891 | |||
3892 | if (part.ParentGroup.IsAttachment && m_disableFacelights) | ||
3893 | { | ||
3894 | if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand && | ||
3895 | part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand) | ||
3802 | { | 3896 | { |
3803 | if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand && | 3897 | part.Shape.LightEntry = false; |
3804 | part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand) | ||
3805 | { | ||
3806 | part.Shape.LightEntry = false; | ||
3807 | } | ||
3808 | } | 3898 | } |
3809 | 3899 | ||
3810 | if (part.Shape != null && (part.Shape.SculptType == (byte)SculptType.Mesh)) | 3900 | if (part.Shape != null && (part.Shape.SculptType == (byte)SculptType.Mesh)) |
@@ -3815,224 +3905,166 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3815 | part.Shape.ProfileHollow = 27500; | 3905 | part.Shape.ProfileHollow = 27500; |
3816 | } | 3906 | } |
3817 | } | 3907 | } |
3818 | 3908 | ||
3819 | #region UpdateFlags to packet type conversion | 3909 | if (part.Shape != null && (part.Shape.SculptType == (byte)SculptType.Mesh)) |
3820 | |||
3821 | PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags; | ||
3822 | |||
3823 | bool canUseCompressed = true; | ||
3824 | bool canUseImproved = true; | ||
3825 | |||
3826 | // Compressed object updates only make sense for LL primitives | ||
3827 | if (!(update.Entity is SceneObjectPart)) | ||
3828 | { | 3910 | { |
3829 | canUseCompressed = false; | 3911 | // Ensure that mesh has at least 8 valid faces |
3912 | part.Shape.ProfileBegin = 12500; | ||
3913 | part.Shape.ProfileEnd = 0; | ||
3914 | part.Shape.ProfileHollow = 27500; | ||
3830 | } | 3915 | } |
3831 | 3916 | } | |
3832 | if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate)) | 3917 | |
3918 | ++updatesThisCall; | ||
3919 | |||
3920 | #region UpdateFlags to packet type conversion | ||
3921 | |||
3922 | PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags; | ||
3923 | |||
3924 | bool canUseCompressed = true; | ||
3925 | bool canUseImproved = true; | ||
3926 | |||
3927 | // Compressed object updates only make sense for LL primitives | ||
3928 | if (!(update.Entity is SceneObjectPart)) | ||
3929 | { | ||
3930 | canUseCompressed = false; | ||
3931 | } | ||
3932 | |||
3933 | if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate)) | ||
3934 | { | ||
3935 | canUseCompressed = false; | ||
3936 | canUseImproved = false; | ||
3937 | } | ||
3938 | else | ||
3939 | { | ||
3940 | if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) || | ||
3941 | updateFlags.HasFlag(PrimUpdateFlags.Acceleration) || | ||
3942 | updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) || | ||
3943 | updateFlags.HasFlag(PrimUpdateFlags.Joint)) | ||
3833 | { | 3944 | { |
3834 | canUseCompressed = false; | 3945 | canUseCompressed = false; |
3835 | canUseImproved = false; | ||
3836 | } | 3946 | } |
3837 | else | 3947 | |
3948 | if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) || | ||
3949 | updateFlags.HasFlag(PrimUpdateFlags.ParentID) || | ||
3950 | updateFlags.HasFlag(PrimUpdateFlags.Scale) || | ||
3951 | updateFlags.HasFlag(PrimUpdateFlags.PrimData) || | ||
3952 | updateFlags.HasFlag(PrimUpdateFlags.Text) || | ||
3953 | updateFlags.HasFlag(PrimUpdateFlags.NameValue) || | ||
3954 | updateFlags.HasFlag(PrimUpdateFlags.ExtraData) || | ||
3955 | updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) || | ||
3956 | updateFlags.HasFlag(PrimUpdateFlags.Sound) || | ||
3957 | updateFlags.HasFlag(PrimUpdateFlags.Particles) || | ||
3958 | updateFlags.HasFlag(PrimUpdateFlags.Material) || | ||
3959 | updateFlags.HasFlag(PrimUpdateFlags.ClickAction) || | ||
3960 | updateFlags.HasFlag(PrimUpdateFlags.MediaURL) || | ||
3961 | updateFlags.HasFlag(PrimUpdateFlags.Joint)) | ||
3838 | { | 3962 | { |
3839 | if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) || | 3963 | canUseImproved = false; |
3840 | updateFlags.HasFlag(PrimUpdateFlags.Acceleration) || | ||
3841 | updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) || | ||
3842 | updateFlags.HasFlag(PrimUpdateFlags.Joint)) | ||
3843 | { | ||
3844 | canUseCompressed = false; | ||
3845 | } | ||
3846 | |||
3847 | if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) || | ||
3848 | updateFlags.HasFlag(PrimUpdateFlags.ParentID) || | ||
3849 | updateFlags.HasFlag(PrimUpdateFlags.Scale) || | ||
3850 | updateFlags.HasFlag(PrimUpdateFlags.PrimData) || | ||
3851 | updateFlags.HasFlag(PrimUpdateFlags.Text) || | ||
3852 | updateFlags.HasFlag(PrimUpdateFlags.NameValue) || | ||
3853 | updateFlags.HasFlag(PrimUpdateFlags.ExtraData) || | ||
3854 | updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) || | ||
3855 | updateFlags.HasFlag(PrimUpdateFlags.Sound) || | ||
3856 | updateFlags.HasFlag(PrimUpdateFlags.Particles) || | ||
3857 | updateFlags.HasFlag(PrimUpdateFlags.Material) || | ||
3858 | updateFlags.HasFlag(PrimUpdateFlags.ClickAction) || | ||
3859 | updateFlags.HasFlag(PrimUpdateFlags.MediaURL) || | ||
3860 | updateFlags.HasFlag(PrimUpdateFlags.Joint)) | ||
3861 | { | ||
3862 | canUseImproved = false; | ||
3863 | } | ||
3864 | } | 3964 | } |
3965 | } | ||
3865 | 3966 | ||
3866 | #endregion UpdateFlags to packet type conversion | 3967 | #endregion UpdateFlags to packet type conversion |
3867 | |||
3868 | #region Block Construction | ||
3869 | |||
3870 | // TODO: Remove this once we can build compressed updates | ||
3871 | canUseCompressed = false; | ||
3872 | |||
3873 | if (!canUseImproved && !canUseCompressed) | ||
3874 | { | ||
3875 | ObjectUpdatePacket.ObjectDataBlock updateBlock; | ||
3876 | 3968 | ||
3877 | if (update.Entity is ScenePresence) | 3969 | #region Block Construction |
3878 | { | ||
3879 | updateBlock = CreateAvatarUpdateBlock((ScenePresence)update.Entity); | ||
3880 | } | ||
3881 | else | ||
3882 | { | ||
3883 | SceneObjectPart part = (SceneObjectPart)update.Entity; | ||
3884 | updateBlock = CreatePrimUpdateBlock(part, AgentId); | ||
3885 | |||
3886 | // If the part has become a private hud since the update was scheduled then we do not | ||
3887 | // want to send it to other avatars. | ||
3888 | if (part.ParentGroup.IsAttachment | ||
3889 | && part.ParentGroup.HasPrivateAttachmentPoint | ||
3890 | && part.ParentGroup.AttachedAvatar != AgentId) | ||
3891 | continue; | ||
3892 | |||
3893 | // If the part has since been deleted, then drop the update. In the case of attachments, | ||
3894 | // this is to avoid spurious updates to other viewers since post-processing of attachments | ||
3895 | // has to change the IsAttachment flag for various reasons (which will end up in a pass | ||
3896 | // of the test above). | ||
3897 | // | ||
3898 | // Actual deletions (kills) happen in another method. | ||
3899 | if (part.ParentGroup.IsDeleted) | ||
3900 | continue; | ||
3901 | } | ||
3902 | 3970 | ||
3903 | objectUpdateBlocks.Value.Add(updateBlock); | 3971 | // TODO: Remove this once we can build compressed updates |
3904 | objectUpdates.Value.Add(update); | 3972 | canUseCompressed = false; |
3905 | } | ||
3906 | else if (!canUseImproved) | ||
3907 | { | ||
3908 | SceneObjectPart part = (SceneObjectPart)update.Entity; | ||
3909 | ObjectUpdateCompressedPacket.ObjectDataBlock compressedBlock | ||
3910 | = CreateCompressedUpdateBlock(part, updateFlags); | ||
3911 | |||
3912 | // If the part has since been deleted, then drop the update. In the case of attachments, | ||
3913 | // this is to avoid spurious updates to other viewers since post-processing of attachments | ||
3914 | // has to change the IsAttachment flag for various reasons (which will end up in a pass | ||
3915 | // of the test above). | ||
3916 | // | ||
3917 | // Actual deletions (kills) happen in another method. | ||
3918 | if (part.ParentGroup.IsDeleted) | ||
3919 | continue; | ||
3920 | 3973 | ||
3921 | compressedUpdateBlocks.Value.Add(compressedBlock); | 3974 | if (!canUseImproved && !canUseCompressed) |
3922 | compressedUpdates.Value.Add(update); | 3975 | { |
3976 | if (update.Entity is ScenePresence) | ||
3977 | { | ||
3978 | objectUpdateBlocks.Value.Add(CreateAvatarUpdateBlock((ScenePresence)update.Entity)); | ||
3923 | } | 3979 | } |
3924 | else | 3980 | else |
3925 | { | 3981 | { |
3926 | if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId) | 3982 | objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId)); |
3927 | { | ||
3928 | // Self updates go into a special list | ||
3929 | terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures))); | ||
3930 | terseAgentUpdates.Value.Add(update); | ||
3931 | } | ||
3932 | else | ||
3933 | { | ||
3934 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseUpdateBlock | ||
3935 | = CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)); | ||
3936 | |||
3937 | // Everything else goes here | ||
3938 | if (update.Entity is SceneObjectPart) | ||
3939 | { | ||
3940 | SceneObjectPart part = (SceneObjectPart)update.Entity; | ||
3941 | |||
3942 | // If the part has become a private hud since the update was scheduled then we do not | ||
3943 | // want to send it to other avatars. | ||
3944 | if (part.ParentGroup.IsAttachment | ||
3945 | && part.ParentGroup.HasPrivateAttachmentPoint | ||
3946 | && part.ParentGroup.AttachedAvatar != AgentId) | ||
3947 | continue; | ||
3948 | |||
3949 | // If the part has since been deleted, then drop the update. In the case of attachments, | ||
3950 | // this is to avoid spurious updates to other viewers since post-processing of attachments | ||
3951 | // has to change the IsAttachment flag for various reasons (which will end up in a pass | ||
3952 | // of the test above). | ||
3953 | // | ||
3954 | // Actual deletions (kills) happen in another method. | ||
3955 | if (part.ParentGroup.IsDeleted) | ||
3956 | continue; | ||
3957 | } | ||
3958 | |||
3959 | terseUpdateBlocks.Value.Add(terseUpdateBlock); | ||
3960 | terseUpdates.Value.Add(update); | ||
3961 | } | ||
3962 | } | 3983 | } |
3963 | |||
3964 | ++updatesThisCall; | ||
3965 | |||
3966 | #endregion Block Construction | ||
3967 | } | 3984 | } |
3968 | 3985 | else if (!canUseImproved) | |
3969 | #region Packet Sending | 3986 | { |
3970 | ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f); | 3987 | compressedUpdateBlocks.Value.Add(CreateCompressedUpdateBlock((SceneObjectPart)update.Entity, updateFlags)); |
3971 | 3988 | } | |
3972 | if (terseAgentUpdateBlocks.IsValueCreated) | 3989 | else |
3973 | { | 3990 | { |
3974 | List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value; | 3991 | if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId) |
3992 | // Self updates go into a special list | ||
3993 | terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures))); | ||
3994 | else | ||
3995 | // Everything else goes here | ||
3996 | terseUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures))); | ||
3997 | } | ||
3975 | 3998 | ||
3976 | ImprovedTerseObjectUpdatePacket packet | 3999 | #endregion Block Construction |
3977 | = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate); | 4000 | } |
3978 | 4001 | ||
3979 | packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; | 4002 | #region Packet Sending |
3980 | packet.RegionData.TimeDilation = timeDilation; | 4003 | |
3981 | packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count]; | 4004 | const float TIME_DILATION = 1.0f; |
4005 | ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f); | ||
4006 | |||
4007 | if (terseAgentUpdateBlocks.IsValueCreated) | ||
4008 | { | ||
4009 | List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value; | ||
3982 | 4010 | ||
3983 | for (int i = 0; i < blocks.Count; i++) | 4011 | ImprovedTerseObjectUpdatePacket packet |
3984 | packet.ObjectData[i] = blocks[i]; | 4012 | = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate); |
3985 | // If any of the packets created from this call go unacknowledged, all of the updates will be resent | 4013 | packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; |
3986 | OutPacket(packet, ThrottleOutPacketType.Unknown, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseAgentUpdates.Value, oPacket); }); | 4014 | packet.RegionData.TimeDilation = timeDilation; |
3987 | } | 4015 | packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count]; |
3988 | 4016 | ||
3989 | if (objectUpdateBlocks.IsValueCreated) | 4017 | for (int i = 0; i < blocks.Count; i++) |
3990 | { | 4018 | packet.ObjectData[i] = blocks[i]; |
3991 | List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value; | ||
3992 | |||
3993 | ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate); | ||
3994 | packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; | ||
3995 | packet.RegionData.TimeDilation = timeDilation; | ||
3996 | packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count]; | ||
3997 | |||
3998 | for (int i = 0; i < blocks.Count; i++) | ||
3999 | packet.ObjectData[i] = blocks[i]; | ||
4000 | // If any of the packets created from this call go unacknowledged, all of the updates will be resent | ||
4001 | OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(objectUpdates.Value, oPacket); }); | ||
4002 | } | ||
4003 | |||
4004 | if (compressedUpdateBlocks.IsValueCreated) | ||
4005 | { | ||
4006 | List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value; | ||
4007 | |||
4008 | ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed); | ||
4009 | packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; | ||
4010 | packet.RegionData.TimeDilation = timeDilation; | ||
4011 | packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count]; | ||
4012 | |||
4013 | for (int i = 0; i < blocks.Count; i++) | ||
4014 | packet.ObjectData[i] = blocks[i]; | ||
4015 | // If any of the packets created from this call go unacknowledged, all of the updates will be resent | ||
4016 | OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(compressedUpdates.Value, oPacket); }); | ||
4017 | } | ||
4018 | 4019 | ||
4019 | if (terseUpdateBlocks.IsValueCreated) | 4020 | OutPacket(packet, ThrottleOutPacketType.Unknown, true); |
4020 | { | 4021 | } |
4021 | List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value; | ||
4022 | |||
4023 | ImprovedTerseObjectUpdatePacket packet | ||
4024 | = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket( | ||
4025 | PacketType.ImprovedTerseObjectUpdate); | ||
4026 | 4022 | ||
4027 | packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; | 4023 | if (objectUpdateBlocks.IsValueCreated) |
4028 | packet.RegionData.TimeDilation = timeDilation; | 4024 | { |
4029 | packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count]; | 4025 | List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value; |
4030 | 4026 | ||
4031 | for (int i = 0; i < blocks.Count; i++) | 4027 | ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate); |
4032 | packet.ObjectData[i] = blocks[i]; | 4028 | packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; |
4033 | // If any of the packets created from this call go unacknowledged, all of the updates will be resent | 4029 | packet.RegionData.TimeDilation = timeDilation; |
4034 | OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); }); | 4030 | packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count]; |
4035 | } | 4031 | |
4032 | for (int i = 0; i < blocks.Count; i++) | ||
4033 | packet.ObjectData[i] = blocks[i]; | ||
4034 | |||
4035 | OutPacket(packet, ThrottleOutPacketType.Task, true); | ||
4036 | } | ||
4037 | |||
4038 | if (compressedUpdateBlocks.IsValueCreated) | ||
4039 | { | ||
4040 | List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value; | ||
4041 | |||
4042 | ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed); | ||
4043 | packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; | ||
4044 | packet.RegionData.TimeDilation = timeDilation; | ||
4045 | packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count]; | ||
4046 | |||
4047 | for (int i = 0; i < blocks.Count; i++) | ||
4048 | packet.ObjectData[i] = blocks[i]; | ||
4049 | |||
4050 | OutPacket(packet, ThrottleOutPacketType.Task, true); | ||
4051 | } | ||
4052 | |||
4053 | if (terseUpdateBlocks.IsValueCreated) | ||
4054 | { | ||
4055 | List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value; | ||
4056 | |||
4057 | ImprovedTerseObjectUpdatePacket packet | ||
4058 | = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket( | ||
4059 | PacketType.ImprovedTerseObjectUpdate); | ||
4060 | packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; | ||
4061 | packet.RegionData.TimeDilation = timeDilation; | ||
4062 | packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count]; | ||
4063 | |||
4064 | for (int i = 0; i < blocks.Count; i++) | ||
4065 | packet.ObjectData[i] = blocks[i]; | ||
4066 | |||
4067 | OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); }); | ||
4036 | } | 4068 | } |
4037 | 4069 | ||
4038 | #endregion Packet Sending | 4070 | #endregion Packet Sending |
@@ -4325,11 +4357,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4325 | 4357 | ||
4326 | // Pass in the delegate so that if this packet needs to be resent, we send the current properties | 4358 | // Pass in the delegate so that if this packet needs to be resent, we send the current properties |
4327 | // of the object rather than the properties when the packet was created | 4359 | // of the object rather than the properties when the packet was created |
4328 | OutPacket(packet, ThrottleOutPacketType.Task, true, | 4360 | // HACK : Remove intelligent resending until it's fixed in core |
4329 | delegate(OutgoingPacket oPacket) | 4361 | //OutPacket(packet, ThrottleOutPacketType.Task, true, |
4330 | { | 4362 | // delegate(OutgoingPacket oPacket) |
4331 | ResendPropertyUpdates(updates, oPacket); | 4363 | // { |
4332 | }); | 4364 | // ResendPropertyUpdates(updates, oPacket); |
4365 | // }); | ||
4366 | OutPacket(packet, ThrottleOutPacketType.Task, true); | ||
4333 | 4367 | ||
4334 | // pbcnt += blocks.Count; | 4368 | // pbcnt += blocks.Count; |
4335 | // ppcnt++; | 4369 | // ppcnt++; |
@@ -4355,11 +4389,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4355 | // of the object rather than the properties when the packet was created | 4389 | // of the object rather than the properties when the packet was created |
4356 | List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>(); | 4390 | List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>(); |
4357 | updates.Add(familyUpdates.Value[i]); | 4391 | updates.Add(familyUpdates.Value[i]); |
4358 | OutPacket(packet, ThrottleOutPacketType.Task, true, | 4392 | // HACK : Remove intelligent resending until it's fixed in core |
4359 | delegate(OutgoingPacket oPacket) | 4393 | //OutPacket(packet, ThrottleOutPacketType.Task, true, |
4360 | { | 4394 | // delegate(OutgoingPacket oPacket) |
4361 | ResendPropertyUpdates(updates, oPacket); | 4395 | // { |
4362 | }); | 4396 | // ResendPropertyUpdates(updates, oPacket); |
4397 | // }); | ||
4398 | OutPacket(packet, ThrottleOutPacketType.Task, true); | ||
4363 | 4399 | ||
4364 | // fpcnt++; | 4400 | // fpcnt++; |
4365 | // fbcnt++; | 4401 | // fbcnt++; |
@@ -4731,7 +4767,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4731 | 4767 | ||
4732 | if (landData.SimwideArea > 0) | 4768 | if (landData.SimwideArea > 0) |
4733 | { | 4769 | { |
4734 | int simulatorCapacity = (int)(((float)landData.SimwideArea / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus); | 4770 | int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus / 65536L); |
4771 | // Never report more than sim total capacity | ||
4772 | if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity) | ||
4773 | simulatorCapacity = m_scene.RegionInfo.ObjectCapacity; | ||
4735 | updateMessage.SimWideMaxPrims = simulatorCapacity; | 4774 | updateMessage.SimWideMaxPrims = simulatorCapacity; |
4736 | } | 4775 | } |
4737 | else | 4776 | else |
@@ -4860,14 +4899,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4860 | 4899 | ||
4861 | if (notifyCount > 0) | 4900 | if (notifyCount > 0) |
4862 | { | 4901 | { |
4863 | if (notifyCount > 32) | 4902 | // if (notifyCount > 32) |
4864 | { | 4903 | // { |
4865 | m_log.InfoFormat( | 4904 | // m_log.InfoFormat( |
4866 | "[LAND]: More than {0} avatars own prims on this parcel. Only sending back details of first {0}" | 4905 | // "[LAND]: More than {0} avatars own prims on this parcel. Only sending back details of first {0}" |
4867 | + " - a developer might want to investigate whether this is a hard limit", 32); | 4906 | // + " - a developer might want to investigate whether this is a hard limit", 32); |
4868 | 4907 | // | |
4869 | notifyCount = 32; | 4908 | // notifyCount = 32; |
4870 | } | 4909 | // } |
4871 | 4910 | ||
4872 | ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock | 4911 | ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock |
4873 | = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount]; | 4912 | = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount]; |
@@ -4922,9 +4961,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4922 | { | 4961 | { |
4923 | ScenePresence presence = (ScenePresence)entity; | 4962 | ScenePresence presence = (ScenePresence)entity; |
4924 | 4963 | ||
4964 | position = presence.OffsetPosition; | ||
4965 | rotation = presence.Rotation; | ||
4966 | |||
4967 | if (presence.ParentID != 0) | ||
4968 | { | ||
4969 | SceneObjectPart part = m_scene.GetSceneObjectPart(presence.ParentID); | ||
4970 | if (part != null && part != part.ParentGroup.RootPart) | ||
4971 | { | ||
4972 | position = part.OffsetPosition + presence.OffsetPosition * part.RotationOffset; | ||
4973 | rotation = part.RotationOffset * presence.Rotation; | ||
4974 | } | ||
4975 | angularVelocity = Vector3.Zero; | ||
4976 | } | ||
4977 | else | ||
4978 | { | ||
4979 | angularVelocity = presence.AngularVelocity; | ||
4980 | rotation = presence.Rotation; | ||
4981 | } | ||
4982 | |||
4925 | attachPoint = 0; | 4983 | attachPoint = 0; |
4926 | collisionPlane = presence.CollisionPlane; | 4984 | collisionPlane = presence.CollisionPlane; |
4927 | position = presence.OffsetPosition; | ||
4928 | velocity = presence.Velocity; | 4985 | velocity = presence.Velocity; |
4929 | acceleration = Vector3.Zero; | 4986 | acceleration = Vector3.Zero; |
4930 | 4987 | ||
@@ -4933,9 +4990,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4933 | // may improve movement smoothness. | 4990 | // may improve movement smoothness. |
4934 | // acceleration = new Vector3(1, 0, 0); | 4991 | // acceleration = new Vector3(1, 0, 0); |
4935 | 4992 | ||
4936 | angularVelocity = presence.AngularVelocity; | ||
4937 | rotation = presence.Rotation; | ||
4938 | |||
4939 | if (sendTexture) | 4993 | if (sendTexture) |
4940 | textureEntry = presence.Appearance.Texture.GetBytes(); | 4994 | textureEntry = presence.Appearance.Texture.GetBytes(); |
4941 | else | 4995 | else |
@@ -5041,13 +5095,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5041 | 5095 | ||
5042 | protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data) | 5096 | protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data) |
5043 | { | 5097 | { |
5098 | Vector3 offsetPosition = data.OffsetPosition; | ||
5099 | Quaternion rotation = data.Rotation; | ||
5100 | uint parentID = data.ParentID; | ||
5101 | |||
5102 | if (parentID != 0) | ||
5103 | { | ||
5104 | SceneObjectPart part = m_scene.GetSceneObjectPart(parentID); | ||
5105 | if (part != null && part != part.ParentGroup.RootPart) | ||
5106 | { | ||
5107 | offsetPosition = part.OffsetPosition + data.OffsetPosition * part.RotationOffset; | ||
5108 | rotation = part.RotationOffset * data.Rotation; | ||
5109 | parentID = part.ParentGroup.RootPart.LocalId; | ||
5110 | } | ||
5111 | } | ||
5112 | |||
5044 | byte[] objectData = new byte[76]; | 5113 | byte[] objectData = new byte[76]; |
5045 | 5114 | ||
5046 | data.CollisionPlane.ToBytes(objectData, 0); | 5115 | data.CollisionPlane.ToBytes(objectData, 0); |
5047 | data.OffsetPosition.ToBytes(objectData, 16); | 5116 | offsetPosition.ToBytes(objectData, 16); |
5048 | // data.Velocity.ToBytes(objectData, 28); | 5117 | // data.Velocity.ToBytes(objectData, 28); |
5049 | // data.Acceleration.ToBytes(objectData, 40); | 5118 | // data.Acceleration.ToBytes(objectData, 40); |
5050 | data.Rotation.ToBytes(objectData, 52); | 5119 | rotation.ToBytes(objectData, 52); |
5051 | //data.AngularVelocity.ToBytes(objectData, 64); | 5120 | //data.AngularVelocity.ToBytes(objectData, 64); |
5052 | 5121 | ||
5053 | ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock(); | 5122 | ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock(); |
@@ -5061,14 +5130,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5061 | update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + | 5130 | update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + |
5062 | data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); | 5131 | data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); |
5063 | update.ObjectData = objectData; | 5132 | update.ObjectData = objectData; |
5064 | update.ParentID = data.ParentID; | 5133 | update.ParentID = parentID; |
5065 | update.PathCurve = 16; | 5134 | update.PathCurve = 16; |
5066 | update.PathScaleX = 100; | 5135 | update.PathScaleX = 100; |
5067 | update.PathScaleY = 100; | 5136 | update.PathScaleY = 100; |
5068 | update.PCode = (byte)PCode.Avatar; | 5137 | update.PCode = (byte)PCode.Avatar; |
5069 | update.ProfileCurve = 1; | 5138 | update.ProfileCurve = 1; |
5070 | update.PSBlock = Utils.EmptyBytes; | 5139 | update.PSBlock = Utils.EmptyBytes; |
5071 | update.Scale = new Vector3(0.45f, 0.6f, 1.9f); | 5140 | update.Scale = data.Appearance.AvatarSize; |
5141 | // update.Scale.Z -= 0.2f; | ||
5142 | |||
5072 | update.Text = Utils.EmptyBytes; | 5143 | update.Text = Utils.EmptyBytes; |
5073 | update.TextColor = new byte[4]; | 5144 | update.TextColor = new byte[4]; |
5074 | 5145 | ||
@@ -5079,10 +5150,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5079 | update.TextureEntry = Utils.EmptyBytes; | 5150 | update.TextureEntry = Utils.EmptyBytes; |
5080 | // update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes; | 5151 | // update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes; |
5081 | 5152 | ||
5153 | /* all this flags seem related to prims and not avatars. This allow for wrong viewer side move of a avatar in prim edition mode (anv mantis 854) | ||
5082 | update.UpdateFlags = (uint)( | 5154 | update.UpdateFlags = (uint)( |
5083 | PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner | | 5155 | PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner | |
5084 | PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer | | 5156 | PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer | |
5085 | PrimFlags.ObjectOwnerModify); | 5157 | PrimFlags.ObjectOwnerModify); |
5158 | */ | ||
5159 | update.UpdateFlags = 0; | ||
5086 | 5160 | ||
5087 | return update; | 5161 | return update; |
5088 | } | 5162 | } |
@@ -5253,8 +5327,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5253 | // If AgentUpdate is ever handled asynchronously, then we will also need to construct a new AgentUpdateArgs | 5327 | // If AgentUpdate is ever handled asynchronously, then we will also need to construct a new AgentUpdateArgs |
5254 | // for each AgentUpdate packet. | 5328 | // for each AgentUpdate packet. |
5255 | AddLocalPacketHandler(PacketType.AgentUpdate, HandleAgentUpdate, false); | 5329 | AddLocalPacketHandler(PacketType.AgentUpdate, HandleAgentUpdate, false); |
5256 | 5330 | ||
5257 | AddLocalPacketHandler(PacketType.ViewerEffect, HandleViewerEffect, false); | 5331 | AddLocalPacketHandler(PacketType.ViewerEffect, HandleViewerEffect, false); |
5332 | AddLocalPacketHandler(PacketType.VelocityInterpolateOff, HandleVelocityInterpolateOff, false); | ||
5333 | AddLocalPacketHandler(PacketType.VelocityInterpolateOn, HandleVelocityInterpolateOn, false); | ||
5258 | AddLocalPacketHandler(PacketType.AgentCachedTexture, HandleAgentTextureCached, false); | 5334 | AddLocalPacketHandler(PacketType.AgentCachedTexture, HandleAgentTextureCached, false); |
5259 | AddLocalPacketHandler(PacketType.MultipleObjectUpdate, HandleMultipleObjUpdate, false); | 5335 | AddLocalPacketHandler(PacketType.MultipleObjectUpdate, HandleMultipleObjUpdate, false); |
5260 | AddLocalPacketHandler(PacketType.MoneyTransferRequest, HandleMoneyTransferRequest, false); | 5336 | AddLocalPacketHandler(PacketType.MoneyTransferRequest, HandleMoneyTransferRequest, false); |
@@ -5406,6 +5482,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5406 | AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false); | 5482 | AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false); |
5407 | AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false); | 5483 | AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false); |
5408 | AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode); | 5484 | AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode); |
5485 | AddLocalPacketHandler(PacketType.CreateNewOutfitAttachments, HandleCreateNewOutfitAttachments); | ||
5409 | AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false); | 5486 | AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false); |
5410 | AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents); | 5487 | AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents); |
5411 | AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery); | 5488 | AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery); |
@@ -5472,6 +5549,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5472 | AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest); | 5549 | AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest); |
5473 | AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes); | 5550 | AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes); |
5474 | AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard); | 5551 | AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard); |
5552 | AddLocalPacketHandler(PacketType.ChangeInventoryItemFlags, HandleChangeInventoryItemFlags); | ||
5475 | 5553 | ||
5476 | AddGenericPacketHandler("autopilot", HandleAutopilot); | 5554 | AddGenericPacketHandler("autopilot", HandleAutopilot); |
5477 | } | 5555 | } |
@@ -5510,6 +5588,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5510 | (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) || | 5588 | (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) || |
5511 | (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) || | 5589 | (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) || |
5512 | (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) || | 5590 | (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) || |
5591 | (x.ControlFlags != 0) || | ||
5513 | (x.Far != m_lastAgentUpdateArgs.Far) || | 5592 | (x.Far != m_lastAgentUpdateArgs.Far) || |
5514 | (x.Flags != m_lastAgentUpdateArgs.Flags) || | 5593 | (x.Flags != m_lastAgentUpdateArgs.Flags) || |
5515 | (x.State != m_lastAgentUpdateArgs.State) || | 5594 | (x.State != m_lastAgentUpdateArgs.State) || |
@@ -5769,6 +5848,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5769 | return true; | 5848 | return true; |
5770 | } | 5849 | } |
5771 | 5850 | ||
5851 | private bool HandleVelocityInterpolateOff(IClientAPI sender, Packet Pack) | ||
5852 | { | ||
5853 | VelocityInterpolateOffPacket p = (VelocityInterpolateOffPacket)Pack; | ||
5854 | if (p.AgentData.SessionID != SessionId || | ||
5855 | p.AgentData.AgentID != AgentId) | ||
5856 | return true; | ||
5857 | |||
5858 | m_VelocityInterpolate = false; | ||
5859 | return true; | ||
5860 | } | ||
5861 | |||
5862 | private bool HandleVelocityInterpolateOn(IClientAPI sender, Packet Pack) | ||
5863 | { | ||
5864 | VelocityInterpolateOnPacket p = (VelocityInterpolateOnPacket)Pack; | ||
5865 | if (p.AgentData.SessionID != SessionId || | ||
5866 | p.AgentData.AgentID != AgentId) | ||
5867 | return true; | ||
5868 | |||
5869 | m_VelocityInterpolate = true; | ||
5870 | return true; | ||
5871 | } | ||
5872 | |||
5873 | |||
5772 | private bool HandleAvatarPropertiesRequest(IClientAPI sender, Packet Pack) | 5874 | private bool HandleAvatarPropertiesRequest(IClientAPI sender, Packet Pack) |
5773 | { | 5875 | { |
5774 | AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack; | 5876 | AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack; |
@@ -6189,17 +6291,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6189 | // Temporarily protect ourselves from the mantis #951 failure. | 6291 | // Temporarily protect ourselves from the mantis #951 failure. |
6190 | // However, we could do this for several other handlers where a failure isn't terminal | 6292 | // However, we could do this for several other handlers where a failure isn't terminal |
6191 | // for the client session anyway, in order to protect ourselves against bad code in plugins | 6293 | // for the client session anyway, in order to protect ourselves against bad code in plugins |
6294 | Vector3 avSize = appear.AgentData.Size; | ||
6192 | try | 6295 | try |
6193 | { | 6296 | { |
6194 | byte[] visualparams = new byte[appear.VisualParam.Length]; | 6297 | byte[] visualparams = new byte[appear.VisualParam.Length]; |
6195 | for (int i = 0; i < appear.VisualParam.Length; i++) | 6298 | for (int i = 0; i < appear.VisualParam.Length; i++) |
6196 | visualparams[i] = appear.VisualParam[i].ParamValue; | 6299 | visualparams[i] = appear.VisualParam[i].ParamValue; |
6197 | 6300 | //var b = appear.WearableData[0]; | |
6301 | |||
6198 | Primitive.TextureEntry te = null; | 6302 | Primitive.TextureEntry te = null; |
6199 | if (appear.ObjectData.TextureEntry.Length > 1) | 6303 | if (appear.ObjectData.TextureEntry.Length > 1) |
6200 | te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length); | 6304 | te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length); |
6305 | |||
6306 | WearableCacheItem[] cacheitems = new WearableCacheItem[appear.WearableData.Length]; | ||
6307 | for (int i=0; i<appear.WearableData.Length;i++) | ||
6308 | cacheitems[i] = new WearableCacheItem(){CacheId = appear.WearableData[i].CacheID,TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)}; | ||
6201 | 6309 | ||
6202 | handlerSetAppearance(sender, te, visualparams); | 6310 | |
6311 | |||
6312 | handlerSetAppearance(sender, te, visualparams,avSize, cacheitems); | ||
6203 | } | 6313 | } |
6204 | catch (Exception e) | 6314 | catch (Exception e) |
6205 | { | 6315 | { |
@@ -6408,6 +6518,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6408 | { | 6518 | { |
6409 | handlerCompleteMovementToRegion(sender, true); | 6519 | handlerCompleteMovementToRegion(sender, true); |
6410 | } | 6520 | } |
6521 | else | ||
6522 | m_log.Debug("HandleCompleteAgentMovement NULL handler"); | ||
6523 | |||
6411 | handlerCompleteMovementToRegion = null; | 6524 | handlerCompleteMovementToRegion = null; |
6412 | 6525 | ||
6413 | return true; | 6526 | return true; |
@@ -6425,7 +6538,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6425 | return true; | 6538 | return true; |
6426 | } | 6539 | } |
6427 | #endregion | 6540 | #endregion |
6428 | 6541 | /* | |
6429 | StartAnim handlerStartAnim = null; | 6542 | StartAnim handlerStartAnim = null; |
6430 | StopAnim handlerStopAnim = null; | 6543 | StopAnim handlerStopAnim = null; |
6431 | 6544 | ||
@@ -6449,6 +6562,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6449 | } | 6562 | } |
6450 | } | 6563 | } |
6451 | return true; | 6564 | return true; |
6565 | */ | ||
6566 | ChangeAnim handlerChangeAnim = null; | ||
6567 | |||
6568 | for (int i = 0; i < AgentAni.AnimationList.Length; i++) | ||
6569 | { | ||
6570 | handlerChangeAnim = OnChangeAnim; | ||
6571 | if (handlerChangeAnim != null) | ||
6572 | { | ||
6573 | handlerChangeAnim(AgentAni.AnimationList[i].AnimID, AgentAni.AnimationList[i].StartAnim, false); | ||
6574 | } | ||
6575 | } | ||
6576 | |||
6577 | handlerChangeAnim = OnChangeAnim; | ||
6578 | if (handlerChangeAnim != null) | ||
6579 | { | ||
6580 | handlerChangeAnim(UUID.Zero, false, true); | ||
6581 | } | ||
6582 | |||
6583 | return true; | ||
6452 | } | 6584 | } |
6453 | 6585 | ||
6454 | private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack) | 6586 | private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack) |
@@ -6674,6 +6806,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6674 | #endregion | 6806 | #endregion |
6675 | 6807 | ||
6676 | m_udpClient.SetThrottles(atpack.Throttle.Throttles); | 6808 | m_udpClient.SetThrottles(atpack.Throttle.Throttles); |
6809 | GenericCall2 handler = OnUpdateThrottles; | ||
6810 | if (handler != null) | ||
6811 | { | ||
6812 | handler(); | ||
6813 | } | ||
6677 | return true; | 6814 | return true; |
6678 | } | 6815 | } |
6679 | 6816 | ||
@@ -7098,7 +7235,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7098 | physdata.Bounce = phsblock.Restitution; | 7235 | physdata.Bounce = phsblock.Restitution; |
7099 | physdata.Density = phsblock.Density; | 7236 | physdata.Density = phsblock.Density; |
7100 | physdata.Friction = phsblock.Friction; | 7237 | physdata.Friction = phsblock.Friction; |
7101 | physdata.GravitationModifier = phsblock.GravityMultiplier; | 7238 | physdata.GravitationModifier = phsblock.GravityMultiplier; |
7102 | } | 7239 | } |
7103 | 7240 | ||
7104 | handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, physdata, this); | 7241 | handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, physdata, this); |
@@ -7684,6 +7821,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7684 | // surrounding scene | 7821 | // surrounding scene |
7685 | if ((ImageType)block.Type == ImageType.Baked) | 7822 | if ((ImageType)block.Type == ImageType.Baked) |
7686 | args.Priority *= 2.0f; | 7823 | args.Priority *= 2.0f; |
7824 | int wearableout = 0; | ||
7687 | 7825 | ||
7688 | ImageManager.EnqueueReq(args); | 7826 | ImageManager.EnqueueReq(args); |
7689 | } | 7827 | } |
@@ -8702,16 +8840,61 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8702 | 8840 | ||
8703 | #region Parcel related packets | 8841 | #region Parcel related packets |
8704 | 8842 | ||
8843 | // acumulate several HandleRegionHandleRequest consecutive overlaping requests | ||
8844 | // to be done with minimal resources as possible | ||
8845 | // variables temporary here while in test | ||
8846 | |||
8847 | Queue<UUID> RegionHandleRequests = new Queue<UUID>(); | ||
8848 | bool RegionHandleRequestsInService = false; | ||
8849 | |||
8705 | private bool HandleRegionHandleRequest(IClientAPI sender, Packet Pack) | 8850 | private bool HandleRegionHandleRequest(IClientAPI sender, Packet Pack) |
8706 | { | 8851 | { |
8707 | RegionHandleRequestPacket rhrPack = (RegionHandleRequestPacket)Pack; | 8852 | UUID currentUUID; |
8708 | 8853 | ||
8709 | RegionHandleRequest handlerRegionHandleRequest = OnRegionHandleRequest; | 8854 | RegionHandleRequest handlerRegionHandleRequest = OnRegionHandleRequest; |
8710 | if (handlerRegionHandleRequest != null) | 8855 | |
8856 | if (handlerRegionHandleRequest == null) | ||
8857 | return true; | ||
8858 | |||
8859 | RegionHandleRequestPacket rhrPack = (RegionHandleRequestPacket)Pack; | ||
8860 | |||
8861 | lock (RegionHandleRequests) | ||
8711 | { | 8862 | { |
8712 | handlerRegionHandleRequest(this, rhrPack.RequestBlock.RegionID); | 8863 | if (RegionHandleRequestsInService) |
8864 | { | ||
8865 | // we are already busy doing a previus request | ||
8866 | // so enqueue it | ||
8867 | RegionHandleRequests.Enqueue(rhrPack.RequestBlock.RegionID); | ||
8868 | return true; | ||
8869 | } | ||
8870 | |||
8871 | // else do it | ||
8872 | currentUUID = rhrPack.RequestBlock.RegionID; | ||
8873 | RegionHandleRequestsInService = true; | ||
8713 | } | 8874 | } |
8714 | return true; | 8875 | |
8876 | while (true) | ||
8877 | { | ||
8878 | handlerRegionHandleRequest(this, currentUUID); | ||
8879 | |||
8880 | lock (RegionHandleRequests) | ||
8881 | { | ||
8882 | // exit condition, nothing to do or closed | ||
8883 | // current code seems to assume we may loose the handler at anytime, | ||
8884 | // so keep checking it | ||
8885 | handlerRegionHandleRequest = OnRegionHandleRequest; | ||
8886 | |||
8887 | if (RegionHandleRequests.Count == 0 || !IsActive || handlerRegionHandleRequest == null) | ||
8888 | { | ||
8889 | RegionHandleRequests.Clear(); | ||
8890 | RegionHandleRequestsInService = false; | ||
8891 | return true; | ||
8892 | } | ||
8893 | currentUUID = RegionHandleRequests.Dequeue(); | ||
8894 | } | ||
8895 | } | ||
8896 | |||
8897 | return true; // actually unreached | ||
8715 | } | 8898 | } |
8716 | 8899 | ||
8717 | private bool HandleParcelInfoRequest(IClientAPI sender, Packet Pack) | 8900 | private bool HandleParcelInfoRequest(IClientAPI sender, Packet Pack) |
@@ -9967,7 +10150,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9967 | handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID, | 10150 | handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID, |
9968 | Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName), | 10151 | Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName), |
9969 | UpdateMuteListEntry.MuteData.MuteType, | 10152 | UpdateMuteListEntry.MuteData.MuteType, |
9970 | UpdateMuteListEntry.AgentData.AgentID); | 10153 | UpdateMuteListEntry.MuteData.MuteFlags); |
9971 | return true; | 10154 | return true; |
9972 | } | 10155 | } |
9973 | return false; | 10156 | return false; |
@@ -9982,8 +10165,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9982 | { | 10165 | { |
9983 | handlerRemoveMuteListEntry(this, | 10166 | handlerRemoveMuteListEntry(this, |
9984 | RemoveMuteListEntry.MuteData.MuteID, | 10167 | RemoveMuteListEntry.MuteData.MuteID, |
9985 | Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName), | 10168 | Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName)); |
9986 | RemoveMuteListEntry.AgentData.AgentID); | ||
9987 | return true; | 10169 | return true; |
9988 | } | 10170 | } |
9989 | return false; | 10171 | return false; |
@@ -10027,10 +10209,55 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10027 | return false; | 10209 | return false; |
10028 | } | 10210 | } |
10029 | 10211 | ||
10212 | private bool HandleChangeInventoryItemFlags(IClientAPI client, Packet packet) | ||
10213 | { | ||
10214 | ChangeInventoryItemFlagsPacket ChangeInventoryItemFlags = | ||
10215 | (ChangeInventoryItemFlagsPacket)packet; | ||
10216 | ChangeInventoryItemFlags handlerChangeInventoryItemFlags = OnChangeInventoryItemFlags; | ||
10217 | if (handlerChangeInventoryItemFlags != null) | ||
10218 | { | ||
10219 | foreach(ChangeInventoryItemFlagsPacket.InventoryDataBlock b in ChangeInventoryItemFlags.InventoryData) | ||
10220 | handlerChangeInventoryItemFlags(this, b.ItemID, b.Flags); | ||
10221 | return true; | ||
10222 | } | ||
10223 | return false; | ||
10224 | } | ||
10225 | |||
10030 | private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack) | 10226 | private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack) |
10031 | { | 10227 | { |
10032 | return true; | 10228 | return true; |
10033 | } | 10229 | } |
10230 | |||
10231 | private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack) | ||
10232 | { | ||
10233 | CreateNewOutfitAttachmentsPacket packet = (CreateNewOutfitAttachmentsPacket)Pack; | ||
10234 | |||
10235 | #region Packet Session and User Check | ||
10236 | if (m_checkPackets) | ||
10237 | { | ||
10238 | if (packet.AgentData.SessionID != SessionId || | ||
10239 | packet.AgentData.AgentID != AgentId) | ||
10240 | return true; | ||
10241 | } | ||
10242 | #endregion | ||
10243 | MoveItemsAndLeaveCopy handlerMoveItemsAndLeaveCopy = null; | ||
10244 | List<InventoryItemBase> items = new List<InventoryItemBase>(); | ||
10245 | foreach (CreateNewOutfitAttachmentsPacket.ObjectDataBlock n in packet.ObjectData) | ||
10246 | { | ||
10247 | InventoryItemBase b = new InventoryItemBase(); | ||
10248 | b.ID = n.OldItemID; | ||
10249 | b.Folder = n.OldFolderID; | ||
10250 | items.Add(b); | ||
10251 | } | ||
10252 | |||
10253 | handlerMoveItemsAndLeaveCopy = OnMoveItemsAndLeaveCopy; | ||
10254 | if (handlerMoveItemsAndLeaveCopy != null) | ||
10255 | { | ||
10256 | handlerMoveItemsAndLeaveCopy(this, items, packet.HeaderData.NewFolderID); | ||
10257 | } | ||
10258 | |||
10259 | return true; | ||
10260 | } | ||
10034 | 10261 | ||
10035 | private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack) | 10262 | private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack) |
10036 | { | 10263 | { |
@@ -10457,6 +10684,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10457 | groupProfileReply.GroupData.MaturePublish = d.MaturePublish; | 10684 | groupProfileReply.GroupData.MaturePublish = d.MaturePublish; |
10458 | groupProfileReply.GroupData.OwnerRole = d.OwnerRole; | 10685 | groupProfileReply.GroupData.OwnerRole = d.OwnerRole; |
10459 | 10686 | ||
10687 | Scene scene = (Scene)m_scene; | ||
10688 | if (scene.Permissions.IsGod(sender.AgentId) && (!sender.IsGroupMember(groupProfileRequest.GroupData.GroupID))) | ||
10689 | { | ||
10690 | ScenePresence p; | ||
10691 | if (scene.TryGetScenePresence(sender.AgentId, out p)) | ||
10692 | { | ||
10693 | if (p.GodLevel >= 200) | ||
10694 | { | ||
10695 | groupProfileReply.GroupData.OpenEnrollment = true; | ||
10696 | groupProfileReply.GroupData.MembershipFee = 0; | ||
10697 | } | ||
10698 | } | ||
10699 | } | ||
10700 | |||
10460 | OutPacket(groupProfileReply, ThrottleOutPacketType.Task); | 10701 | OutPacket(groupProfileReply, ThrottleOutPacketType.Task); |
10461 | } | 10702 | } |
10462 | return true; | 10703 | return true; |
@@ -11030,11 +11271,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11030 | 11271 | ||
11031 | StartLure handlerStartLure = OnStartLure; | 11272 | StartLure handlerStartLure = OnStartLure; |
11032 | if (handlerStartLure != null) | 11273 | if (handlerStartLure != null) |
11033 | handlerStartLure(startLureRequest.Info.LureType, | 11274 | { |
11034 | Utils.BytesToString( | 11275 | for (int i = 0 ; i < startLureRequest.TargetData.Length ; i++) |
11035 | startLureRequest.Info.Message), | 11276 | { |
11036 | startLureRequest.TargetData[0].TargetID, | 11277 | handlerStartLure(startLureRequest.Info.LureType, |
11037 | this); | 11278 | Utils.BytesToString( |
11279 | startLureRequest.Info.Message), | ||
11280 | startLureRequest.TargetData[i].TargetID, | ||
11281 | this); | ||
11282 | } | ||
11283 | } | ||
11038 | return true; | 11284 | return true; |
11039 | } | 11285 | } |
11040 | private bool HandleTeleportLureRequest(IClientAPI sender, Packet Pack) | 11286 | private bool HandleTeleportLureRequest(IClientAPI sender, Packet Pack) |
@@ -11148,10 +11394,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11148 | } | 11394 | } |
11149 | #endregion | 11395 | #endregion |
11150 | 11396 | ||
11151 | ClassifiedDelete handlerClassifiedGodDelete = OnClassifiedGodDelete; | 11397 | ClassifiedGodDelete handlerClassifiedGodDelete = OnClassifiedGodDelete; |
11152 | if (handlerClassifiedGodDelete != null) | 11398 | if (handlerClassifiedGodDelete != null) |
11153 | handlerClassifiedGodDelete( | 11399 | handlerClassifiedGodDelete( |
11154 | classifiedGodDelete.Data.ClassifiedID, | 11400 | classifiedGodDelete.Data.ClassifiedID, |
11401 | classifiedGodDelete.Data.QueryID, | ||
11155 | this); | 11402 | this); |
11156 | return true; | 11403 | return true; |
11157 | } | 11404 | } |
@@ -11464,6 +11711,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11464 | 11711 | ||
11465 | if (cachedtex.AgentData.SessionID != SessionId) | 11712 | if (cachedtex.AgentData.SessionID != SessionId) |
11466 | return false; | 11713 | return false; |
11714 | |||
11467 | 11715 | ||
11468 | // TODO: don't create new blocks if recycling an old packet | 11716 | // TODO: don't create new blocks if recycling an old packet |
11469 | cachedresp.AgentData.AgentID = AgentId; | 11717 | cachedresp.AgentData.AgentID = AgentId; |
@@ -11473,14 +11721,140 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11473 | cachedresp.WearableData = | 11721 | cachedresp.WearableData = |
11474 | new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length]; | 11722 | new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length]; |
11475 | 11723 | ||
11476 | for (int i = 0; i < cachedtex.WearableData.Length; i++) | 11724 | //IAvatarFactoryModule fac = m_scene.RequestModuleInterface<IAvatarFactoryModule>(); |
11725 | // var item = fac.GetBakedTextureFaces(AgentId); | ||
11726 | //WearableCacheItem[] items = fac.GetCachedItems(AgentId); | ||
11727 | |||
11728 | IAssetService cache = m_scene.AssetService; | ||
11729 | IBakedTextureModule bakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>(); | ||
11730 | //bakedTextureModule = null; | ||
11731 | int maxWearablesLoop = cachedtex.WearableData.Length; | ||
11732 | if (maxWearablesLoop > AvatarWearable.MAX_WEARABLES) | ||
11733 | maxWearablesLoop = AvatarWearable.MAX_WEARABLES; | ||
11734 | |||
11735 | if (bakedTextureModule != null && cache != null) | ||
11477 | { | 11736 | { |
11478 | cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock(); | 11737 | // We need to make sure the asset stored in the bake is available on this server also by it's assetid before we map it to a Cacheid |
11479 | cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex; | 11738 | |
11480 | cachedresp.WearableData[i].TextureID = UUID.Zero; | 11739 | WearableCacheItem[] cacheItems = null; |
11481 | cachedresp.WearableData[i].HostName = new byte[0]; | 11740 | ScenePresence p = m_scene.GetScenePresence(AgentId); |
11741 | if (p.Appearance != null) | ||
11742 | if (p.Appearance.WearableCacheItems == null || p.Appearance.WearableCacheItemsDirty) | ||
11743 | { | ||
11744 | try | ||
11745 | { | ||
11746 | cacheItems = bakedTextureModule.Get(AgentId); | ||
11747 | p.Appearance.WearableCacheItems = cacheItems; | ||
11748 | p.Appearance.WearableCacheItemsDirty = false; | ||
11749 | } | ||
11750 | |||
11751 | /* | ||
11752 | * The following Catch types DO NOT WORK, it jumps to the General Packet Exception Handler if you don't catch Exception! | ||
11753 | * | ||
11754 | catch (System.Net.Sockets.SocketException) | ||
11755 | { | ||
11756 | cacheItems = null; | ||
11757 | } | ||
11758 | catch (WebException) | ||
11759 | { | ||
11760 | cacheItems = null; | ||
11761 | } | ||
11762 | catch (InvalidOperationException) | ||
11763 | { | ||
11764 | cacheItems = null; | ||
11765 | } */ | ||
11766 | catch (Exception) | ||
11767 | { | ||
11768 | cacheItems = null; | ||
11769 | } | ||
11770 | |||
11771 | } | ||
11772 | else if (p.Appearance.WearableCacheItems != null) | ||
11773 | { | ||
11774 | cacheItems = p.Appearance.WearableCacheItems; | ||
11775 | } | ||
11776 | |||
11777 | if (cache != null && cacheItems != null) | ||
11778 | { | ||
11779 | foreach (WearableCacheItem item in cacheItems) | ||
11780 | { | ||
11781 | |||
11782 | if (cache.GetCached(item.TextureID.ToString()) == null) | ||
11783 | { | ||
11784 | item.TextureAsset.Temporary = true; | ||
11785 | cache.Store(item.TextureAsset); | ||
11786 | } | ||
11787 | |||
11788 | |||
11789 | } | ||
11790 | } | ||
11791 | |||
11792 | if (cacheItems != null) | ||
11793 | { | ||
11794 | |||
11795 | for (int i = 0; i < maxWearablesLoop; i++) | ||
11796 | { | ||
11797 | WearableCacheItem item = | ||
11798 | WearableCacheItem.SearchTextureIndex(cachedtex.WearableData[i].TextureIndex,cacheItems); | ||
11799 | |||
11800 | cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock(); | ||
11801 | cachedresp.WearableData[i].TextureIndex= cachedtex.WearableData[i].TextureIndex; | ||
11802 | cachedresp.WearableData[i].HostName = new byte[0]; | ||
11803 | if (item != null && cachedtex.WearableData[i].ID == item.CacheId) | ||
11804 | { | ||
11805 | |||
11806 | cachedresp.WearableData[i].TextureID = item.TextureID; | ||
11807 | } | ||
11808 | else | ||
11809 | { | ||
11810 | cachedresp.WearableData[i].TextureID = UUID.Zero; | ||
11811 | } | ||
11812 | } | ||
11813 | } | ||
11814 | else | ||
11815 | { | ||
11816 | for (int i = 0; i < maxWearablesLoop; i++) | ||
11817 | { | ||
11818 | cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock(); | ||
11819 | cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex; | ||
11820 | cachedresp.WearableData[i].TextureID = UUID.Zero; | ||
11821 | //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46"); | ||
11822 | cachedresp.WearableData[i].HostName = new byte[0]; | ||
11823 | } | ||
11824 | } | ||
11482 | } | 11825 | } |
11826 | else | ||
11827 | { | ||
11828 | if (cache == null) | ||
11829 | { | ||
11830 | for (int i = 0; i < maxWearablesLoop; i++) | ||
11831 | { | ||
11832 | cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock(); | ||
11833 | cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex; | ||
11834 | cachedresp.WearableData[i].TextureID = UUID.Zero; | ||
11835 | //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46"); | ||
11836 | cachedresp.WearableData[i].HostName = new byte[0]; | ||
11837 | } | ||
11838 | } | ||
11839 | else | ||
11840 | { | ||
11841 | for (int i = 0; i < maxWearablesLoop; i++) | ||
11842 | { | ||
11843 | cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock(); | ||
11844 | cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex; | ||
11483 | 11845 | ||
11846 | |||
11847 | |||
11848 | if (cache.GetCached(cachedresp.WearableData[i].TextureID.ToString()) == null) | ||
11849 | cachedresp.WearableData[i].TextureID = UUID.Zero; | ||
11850 | //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46"); | ||
11851 | else | ||
11852 | cachedresp.WearableData[i].TextureID = UUID.Zero; | ||
11853 | // UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46"); | ||
11854 | cachedresp.WearableData[i].HostName = new byte[0]; | ||
11855 | } | ||
11856 | } | ||
11857 | } | ||
11484 | cachedresp.Header.Zerocoded = true; | 11858 | cachedresp.Header.Zerocoded = true; |
11485 | OutPacket(cachedresp, ThrottleOutPacketType.Task); | 11859 | OutPacket(cachedresp, ThrottleOutPacketType.Task); |
11486 | 11860 | ||
@@ -11517,209 +11891,147 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11517 | } | 11891 | } |
11518 | else | 11892 | else |
11519 | { | 11893 | { |
11520 | // m_log.DebugFormat( | 11894 | ClientChangeObject updatehandler = onClientChangeObject; |
11521 | // "[CLIENT]: Processing block {0} type {1} for {2} {3}", | ||
11522 | // i, block.Type, part.Name, part.LocalId); | ||
11523 | 11895 | ||
11524 | // // Do this once since fetch parts creates a new array. | 11896 | if (updatehandler != null) |
11525 | // SceneObjectPart[] parts = part.ParentGroup.Parts; | 11897 | { |
11526 | // for (int j = 0; j < parts.Length; j++) | 11898 | ObjectChangeData udata = new ObjectChangeData(); |
11527 | // { | ||
11528 | // part.StoreUndoState(); | ||
11529 | // parts[j].IgnoreUndoUpdate = true; | ||
11530 | // } | ||
11531 | 11899 | ||
11532 | UpdatePrimGroupRotation handlerUpdatePrimGroupRotation; | 11900 | /*ubit from ll JIRA: |
11901 | * 0x01 position | ||
11902 | * 0x02 rotation | ||
11903 | * 0x04 scale | ||
11904 | |||
11905 | * 0x08 LINK_SET | ||
11906 | * 0x10 UNIFORM for scale | ||
11907 | */ | ||
11533 | 11908 | ||
11534 | switch (block.Type) | 11909 | // translate to internal changes |
11535 | { | 11910 | // not all cases .. just the ones older code did |
11536 | case 1: | ||
11537 | Vector3 pos1 = new Vector3(block.Data, 0); | ||
11538 | 11911 | ||
11539 | UpdateVector handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; | 11912 | switch (block.Type) |
11540 | if (handlerUpdatePrimSinglePosition != null) | 11913 | { |
11541 | { | 11914 | case 1: //change position sp |
11542 | // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); | 11915 | udata.position = new Vector3(block.Data, 0); |
11543 | handlerUpdatePrimSinglePosition(localId, pos1, this); | ||
11544 | } | ||
11545 | break; | ||
11546 | 11916 | ||
11547 | case 2: | 11917 | udata.change = ObjectChangeType.primP; |
11548 | Quaternion rot1 = new Quaternion(block.Data, 0, true); | 11918 | updatehandler(localId, udata, this); |
11919 | break; | ||
11549 | 11920 | ||
11550 | UpdatePrimSingleRotation handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; | 11921 | case 2: // rotation sp |
11551 | if (handlerUpdatePrimSingleRotation != null) | 11922 | udata.rotation = new Quaternion(block.Data, 0, true); |
11552 | { | ||
11553 | // m_log.Info("new tab rotation is " + rot1.X + " , " + rot1.Y + " , " + rot1.Z + " , " + rot1.W); | ||
11554 | handlerUpdatePrimSingleRotation(localId, rot1, this); | ||
11555 | } | ||
11556 | break; | ||
11557 | 11923 | ||
11558 | case 3: | 11924 | udata.change = ObjectChangeType.primR; |
11559 | Vector3 rotPos = new Vector3(block.Data, 0); | 11925 | updatehandler(localId, udata, this); |
11560 | Quaternion rot2 = new Quaternion(block.Data, 12, true); | 11926 | break; |
11561 | 11927 | ||
11562 | UpdatePrimSingleRotationPosition handlerUpdatePrimSingleRotationPosition = OnUpdatePrimSingleRotationPosition; | 11928 | case 3: // position plus rotation |
11563 | if (handlerUpdatePrimSingleRotationPosition != null) | 11929 | udata.position = new Vector3(block.Data, 0); |
11564 | { | 11930 | udata.rotation = new Quaternion(block.Data, 12, true); |
11565 | // m_log.Debug("new mouse rotation position is " + rotPos.X + " , " + rotPos.Y + " , " + rotPos.Z); | ||
11566 | // m_log.Info("new mouse rotation is " + rot2.X + " , " + rot2.Y + " , " + rot2.Z + " , " + rot2.W); | ||
11567 | handlerUpdatePrimSingleRotationPosition(localId, rot2, rotPos, this); | ||
11568 | } | ||
11569 | break; | ||
11570 | 11931 | ||
11571 | case 4: | 11932 | udata.change = ObjectChangeType.primPR; |
11572 | case 20: | 11933 | updatehandler(localId, udata, this); |
11573 | Vector3 scale4 = new Vector3(block.Data, 0); | 11934 | break; |
11574 | 11935 | ||
11575 | UpdateVector handlerUpdatePrimScale = OnUpdatePrimScale; | 11936 | case 4: // scale sp |
11576 | if (handlerUpdatePrimScale != null) | 11937 | udata.scale = new Vector3(block.Data, 0); |
11577 | { | 11938 | udata.change = ObjectChangeType.primS; |
11578 | // m_log.Debug("new scale is " + scale4.X + " , " + scale4.Y + " , " + scale4.Z); | ||
11579 | handlerUpdatePrimScale(localId, scale4, this); | ||
11580 | } | ||
11581 | break; | ||
11582 | 11939 | ||
11583 | case 5: | 11940 | updatehandler(localId, udata, this); |
11584 | Vector3 scale1 = new Vector3(block.Data, 12); | 11941 | break; |
11585 | Vector3 pos11 = new Vector3(block.Data, 0); | ||
11586 | 11942 | ||
11587 | handlerUpdatePrimScale = OnUpdatePrimScale; | 11943 | case 0x14: // uniform scale sp |
11588 | if (handlerUpdatePrimScale != null) | 11944 | udata.scale = new Vector3(block.Data, 0); |
11589 | { | ||
11590 | // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); | ||
11591 | handlerUpdatePrimScale(localId, scale1, this); | ||
11592 | 11945 | ||
11593 | handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; | 11946 | udata.change = ObjectChangeType.primUS; |
11594 | if (handlerUpdatePrimSinglePosition != null) | 11947 | updatehandler(localId, udata, this); |
11595 | { | 11948 | break; |
11596 | handlerUpdatePrimSinglePosition(localId, pos11, this); | ||
11597 | } | ||
11598 | } | ||
11599 | break; | ||
11600 | 11949 | ||
11601 | case 9: | 11950 | case 5: // scale and position sp |
11602 | Vector3 pos2 = new Vector3(block.Data, 0); | 11951 | udata.position = new Vector3(block.Data, 0); |
11952 | udata.scale = new Vector3(block.Data, 12); | ||
11603 | 11953 | ||
11604 | UpdateVector handlerUpdateVector = OnUpdatePrimGroupPosition; | 11954 | udata.change = ObjectChangeType.primPS; |
11955 | updatehandler(localId, udata, this); | ||
11956 | break; | ||
11605 | 11957 | ||
11606 | if (handlerUpdateVector != null) | 11958 | case 0x15: //uniform scale and position |
11607 | { | 11959 | udata.position = new Vector3(block.Data, 0); |
11608 | handlerUpdateVector(localId, pos2, this); | 11960 | udata.scale = new Vector3(block.Data, 12); |
11609 | } | ||
11610 | break; | ||
11611 | 11961 | ||
11612 | case 10: | 11962 | udata.change = ObjectChangeType.primPUS; |
11613 | Quaternion rot3 = new Quaternion(block.Data, 0, true); | 11963 | updatehandler(localId, udata, this); |
11964 | break; | ||
11614 | 11965 | ||
11615 | UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation; | 11966 | // now group related (bit 4) |
11616 | if (handlerUpdatePrimRotation != null) | 11967 | case 9: //( 8 + 1 )group position |
11617 | { | 11968 | udata.position = new Vector3(block.Data, 0); |
11618 | // Console.WriteLine("new rotation is " + rot3.X + " , " + rot3.Y + " , " + rot3.Z + " , " + rot3.W); | ||
11619 | handlerUpdatePrimRotation(localId, rot3, this); | ||
11620 | } | ||
11621 | break; | ||
11622 | 11969 | ||
11623 | case 11: | 11970 | udata.change = ObjectChangeType.groupP; |
11624 | Vector3 pos3 = new Vector3(block.Data, 0); | 11971 | updatehandler(localId, udata, this); |
11625 | Quaternion rot4 = new Quaternion(block.Data, 12, true); | 11972 | break; |
11626 | 11973 | ||
11627 | handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; | 11974 | case 0x0A: // (8 + 2) group rotation |
11628 | if (handlerUpdatePrimGroupRotation != null) | 11975 | udata.rotation = new Quaternion(block.Data, 0, true); |
11629 | { | ||
11630 | // m_log.Debug("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z); | ||
11631 | // m_log.Debug("new group mouse rotation is " + rot4.X + " , " + rot4.Y + " , " + rot4.Z + " , " + rot4.W); | ||
11632 | handlerUpdatePrimGroupRotation(localId, pos3, rot4, this); | ||
11633 | } | ||
11634 | break; | ||
11635 | case 12: | ||
11636 | case 28: | ||
11637 | Vector3 scale7 = new Vector3(block.Data, 0); | ||
11638 | 11976 | ||
11639 | UpdateVector handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; | 11977 | udata.change = ObjectChangeType.groupR; |
11640 | if (handlerUpdatePrimGroupScale != null) | 11978 | updatehandler(localId, udata, this); |
11641 | { | 11979 | break; |
11642 | // m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z); | ||
11643 | handlerUpdatePrimGroupScale(localId, scale7, this); | ||
11644 | } | ||
11645 | break; | ||
11646 | 11980 | ||
11647 | case 13: | 11981 | case 0x0B: //( 8 + 2 + 1) group rotation and position |
11648 | Vector3 scale2 = new Vector3(block.Data, 12); | 11982 | udata.position = new Vector3(block.Data, 0); |
11649 | Vector3 pos4 = new Vector3(block.Data, 0); | 11983 | udata.rotation = new Quaternion(block.Data, 12, true); |
11650 | 11984 | ||
11651 | handlerUpdatePrimScale = OnUpdatePrimScale; | 11985 | udata.change = ObjectChangeType.groupPR; |
11652 | if (handlerUpdatePrimScale != null) | 11986 | updatehandler(localId, udata, this); |
11653 | { | 11987 | break; |
11654 | //m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); | ||
11655 | handlerUpdatePrimScale(localId, scale2, this); | ||
11656 | 11988 | ||
11657 | // Change the position based on scale (for bug number 246) | 11989 | case 0x0C: // (8 + 4) group scale |
11658 | handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; | 11990 | // only afects root prim and only sent by viewer editor object tab scaling |
11659 | // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); | 11991 | // mouse edition only allows uniform scaling |
11660 | if (handlerUpdatePrimSinglePosition != null) | 11992 | // SL MAY CHANGE THIS in viewers |
11661 | { | ||
11662 | handlerUpdatePrimSinglePosition(localId, pos4, this); | ||
11663 | } | ||
11664 | } | ||
11665 | break; | ||
11666 | 11993 | ||
11667 | case 29: | 11994 | udata.scale = new Vector3(block.Data, 0); |
11668 | Vector3 scale5 = new Vector3(block.Data, 12); | ||
11669 | Vector3 pos5 = new Vector3(block.Data, 0); | ||
11670 | 11995 | ||
11671 | handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; | 11996 | udata.change = ObjectChangeType.groupS; |
11672 | if (handlerUpdatePrimGroupScale != null) | 11997 | updatehandler(localId, udata, this); |
11673 | { | ||
11674 | // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); | ||
11675 | part.StoreUndoState(true); | ||
11676 | part.IgnoreUndoUpdate = true; | ||
11677 | handlerUpdatePrimGroupScale(localId, scale5, this); | ||
11678 | handlerUpdateVector = OnUpdatePrimGroupPosition; | ||
11679 | 11998 | ||
11680 | if (handlerUpdateVector != null) | 11999 | break; |
11681 | { | ||
11682 | handlerUpdateVector(localId, pos5, this); | ||
11683 | } | ||
11684 | 12000 | ||
11685 | part.IgnoreUndoUpdate = false; | 12001 | case 0x0D: //(8 + 4 + 1) group scale and position |
11686 | } | 12002 | // exception as above |
11687 | 12003 | ||
11688 | break; | 12004 | udata.position = new Vector3(block.Data, 0); |
12005 | udata.scale = new Vector3(block.Data, 12); | ||
11689 | 12006 | ||
11690 | case 21: | 12007 | udata.change = ObjectChangeType.groupPS; |
11691 | Vector3 scale6 = new Vector3(block.Data, 12); | 12008 | updatehandler(localId, udata, this); |
11692 | Vector3 pos6 = new Vector3(block.Data, 0); | 12009 | break; |
11693 | 12010 | ||
11694 | handlerUpdatePrimScale = OnUpdatePrimScale; | 12011 | case 0x1C: // (0x10 + 8 + 4 ) group scale UNIFORM |
11695 | if (handlerUpdatePrimScale != null) | 12012 | udata.scale = new Vector3(block.Data, 0); |
11696 | { | ||
11697 | part.StoreUndoState(false); | ||
11698 | part.IgnoreUndoUpdate = true; | ||
11699 | 12013 | ||
11700 | // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); | 12014 | udata.change = ObjectChangeType.groupUS; |
11701 | handlerUpdatePrimScale(localId, scale6, this); | 12015 | updatehandler(localId, udata, this); |
11702 | handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; | 12016 | break; |
11703 | if (handlerUpdatePrimSinglePosition != null) | ||
11704 | { | ||
11705 | handlerUpdatePrimSinglePosition(localId, pos6, this); | ||
11706 | } | ||
11707 | 12017 | ||
11708 | part.IgnoreUndoUpdate = false; | 12018 | case 0x1D: // (UNIFORM + GROUP + SCALE + POS) |
11709 | } | 12019 | udata.position = new Vector3(block.Data, 0); |
11710 | break; | 12020 | udata.scale = new Vector3(block.Data, 12); |
11711 | 12021 | ||
11712 | default: | 12022 | udata.change = ObjectChangeType.groupPUS; |
11713 | m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type)); | 12023 | updatehandler(localId, udata, this); |
11714 | break; | 12024 | break; |
12025 | |||
12026 | default: | ||
12027 | m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type)); | ||
12028 | break; | ||
12029 | } | ||
11715 | } | 12030 | } |
11716 | 12031 | ||
11717 | // for (int j = 0; j < parts.Length; j++) | ||
11718 | // parts[j].IgnoreUndoUpdate = false; | ||
11719 | } | 12032 | } |
11720 | } | 12033 | } |
11721 | } | 12034 | } |
11722 | |||
11723 | return true; | 12035 | return true; |
11724 | } | 12036 | } |
11725 | 12037 | ||
@@ -11780,9 +12092,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11780 | public void SetChildAgentThrottle(byte[] throttles) | 12092 | public void SetChildAgentThrottle(byte[] throttles) |
11781 | { | 12093 | { |
11782 | m_udpClient.SetThrottles(throttles); | 12094 | m_udpClient.SetThrottles(throttles); |
12095 | GenericCall2 handler = OnUpdateThrottles; | ||
12096 | if (handler != null) | ||
12097 | { | ||
12098 | handler(); | ||
12099 | } | ||
11783 | } | 12100 | } |
11784 | 12101 | ||
11785 | /// <summary> | 12102 | /// <summary> |
12103 | /// Sets the throttles from values supplied by the client | ||
12104 | /// </summary> | ||
12105 | /// <param name="throttles"></param> | ||
12106 | public void SetAgentThrottleSilent(int throttle, int setting) | ||
12107 | { | ||
12108 | m_udpClient.ForceThrottleSetting(throttle,setting); | ||
12109 | //m_udpClient.SetThrottles(throttles); | ||
12110 | |||
12111 | } | ||
12112 | |||
12113 | |||
12114 | /// <summary> | ||
11786 | /// Get the current throttles for this client as a packed byte array | 12115 | /// Get the current throttles for this client as a packed byte array |
11787 | /// </summary> | 12116 | /// </summary> |
11788 | /// <param name="multiplier">Unused</param> | 12117 | /// <param name="multiplier">Unused</param> |
@@ -12174,7 +12503,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
12174 | // "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}", | 12503 | // "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}", |
12175 | // requestID, taskID, (SourceType)sourceType, Name); | 12504 | // requestID, taskID, (SourceType)sourceType, Name); |
12176 | 12505 | ||
12506 | |||
12507 | //Note, the bool returned from the below function is useless since it is always false. | ||
12177 | m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived); | 12508 | m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived); |
12509 | |||
12178 | } | 12510 | } |
12179 | 12511 | ||
12180 | /// <summary> | 12512 | /// <summary> |
@@ -12240,7 +12572,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
12240 | /// <returns></returns> | 12572 | /// <returns></returns> |
12241 | private static int CalculateNumPackets(byte[] data) | 12573 | private static int CalculateNumPackets(byte[] data) |
12242 | { | 12574 | { |
12243 | const uint m_maxPacketSize = 600; | 12575 | // const uint m_maxPacketSize = 600; |
12576 | uint m_maxPacketSize = MaxTransferBytesPerPacket; | ||
12244 | int numPackets = 1; | 12577 | int numPackets = 1; |
12245 | 12578 | ||
12246 | if (data == null) | 12579 | if (data == null) |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs index 621e0fd..e52ac37 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | |||
@@ -92,7 +92,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
92 | /// <summary>Packets we have sent that need to be ACKed by the client</summary> | 92 | /// <summary>Packets we have sent that need to be ACKed by the client</summary> |
93 | public readonly UnackedPacketCollection NeedAcks = new UnackedPacketCollection(); | 93 | public readonly UnackedPacketCollection NeedAcks = new UnackedPacketCollection(); |
94 | /// <summary>ACKs that are queued up, waiting to be sent to the client</summary> | 94 | /// <summary>ACKs that are queued up, waiting to be sent to the client</summary> |
95 | public readonly OpenSim.Framework.LocklessQueue<uint> PendingAcks = new OpenSim.Framework.LocklessQueue<uint>(); | 95 | public readonly DoubleLocklessQueue<uint> PendingAcks = new DoubleLocklessQueue<uint>(); |
96 | 96 | ||
97 | /// <summary>Current packet sequence number</summary> | 97 | /// <summary>Current packet sequence number</summary> |
98 | public int CurrentSequence; | 98 | public int CurrentSequence; |
@@ -146,7 +146,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
146 | /// <summary>Throttle buckets for each packet category</summary> | 146 | /// <summary>Throttle buckets for each packet category</summary> |
147 | private readonly TokenBucket[] m_throttleCategories; | 147 | private readonly TokenBucket[] m_throttleCategories; |
148 | /// <summary>Outgoing queues for throttled packets</summary> | 148 | /// <summary>Outgoing queues for throttled packets</summary> |
149 | private readonly OpenSim.Framework.LocklessQueue<OutgoingPacket>[] m_packetOutboxes = new OpenSim.Framework.LocklessQueue<OutgoingPacket>[THROTTLE_CATEGORY_COUNT]; | 149 | private readonly DoubleLocklessQueue<OutgoingPacket>[] m_packetOutboxes = new DoubleLocklessQueue<OutgoingPacket>[THROTTLE_CATEGORY_COUNT]; |
150 | /// <summary>A container that can hold one packet for each outbox, used to store | 150 | /// <summary>A container that can hold one packet for each outbox, used to store |
151 | /// dequeued packets that are being held for throttling</summary> | 151 | /// dequeued packets that are being held for throttling</summary> |
152 | private readonly OutgoingPacket[] m_nextPackets = new OutgoingPacket[THROTTLE_CATEGORY_COUNT]; | 152 | private readonly OutgoingPacket[] m_nextPackets = new OutgoingPacket[THROTTLE_CATEGORY_COUNT]; |
@@ -158,6 +158,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
158 | 158 | ||
159 | private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC | 159 | private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC |
160 | private int m_maxRTO = 60000; | 160 | private int m_maxRTO = 60000; |
161 | public bool m_deliverPackets = true; | ||
161 | 162 | ||
162 | /// <summary> | 163 | /// <summary> |
163 | /// Default constructor | 164 | /// Default constructor |
@@ -201,7 +202,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
201 | ThrottleOutPacketType type = (ThrottleOutPacketType)i; | 202 | ThrottleOutPacketType type = (ThrottleOutPacketType)i; |
202 | 203 | ||
203 | // Initialize the packet outboxes, where packets sit while they are waiting for tokens | 204 | // Initialize the packet outboxes, where packets sit while they are waiting for tokens |
204 | m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>(); | 205 | m_packetOutboxes[i] = new DoubleLocklessQueue<OutgoingPacket>(); |
205 | // Initialize the token buckets that control the throttling for each category | 206 | // Initialize the token buckets that control the throttling for each category |
206 | m_throttleCategories[i] = new TokenBucket(m_throttleCategory, rates.GetRate(type)); | 207 | m_throttleCategories[i] = new TokenBucket(m_throttleCategory, rates.GetRate(type)); |
207 | } | 208 | } |
@@ -429,11 +430,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
429 | /// </returns> | 430 | /// </returns> |
430 | public bool EnqueueOutgoing(OutgoingPacket packet, bool forceQueue) | 431 | public bool EnqueueOutgoing(OutgoingPacket packet, bool forceQueue) |
431 | { | 432 | { |
433 | return EnqueueOutgoing(packet, forceQueue, false); | ||
434 | } | ||
435 | |||
436 | public bool EnqueueOutgoing(OutgoingPacket packet, bool forceQueue, bool highPriority) | ||
437 | { | ||
432 | int category = (int)packet.Category; | 438 | int category = (int)packet.Category; |
433 | 439 | ||
434 | if (category >= 0 && category < m_packetOutboxes.Length) | 440 | if (category >= 0 && category < m_packetOutboxes.Length) |
435 | { | 441 | { |
436 | OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category]; | 442 | DoubleLocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category]; |
443 | |||
444 | if (m_deliverPackets == false) | ||
445 | { | ||
446 | queue.Enqueue(packet, highPriority); | ||
447 | return true; | ||
448 | } | ||
449 | |||
437 | TokenBucket bucket = m_throttleCategories[category]; | 450 | TokenBucket bucket = m_throttleCategories[category]; |
438 | 451 | ||
439 | // Don't send this packet if there is already a packet waiting in the queue | 452 | // Don't send this packet if there is already a packet waiting in the queue |
@@ -441,7 +454,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
441 | // queued packets | 454 | // queued packets |
442 | if (queue.Count > 0) | 455 | if (queue.Count > 0) |
443 | { | 456 | { |
444 | queue.Enqueue(packet); | 457 | queue.Enqueue(packet, highPriority); |
445 | return true; | 458 | return true; |
446 | } | 459 | } |
447 | 460 | ||
@@ -454,7 +467,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
454 | else | 467 | else |
455 | { | 468 | { |
456 | // Force queue specified or not enough tokens in the bucket, queue this packet | 469 | // Force queue specified or not enough tokens in the bucket, queue this packet |
457 | queue.Enqueue(packet); | 470 | queue.Enqueue(packet, highPriority); |
458 | return true; | 471 | return true; |
459 | } | 472 | } |
460 | } | 473 | } |
@@ -483,8 +496,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
483 | /// <returns>True if any packets were sent, otherwise false</returns> | 496 | /// <returns>True if any packets were sent, otherwise false</returns> |
484 | public bool DequeueOutgoing() | 497 | public bool DequeueOutgoing() |
485 | { | 498 | { |
486 | OutgoingPacket packet; | 499 | if (m_deliverPackets == false) return false; |
487 | OpenSim.Framework.LocklessQueue<OutgoingPacket> queue; | 500 | |
501 | OutgoingPacket packet = null; | ||
502 | DoubleLocklessQueue<OutgoingPacket> queue; | ||
488 | TokenBucket bucket; | 503 | TokenBucket bucket; |
489 | bool packetSent = false; | 504 | bool packetSent = false; |
490 | ThrottleOutPacketTypeFlags emptyCategories = 0; | 505 | ThrottleOutPacketTypeFlags emptyCategories = 0; |
@@ -515,32 +530,49 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
515 | // No dequeued packet waiting to be sent, try to pull one off | 530 | // No dequeued packet waiting to be sent, try to pull one off |
516 | // this queue | 531 | // this queue |
517 | queue = m_packetOutboxes[i]; | 532 | queue = m_packetOutboxes[i]; |
518 | if (queue.Dequeue(out packet)) | 533 | if (queue != null) |
519 | { | 534 | { |
520 | // A packet was pulled off the queue. See if we have | 535 | bool success = false; |
521 | // enough tokens in the bucket to send it out | 536 | try |
522 | if (bucket.RemoveTokens(packet.Buffer.DataLength)) | ||
523 | { | 537 | { |
524 | // Send the packet | 538 | success = queue.Dequeue(out packet); |
525 | m_udpServer.SendPacketFinal(packet); | ||
526 | packetSent = true; | ||
527 | } | 539 | } |
528 | else | 540 | catch |
529 | { | 541 | { |
530 | // Save the dequeued packet for the next iteration | 542 | m_packetOutboxes[i] = new DoubleLocklessQueue<OutgoingPacket>(); |
531 | m_nextPackets[i] = packet; | ||
532 | } | 543 | } |
533 | 544 | if (success) | |
534 | // If the queue is empty after this dequeue, fire the queue | 545 | { |
535 | // empty callback now so it has a chance to fill before we | 546 | // A packet was pulled off the queue. See if we have |
536 | // get back here | 547 | // enough tokens in the bucket to send it out |
537 | if (queue.Count == 0) | 548 | if (bucket.RemoveTokens(packet.Buffer.DataLength)) |
549 | { | ||
550 | // Send the packet | ||
551 | m_udpServer.SendPacketFinal(packet); | ||
552 | packetSent = true; | ||
553 | } | ||
554 | else | ||
555 | { | ||
556 | // Save the dequeued packet for the next iteration | ||
557 | m_nextPackets[i] = packet; | ||
558 | } | ||
559 | |||
560 | // If the queue is empty after this dequeue, fire the queue | ||
561 | // empty callback now so it has a chance to fill before we | ||
562 | // get back here | ||
563 | if (queue.Count == 0) | ||
564 | emptyCategories |= CategoryToFlag(i); | ||
565 | } | ||
566 | else | ||
567 | { | ||
568 | // No packets in this queue. Fire the queue empty callback | ||
569 | // if it has not been called recently | ||
538 | emptyCategories |= CategoryToFlag(i); | 570 | emptyCategories |= CategoryToFlag(i); |
571 | } | ||
539 | } | 572 | } |
540 | else | 573 | else |
541 | { | 574 | { |
542 | // No packets in this queue. Fire the queue empty callback | 575 | m_packetOutboxes[i] = new DoubleLocklessQueue<OutgoingPacket>(); |
543 | // if it has not been called recently | ||
544 | emptyCategories |= CategoryToFlag(i); | 576 | emptyCategories |= CategoryToFlag(i); |
545 | } | 577 | } |
546 | } | 578 | } |
@@ -649,6 +681,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
649 | if (m_nextOnQueueEmpty == 0) | 681 | if (m_nextOnQueueEmpty == 0) |
650 | m_nextOnQueueEmpty = 1; | 682 | m_nextOnQueueEmpty = 1; |
651 | } | 683 | } |
684 | internal void ForceThrottleSetting(int throttle, int setting) | ||
685 | { | ||
686 | m_throttleCategories[throttle].RequestedDripRate = Math.Max(setting, LLUDPServer.MTU); ; | ||
687 | } | ||
652 | 688 | ||
653 | /// <summary> | 689 | /// <summary> |
654 | /// Converts a <seealso cref="ThrottleOutPacketType"/> integer to a | 690 | /// Converts a <seealso cref="ThrottleOutPacketType"/> integer to a |
@@ -693,4 +729,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
693 | } | 729 | } |
694 | } | 730 | } |
695 | } | 731 | } |
732 | |||
733 | public class DoubleLocklessQueue<T> : OpenSim.Framework.LocklessQueue<T> | ||
734 | { | ||
735 | OpenSim.Framework.LocklessQueue<T> highQueue = new OpenSim.Framework.LocklessQueue<T>(); | ||
736 | |||
737 | public override int Count | ||
738 | { | ||
739 | get | ||
740 | { | ||
741 | return base.Count + highQueue.Count; | ||
742 | } | ||
743 | } | ||
744 | |||
745 | public override bool Dequeue(out T item) | ||
746 | { | ||
747 | if (highQueue.Dequeue(out item)) | ||
748 | return true; | ||
749 | |||
750 | return base.Dequeue(out item); | ||
751 | } | ||
752 | |||
753 | public void Enqueue(T item, bool highPriority) | ||
754 | { | ||
755 | if (highPriority) | ||
756 | highQueue.Enqueue(item); | ||
757 | else | ||
758 | Enqueue(item); | ||
759 | } | ||
760 | } | ||
696 | } | 761 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 72516cd..e07ce4c 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -126,7 +126,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
126 | /// <summary>Handlers for incoming packets</summary> | 126 | /// <summary>Handlers for incoming packets</summary> |
127 | //PacketEventDictionary packetEvents = new PacketEventDictionary(); | 127 | //PacketEventDictionary packetEvents = new PacketEventDictionary(); |
128 | /// <summary>Incoming packets that are awaiting handling</summary> | 128 | /// <summary>Incoming packets that are awaiting handling</summary> |
129 | private OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>(); | 129 | //private OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>(); |
130 | |||
131 | private DoubleQueue<IncomingPacket> packetInbox = new DoubleQueue<IncomingPacket>(); | ||
130 | 132 | ||
131 | /// <summary></summary> | 133 | /// <summary></summary> |
132 | //private UDPClientCollection m_clients = new UDPClientCollection(); | 134 | //private UDPClientCollection m_clients = new UDPClientCollection(); |
@@ -181,6 +183,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
181 | /// <summary>Flag to signal when clients should send pings</summary> | 183 | /// <summary>Flag to signal when clients should send pings</summary> |
182 | protected bool m_sendPing; | 184 | protected bool m_sendPing; |
183 | 185 | ||
186 | private ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>> m_pendingCache = new ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>>(); | ||
184 | private Pool<IncomingPacket> m_incomingPacketPool; | 187 | private Pool<IncomingPacket> m_incomingPacketPool; |
185 | 188 | ||
186 | /// <summary> | 189 | /// <summary> |
@@ -787,6 +790,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
787 | 790 | ||
788 | #region Queue or Send | 791 | #region Queue or Send |
789 | 792 | ||
793 | bool highPriority = false; | ||
794 | |||
795 | if (category != ThrottleOutPacketType.Unknown && (category & ThrottleOutPacketType.HighPriority) != 0) | ||
796 | { | ||
797 | category = (ThrottleOutPacketType)((int)category & 127); | ||
798 | highPriority = true; | ||
799 | } | ||
800 | |||
790 | OutgoingPacket outgoingPacket = new OutgoingPacket(udpClient, buffer, category, null); | 801 | OutgoingPacket outgoingPacket = new OutgoingPacket(udpClient, buffer, category, null); |
791 | // If we were not provided a method for handling unacked, use the UDPServer default method | 802 | // If we were not provided a method for handling unacked, use the UDPServer default method |
792 | outgoingPacket.UnackedMethod = ((method == null) ? delegate(OutgoingPacket oPacket) { ResendUnacked(oPacket); } : method); | 803 | outgoingPacket.UnackedMethod = ((method == null) ? delegate(OutgoingPacket oPacket) { ResendUnacked(oPacket); } : method); |
@@ -795,7 +806,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
795 | // continue to display the deleted object until relog. Therefore, we need to always queue a kill object | 806 | // continue to display the deleted object until relog. Therefore, we need to always queue a kill object |
796 | // packet so that it isn't sent before a queued update packet. | 807 | // packet so that it isn't sent before a queued update packet. |
797 | bool requestQueue = type == PacketType.KillObject; | 808 | bool requestQueue = type == PacketType.KillObject; |
798 | if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, requestQueue)) | 809 | if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, requestQueue, highPriority)) |
799 | SendPacketFinal(outgoingPacket); | 810 | SendPacketFinal(outgoingPacket); |
800 | 811 | ||
801 | #endregion Queue or Send | 812 | #endregion Queue or Send |
@@ -1080,21 +1091,46 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1080 | 1091 | ||
1081 | #region Packet to Client Mapping | 1092 | #region Packet to Client Mapping |
1082 | 1093 | ||
1083 | // UseCircuitCode handling | 1094 | // If there is already a client for this endpoint, don't process UseCircuitCode |
1084 | if (packet.Type == PacketType.UseCircuitCode) | 1095 | IClientAPI client = null; |
1096 | if (!m_scene.TryGetClient(endPoint, out client) || !(client is LLClientView)) | ||
1085 | { | 1097 | { |
1086 | // We need to copy the endpoint so that it doesn't get changed when another thread reuses the | 1098 | // UseCircuitCode handling |
1087 | // buffer. | 1099 | if (packet.Type == PacketType.UseCircuitCode) |
1088 | object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet }; | 1100 | { |
1101 | // And if there is a UseCircuitCode pending, also drop it | ||
1102 | lock (m_pendingCache) | ||
1103 | { | ||
1104 | if (m_pendingCache.Contains(endPoint)) | ||
1105 | return; | ||
1089 | 1106 | ||
1090 | Util.FireAndForget(HandleUseCircuitCode, array); | 1107 | m_pendingCache.AddOrUpdate(endPoint, new Queue<UDPPacketBuffer>(), 60); |
1108 | } | ||
1091 | 1109 | ||
1092 | return; | 1110 | // We need to copy the endpoint so that it doesn't get changed when another thread reuses the |
1111 | // buffer. | ||
1112 | object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet }; | ||
1113 | |||
1114 | Util.FireAndForget(HandleUseCircuitCode, array); | ||
1115 | |||
1116 | return; | ||
1117 | } | ||
1118 | } | ||
1119 | |||
1120 | // If this is a pending connection, enqueue, don't process yet | ||
1121 | lock (m_pendingCache) | ||
1122 | { | ||
1123 | Queue<UDPPacketBuffer> queue; | ||
1124 | if (m_pendingCache.TryGetValue(endPoint, out queue)) | ||
1125 | { | ||
1126 | //m_log.DebugFormat("[LLUDPSERVER]: Enqueued a {0} packet into the pending queue", packet.Type); | ||
1127 | queue.Enqueue(buffer); | ||
1128 | return; | ||
1129 | } | ||
1093 | } | 1130 | } |
1094 | 1131 | ||
1095 | // Determine which agent this packet came from | 1132 | // Determine which agent this packet came from |
1096 | IClientAPI client; | 1133 | if (client == null || !(client is LLClientView)) |
1097 | if (!m_scene.TryGetClient(endPoint, out client) || !(client is LLClientView)) | ||
1098 | { | 1134 | { |
1099 | //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); | 1135 | //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); |
1100 | return; | 1136 | return; |
@@ -1103,7 +1139,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1103 | udpClient = ((LLClientView)client).UDPClient; | 1139 | udpClient = ((LLClientView)client).UDPClient; |
1104 | 1140 | ||
1105 | if (!udpClient.IsConnected) | 1141 | if (!udpClient.IsConnected) |
1142 | { | ||
1143 | // m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName); | ||
1106 | return; | 1144 | return; |
1145 | } | ||
1107 | 1146 | ||
1108 | #endregion Packet to Client Mapping | 1147 | #endregion Packet to Client Mapping |
1109 | 1148 | ||
@@ -1233,7 +1272,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1233 | incomingPacket = new IncomingPacket((LLClientView)client, packet); | 1272 | incomingPacket = new IncomingPacket((LLClientView)client, packet); |
1234 | } | 1273 | } |
1235 | 1274 | ||
1236 | packetInbox.Enqueue(incomingPacket); | 1275 | if (incomingPacket.Packet.Type == PacketType.AgentUpdate || |
1276 | incomingPacket.Packet.Type == PacketType.ChatFromViewer) | ||
1277 | packetInbox.EnqueueHigh(incomingPacket); | ||
1278 | else | ||
1279 | packetInbox.EnqueueLow(incomingPacket); | ||
1237 | } | 1280 | } |
1238 | 1281 | ||
1239 | #region BinaryStats | 1282 | #region BinaryStats |
@@ -1379,6 +1422,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1379 | // We only want to send initial data to new clients, not ones which are being converted from child to root. | 1422 | // We only want to send initial data to new clients, not ones which are being converted from child to root. |
1380 | if (client != null) | 1423 | if (client != null) |
1381 | client.SceneAgent.SendInitialDataToMe(); | 1424 | client.SceneAgent.SendInitialDataToMe(); |
1425 | |||
1426 | // Now we know we can handle more data | ||
1427 | Thread.Sleep(200); | ||
1428 | |||
1429 | // Obtain the queue and remove it from the cache | ||
1430 | Queue<UDPPacketBuffer> queue = null; | ||
1431 | |||
1432 | lock (m_pendingCache) | ||
1433 | { | ||
1434 | if (!m_pendingCache.TryGetValue(endPoint, out queue)) | ||
1435 | { | ||
1436 | m_log.DebugFormat("[LLUDPSERVER]: Client created but no pending queue present"); | ||
1437 | return; | ||
1438 | } | ||
1439 | m_pendingCache.Remove(endPoint); | ||
1440 | } | ||
1441 | |||
1442 | m_log.DebugFormat("[LLUDPSERVER]: Client created, processing pending queue, {0} entries", queue.Count); | ||
1443 | |||
1444 | // Reinject queued packets | ||
1445 | while(queue.Count > 0) | ||
1446 | { | ||
1447 | UDPPacketBuffer buf = queue.Dequeue(); | ||
1448 | PacketReceived(buf); | ||
1449 | } | ||
1450 | queue = null; | ||
1382 | } | 1451 | } |
1383 | else | 1452 | else |
1384 | { | 1453 | { |
@@ -1386,6 +1455,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1386 | m_log.WarnFormat( | 1455 | m_log.WarnFormat( |
1387 | "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}", | 1456 | "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}", |
1388 | uccp.CircuitCode.ID, m_scene.RegionInfo.RegionName, uccp.CircuitCode.Code, endPoint); | 1457 | uccp.CircuitCode.ID, m_scene.RegionInfo.RegionName, uccp.CircuitCode.Code, endPoint); |
1458 | lock (m_pendingCache) | ||
1459 | m_pendingCache.Remove(endPoint); | ||
1389 | } | 1460 | } |
1390 | 1461 | ||
1391 | // m_log.DebugFormat( | 1462 | // m_log.DebugFormat( |
@@ -1504,7 +1575,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1504 | if (!client.SceneAgent.IsChildAgent) | 1575 | if (!client.SceneAgent.IsChildAgent) |
1505 | client.Kick("Simulator logged you out due to connection timeout"); | 1576 | client.Kick("Simulator logged you out due to connection timeout"); |
1506 | 1577 | ||
1507 | client.CloseWithoutChecks(); | 1578 | client.CloseWithoutChecks(true); |
1508 | } | 1579 | } |
1509 | } | 1580 | } |
1510 | 1581 | ||
@@ -1516,6 +1587,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1516 | 1587 | ||
1517 | while (IsRunningInbound) | 1588 | while (IsRunningInbound) |
1518 | { | 1589 | { |
1590 | m_scene.ThreadAlive(1); | ||
1519 | try | 1591 | try |
1520 | { | 1592 | { |
1521 | IncomingPacket incomingPacket = null; | 1593 | IncomingPacket incomingPacket = null; |
@@ -1563,6 +1635,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1563 | 1635 | ||
1564 | while (base.IsRunningOutbound) | 1636 | while (base.IsRunningOutbound) |
1565 | { | 1637 | { |
1638 | m_scene.ThreadAlive(2); | ||
1566 | try | 1639 | try |
1567 | { | 1640 | { |
1568 | m_packetSent = false; | 1641 | m_packetSent = false; |
@@ -1793,8 +1866,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1793 | Packet packet = incomingPacket.Packet; | 1866 | Packet packet = incomingPacket.Packet; |
1794 | LLClientView client = incomingPacket.Client; | 1867 | LLClientView client = incomingPacket.Client; |
1795 | 1868 | ||
1796 | if (client.IsActive) | 1869 | // if (client.IsActive) |
1797 | { | 1870 | // { |
1798 | m_currentIncomingClient = client; | 1871 | m_currentIncomingClient = client; |
1799 | 1872 | ||
1800 | try | 1873 | try |
@@ -1821,13 +1894,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1821 | { | 1894 | { |
1822 | m_currentIncomingClient = null; | 1895 | m_currentIncomingClient = null; |
1823 | } | 1896 | } |
1824 | } | 1897 | // } |
1825 | else | 1898 | // else |
1826 | { | 1899 | // { |
1827 | m_log.DebugFormat( | 1900 | // m_log.DebugFormat( |
1828 | "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}", | 1901 | // "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}", |
1829 | packet.Type, client.Name, m_scene.RegionInfo.RegionName); | 1902 | // packet.Type, client.Name, m_scene.RegionInfo.RegionName); |
1830 | } | 1903 | // } |
1831 | 1904 | ||
1832 | IncomingPacketsProcessed++; | 1905 | IncomingPacketsProcessed++; |
1833 | } | 1906 | } |
@@ -1839,8 +1912,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1839 | if (!client.IsLoggingOut) | 1912 | if (!client.IsLoggingOut) |
1840 | { | 1913 | { |
1841 | client.IsLoggingOut = true; | 1914 | client.IsLoggingOut = true; |
1842 | client.Close(); | 1915 | client.Close(false, false); |
1843 | } | 1916 | } |
1844 | } | 1917 | } |
1845 | } | 1918 | } |
1846 | } \ No newline at end of file | 1919 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs index f143c32..7035e38 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs | |||
@@ -114,10 +114,6 @@ namespace OpenMetaverse | |||
114 | const int SIO_UDP_CONNRESET = -1744830452; | 114 | const int SIO_UDP_CONNRESET = -1744830452; |
115 | 115 | ||
116 | IPEndPoint ipep = new IPEndPoint(m_localBindAddress, m_udpPort); | 116 | IPEndPoint ipep = new IPEndPoint(m_localBindAddress, m_udpPort); |
117 | |||
118 | m_log.DebugFormat( | ||
119 | "[UDPBASE]: Binding UDP listener using internal IP address config {0}:{1}", | ||
120 | ipep.Address, ipep.Port); | ||
121 | 117 | ||
122 | m_udpSocket = new Socket( | 118 | m_udpSocket = new Socket( |
123 | AddressFamily.InterNetwork, | 119 | AddressFamily.InterNetwork, |