diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
9 files changed, 1843 insertions, 541 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index cc69645..f6146a9 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; |
@@ -53,14 +54,16 @@ using OSDMap = OpenMetaverse.StructuredData.OSDMap; | |||
53 | namespace OpenSim.Region.ClientStack.Linden | 54 | namespace OpenSim.Region.ClientStack.Linden |
54 | { | 55 | { |
55 | public delegate void UpLoadedAsset( | 56 | public delegate void UpLoadedAsset( |
56 | string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder, | 57 | string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder, |
57 | byte[] data, string inventoryType, string assetType); | 58 | byte[] data, string inventoryType, string assetType, |
59 | int cost, UUID texturesFolder, int nreqtextures, int nreqmeshs, int nreqinstances, | ||
60 | bool IsAtestUpload, ref string error); | ||
58 | 61 | ||
59 | public delegate UUID UpdateItem(UUID itemID, byte[] data); | 62 | public delegate UUID UpdateItem(UUID itemID, byte[] data); |
60 | 63 | ||
61 | public delegate void UpdateTaskScript(UUID itemID, UUID primID, bool isScriptRunning, byte[] data, ref ArrayList errors); | 64 | public delegate void UpdateTaskScript(UUID itemID, UUID primID, bool isScriptRunning, byte[] data, ref ArrayList errors); |
62 | 65 | ||
63 | public delegate void NewInventoryItem(UUID userID, InventoryItemBase item); | 66 | public delegate void NewInventoryItem(UUID userID, InventoryItemBase item, uint cost); |
64 | 67 | ||
65 | public delegate void NewAsset(AssetBase asset); | 68 | public delegate void NewAsset(AssetBase asset); |
66 | 69 | ||
@@ -86,6 +89,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
86 | 89 | ||
87 | private Scene m_Scene; | 90 | private Scene m_Scene; |
88 | private Caps m_HostCapsObj; | 91 | private Caps m_HostCapsObj; |
92 | private ModelCost m_ModelCost; | ||
89 | 93 | ||
90 | private static readonly string m_requestPath = "0000/"; | 94 | private static readonly string m_requestPath = "0000/"; |
91 | // private static readonly string m_mapLayerPath = "0001/"; | 95 | // private static readonly string m_mapLayerPath = "0001/"; |
@@ -96,7 +100,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
96 | // private static readonly string m_fetchInventoryPath = "0006/"; | 100 | // private static readonly string m_fetchInventoryPath = "0006/"; |
97 | private static readonly string m_copyFromNotecardPath = "0007/"; | 101 | private static readonly string m_copyFromNotecardPath = "0007/"; |
98 | // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule. | 102 | // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule. |
99 | 103 | private static readonly string m_getObjectPhysicsDataPath = "0101/"; | |
104 | private static readonly string m_getObjectCostPath = "0102/"; | ||
105 | private static readonly string m_ResourceCostSelectedPath = "0103/"; | ||
106 | |||
100 | 107 | ||
101 | // These are callbacks which will be setup by the scene so that we can update scene data when we | 108 | // These are callbacks which will be setup by the scene so that we can update scene data when we |
102 | // receive capability calls | 109 | // receive capability calls |
@@ -111,12 +118,50 @@ namespace OpenSim.Region.ClientStack.Linden | |||
111 | private IAssetService m_assetService; | 118 | private IAssetService m_assetService; |
112 | private bool m_dumpAssetsToFile = false; | 119 | private bool m_dumpAssetsToFile = false; |
113 | private string m_regionName; | 120 | private string m_regionName; |
121 | |||
114 | private int m_levelUpload = 0; | 122 | private int m_levelUpload = 0; |
115 | 123 | ||
124 | private bool m_enableFreeTestUpload = false; // allows "TEST-" prefix hack | ||
125 | private bool m_ForceFreeTestUpload = false; // forces all uploads to be test | ||
126 | |||
127 | private bool m_enableModelUploadTextureToInventory = false; // place uploaded textures also in inventory | ||
128 | // may not be visible till relog | ||
129 | |||
130 | private bool m_RestrictFreeTestUploadPerms = false; // reduces also the permitions. Needs a creator defined!! | ||
131 | private UUID m_testAssetsCreatorID = UUID.Zero; | ||
132 | |||
133 | private float m_PrimScaleMin = 0.001f; | ||
134 | |||
135 | private enum FileAgentInventoryState : int | ||
136 | { | ||
137 | idle = 0, | ||
138 | processRequest = 1, | ||
139 | waitUpload = 2, | ||
140 | processUpload = 3 | ||
141 | } | ||
142 | private FileAgentInventoryState m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
143 | |||
116 | public BunchOfCaps(Scene scene, Caps caps) | 144 | public BunchOfCaps(Scene scene, Caps caps) |
117 | { | 145 | { |
118 | m_Scene = scene; | 146 | m_Scene = scene; |
119 | m_HostCapsObj = caps; | 147 | m_HostCapsObj = caps; |
148 | |||
149 | // create a model upload cost provider | ||
150 | m_ModelCost = new ModelCost(); | ||
151 | // tell it about scene object limits | ||
152 | m_ModelCost.NonPhysicalPrimScaleMax = m_Scene.m_maxNonphys; | ||
153 | m_ModelCost.PhysicalPrimScaleMax = m_Scene.m_maxPhys; | ||
154 | |||
155 | // m_ModelCost.ObjectLinkedPartsMax = ?? | ||
156 | // m_ModelCost.PrimScaleMin = ?? | ||
157 | |||
158 | m_PrimScaleMin = m_ModelCost.PrimScaleMin; | ||
159 | float modelTextureUploadFactor = m_ModelCost.ModelTextureCostFactor; | ||
160 | float modelUploadFactor = m_ModelCost.ModelMeshCostFactor; | ||
161 | float modelMinUploadCostFactor = m_ModelCost.ModelMinCostFactor; | ||
162 | float modelPrimCreationCost = m_ModelCost.primCreationCost; | ||
163 | float modelMeshByteCost = m_ModelCost.bytecost; | ||
164 | |||
120 | IConfigSource config = m_Scene.Config; | 165 | IConfigSource config = m_Scene.Config; |
121 | if (config != null) | 166 | if (config != null) |
122 | { | 167 | { |
@@ -131,6 +176,37 @@ namespace OpenSim.Region.ClientStack.Linden | |||
131 | { | 176 | { |
132 | m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures); | 177 | m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures); |
133 | } | 178 | } |
179 | // economy for model upload | ||
180 | IConfig EconomyConfig = config.Configs["Economy"]; | ||
181 | if (EconomyConfig != null) | ||
182 | { | ||
183 | modelUploadFactor = EconomyConfig.GetFloat("MeshModelUploadCostFactor", modelUploadFactor); | ||
184 | modelTextureUploadFactor = EconomyConfig.GetFloat("MeshModelUploadTextureCostFactor", modelTextureUploadFactor); | ||
185 | modelMinUploadCostFactor = EconomyConfig.GetFloat("MeshModelMinCostFactor", modelMinUploadCostFactor); | ||
186 | // next 2 are normalized so final cost is afected by modelUploadFactor above and normal cost | ||
187 | modelPrimCreationCost = EconomyConfig.GetFloat("ModelPrimCreationCost", modelPrimCreationCost); | ||
188 | modelMeshByteCost = EconomyConfig.GetFloat("ModelMeshByteCost", modelMeshByteCost); | ||
189 | |||
190 | m_enableModelUploadTextureToInventory = EconomyConfig.GetBoolean("MeshModelAllowTextureToInventory", m_enableModelUploadTextureToInventory); | ||
191 | |||
192 | m_RestrictFreeTestUploadPerms = EconomyConfig.GetBoolean("m_RestrictFreeTestUploadPerms", m_RestrictFreeTestUploadPerms); | ||
193 | m_enableFreeTestUpload = EconomyConfig.GetBoolean("AllowFreeTestUpload", m_enableFreeTestUpload); | ||
194 | m_ForceFreeTestUpload = EconomyConfig.GetBoolean("ForceFreeTestUpload", m_ForceFreeTestUpload); | ||
195 | string testcreator = EconomyConfig.GetString("TestAssetsCreatorID", ""); | ||
196 | if (testcreator != "") | ||
197 | { | ||
198 | UUID id; | ||
199 | UUID.TryParse(testcreator, out id); | ||
200 | if (id != null) | ||
201 | m_testAssetsCreatorID = id; | ||
202 | } | ||
203 | |||
204 | m_ModelCost.ModelMeshCostFactor = modelUploadFactor; | ||
205 | m_ModelCost.ModelTextureCostFactor = modelTextureUploadFactor; | ||
206 | m_ModelCost.ModelMinCostFactor = modelMinUploadCostFactor; | ||
207 | m_ModelCost.primCreationCost = modelPrimCreationCost; | ||
208 | m_ModelCost.bytecost = modelMeshByteCost; | ||
209 | } | ||
134 | } | 210 | } |
135 | 211 | ||
136 | m_assetService = m_Scene.AssetService; | 212 | m_assetService = m_Scene.AssetService; |
@@ -142,6 +218,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
142 | ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; | 218 | ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; |
143 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; | 219 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; |
144 | GetClient = m_Scene.SceneGraph.GetControllingClient; | 220 | GetClient = m_Scene.SceneGraph.GetControllingClient; |
221 | |||
222 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
145 | } | 223 | } |
146 | 224 | ||
147 | /// <summary> | 225 | /// <summary> |
@@ -187,7 +265,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
187 | { | 265 | { |
188 | try | 266 | try |
189 | { | 267 | { |
190 | // I don't think this one works... | ||
191 | m_HostCapsObj.RegisterHandler( | 268 | m_HostCapsObj.RegisterHandler( |
192 | "NewFileAgentInventory", | 269 | "NewFileAgentInventory", |
193 | new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>( | 270 | new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>( |
@@ -204,6 +281,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
204 | m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req); | 281 | m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req); |
205 | m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req); | 282 | m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req); |
206 | m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req); | 283 | m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req); |
284 | IRequestHandler getObjectPhysicsDataHandler = new RestStreamHandler("POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData); | ||
285 | m_HostCapsObj.RegisterHandler("GetObjectPhysicsData", getObjectPhysicsDataHandler); | ||
286 | IRequestHandler getObjectCostHandler = new RestStreamHandler("POST", capsBase + m_getObjectCostPath, GetObjectCost); | ||
287 | m_HostCapsObj.RegisterHandler("GetObjectCost", getObjectCostHandler); | ||
288 | IRequestHandler ResourceCostSelectedHandler = new RestStreamHandler("POST", capsBase + m_ResourceCostSelectedPath, ResourceCostSelected); | ||
289 | m_HostCapsObj.RegisterHandler("ResourceCostSelected", ResourceCostSelectedHandler); | ||
207 | 290 | ||
208 | m_HostCapsObj.RegisterHandler( | 291 | m_HostCapsObj.RegisterHandler( |
209 | "CopyInventoryFromNotecard", | 292 | "CopyInventoryFromNotecard", |
@@ -386,62 +469,176 @@ namespace OpenSim.Region.ClientStack.Linden | |||
386 | //m_log.Debug("[CAPS]: NewAgentInventoryRequest Request is: " + llsdRequest.ToString()); | 469 | //m_log.Debug("[CAPS]: NewAgentInventoryRequest Request is: " + llsdRequest.ToString()); |
387 | //m_log.Debug("asset upload request via CAPS" + llsdRequest.inventory_type + " , " + llsdRequest.asset_type); | 470 | //m_log.Debug("asset upload request via CAPS" + llsdRequest.inventory_type + " , " + llsdRequest.asset_type); |
388 | 471 | ||
472 | // start by getting the client | ||
473 | IClientAPI client = null; | ||
474 | m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client); | ||
475 | |||
476 | // check current state so we only have one service at a time | ||
477 | lock (m_ModelCost) | ||
478 | { | ||
479 | switch (m_FileAgentInventoryState) | ||
480 | { | ||
481 | case FileAgentInventoryState.processRequest: | ||
482 | case FileAgentInventoryState.processUpload: | ||
483 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); | ||
484 | resperror.message = "Uploader busy processing previus request"; | ||
485 | resperror.identifier = UUID.Zero; | ||
486 | |||
487 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); | ||
488 | errorResponse.uploader = ""; | ||
489 | errorResponse.state = "error"; | ||
490 | errorResponse.error = resperror; | ||
491 | return errorResponse; | ||
492 | break; | ||
493 | case FileAgentInventoryState.waitUpload: | ||
494 | // todo stop current uploader server | ||
495 | break; | ||
496 | case FileAgentInventoryState.idle: | ||
497 | default: | ||
498 | break; | ||
499 | } | ||
500 | |||
501 | m_FileAgentInventoryState = FileAgentInventoryState.processRequest; | ||
502 | } | ||
503 | |||
504 | int cost = 0; | ||
505 | int nreqtextures = 0; | ||
506 | int nreqmeshs= 0; | ||
507 | int nreqinstances = 0; | ||
508 | bool IsAtestUpload = false; | ||
509 | |||
510 | string assetName = llsdRequest.name; | ||
511 | |||
512 | LLSDAssetUploadResponseData meshcostdata = new LLSDAssetUploadResponseData(); | ||
513 | |||
389 | if (llsdRequest.asset_type == "texture" || | 514 | if (llsdRequest.asset_type == "texture" || |
390 | llsdRequest.asset_type == "animation" || | 515 | llsdRequest.asset_type == "animation" || |
516 | llsdRequest.asset_type == "mesh" || | ||
391 | llsdRequest.asset_type == "sound") | 517 | llsdRequest.asset_type == "sound") |
392 | { | 518 | { |
393 | ScenePresence avatar = null; | 519 | ScenePresence avatar = null; |
394 | IClientAPI client = null; | ||
395 | m_Scene.TryGetScenePresence(m_HostCapsObj.AgentID, out avatar); | 520 | m_Scene.TryGetScenePresence(m_HostCapsObj.AgentID, out avatar); |
396 | 521 | ||
397 | // check user level | 522 | // check user level |
398 | if (avatar != null) | 523 | if (avatar != null) |
399 | { | 524 | { |
400 | client = avatar.ControllingClient; | ||
401 | |||
402 | if (avatar.UserLevel < m_levelUpload) | 525 | if (avatar.UserLevel < m_levelUpload) |
403 | { | 526 | { |
404 | if (client != null) | 527 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); |
405 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false); | 528 | resperror.message = "Insufficient permissions to upload"; |
529 | resperror.identifier = UUID.Zero; | ||
406 | 530 | ||
407 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); | 531 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); |
408 | errorResponse.uploader = ""; | 532 | errorResponse.uploader = ""; |
409 | errorResponse.state = "error"; | 533 | errorResponse.state = "error"; |
534 | errorResponse.error = resperror; | ||
535 | lock (m_ModelCost) | ||
536 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
410 | return errorResponse; | 537 | return errorResponse; |
411 | } | 538 | } |
412 | } | 539 | } |
413 | 540 | ||
414 | // check funds | 541 | // check test upload and funds |
415 | if (client != null) | 542 | if (client != null) |
416 | { | 543 | { |
417 | IMoneyModule mm = m_Scene.RequestModuleInterface<IMoneyModule>(); | 544 | IMoneyModule mm = m_Scene.RequestModuleInterface<IMoneyModule>(); |
418 | 545 | ||
546 | int baseCost = 0; | ||
419 | if (mm != null) | 547 | if (mm != null) |
548 | baseCost = mm.UploadCharge; | ||
549 | |||
550 | string warning = String.Empty; | ||
551 | |||
552 | if (llsdRequest.asset_type == "mesh") | ||
420 | { | 553 | { |
421 | if (!mm.UploadCovered(client.AgentId, mm.UploadCharge)) | 554 | string error; |
555 | int modelcost; | ||
556 | |||
557 | if (!m_ModelCost.MeshModelCost(llsdRequest.asset_resources, baseCost, out modelcost, | ||
558 | meshcostdata, out error, ref warning)) | ||
422 | { | 559 | { |
423 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); | 560 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); |
561 | resperror.message = error; | ||
562 | resperror.identifier = UUID.Zero; | ||
424 | 563 | ||
425 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); | 564 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); |
426 | errorResponse.uploader = ""; | 565 | errorResponse.uploader = ""; |
427 | errorResponse.state = "error"; | 566 | errorResponse.state = "error"; |
567 | errorResponse.error = resperror; | ||
568 | |||
569 | lock (m_ModelCost) | ||
570 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
428 | return errorResponse; | 571 | return errorResponse; |
429 | } | 572 | } |
573 | cost = modelcost; | ||
574 | } | ||
575 | else | ||
576 | { | ||
577 | cost = baseCost; | ||
578 | } | ||
579 | |||
580 | if (cost > 0 && mm != null) | ||
581 | { | ||
582 | // check for test upload | ||
583 | |||
584 | if (m_ForceFreeTestUpload) // all are test | ||
585 | { | ||
586 | if (!(assetName.Length > 5 && assetName.StartsWith("TEST-"))) // has normal name lets change it | ||
587 | assetName = "TEST-" + assetName; | ||
588 | |||
589 | IsAtestUpload = true; | ||
590 | } | ||
591 | |||
592 | else if (m_enableFreeTestUpload) // only if prefixed with "TEST-" | ||
593 | { | ||
594 | |||
595 | IsAtestUpload = (assetName.Length > 5 && assetName.StartsWith("TEST-")); | ||
596 | } | ||
597 | |||
598 | |||
599 | if(IsAtestUpload) // let user know, still showing cost estimation | ||
600 | 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"; | ||
601 | |||
602 | // check funds | ||
603 | else | ||
604 | { | ||
605 | if (!mm.UploadCovered(client.AgentId, (int)cost)) | ||
606 | { | ||
607 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); | ||
608 | resperror.message = "Insuficient funds"; | ||
609 | resperror.identifier = UUID.Zero; | ||
610 | |||
611 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); | ||
612 | errorResponse.uploader = ""; | ||
613 | errorResponse.state = "error"; | ||
614 | errorResponse.error = resperror; | ||
615 | lock (m_ModelCost) | ||
616 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
617 | return errorResponse; | ||
618 | } | ||
619 | } | ||
430 | } | 620 | } |
621 | |||
622 | if (client != null && warning != String.Empty) | ||
623 | client.SendAgentAlertMessage(warning, true); | ||
431 | } | 624 | } |
432 | } | 625 | } |
433 | 626 | ||
434 | string assetName = llsdRequest.name; | ||
435 | string assetDes = llsdRequest.description; | 627 | string assetDes = llsdRequest.description; |
436 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; | 628 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; |
437 | UUID newAsset = UUID.Random(); | 629 | UUID newAsset = UUID.Random(); |
438 | UUID newInvItem = UUID.Random(); | 630 | UUID newInvItem = UUID.Random(); |
439 | UUID parentFolder = llsdRequest.folder_id; | 631 | UUID parentFolder = llsdRequest.folder_id; |
440 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); | 632 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); |
633 | UUID texturesFolder = UUID.Zero; | ||
634 | |||
635 | if(!IsAtestUpload && m_enableModelUploadTextureToInventory) | ||
636 | texturesFolder = llsdRequest.texture_folder_id; | ||
441 | 637 | ||
442 | AssetUploader uploader = | 638 | AssetUploader uploader = |
443 | new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type, | 639 | new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type, |
444 | llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile); | 640 | llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile, cost, |
641 | texturesFolder, nreqtextures, nreqmeshs, nreqinstances, IsAtestUpload); | ||
445 | 642 | ||
446 | m_HostCapsObj.HttpListener.AddStreamHandler( | 643 | m_HostCapsObj.HttpListener.AddStreamHandler( |
447 | new BinaryStreamHandler( | 644 | new BinaryStreamHandler( |
@@ -459,10 +656,22 @@ namespace OpenSim.Region.ClientStack.Linden | |||
459 | string uploaderURL = protocol + m_HostCapsObj.HostName + ":" + m_HostCapsObj.Port.ToString() + capsBase + | 656 | string uploaderURL = protocol + m_HostCapsObj.HostName + ":" + m_HostCapsObj.Port.ToString() + capsBase + |
460 | uploaderPath; | 657 | uploaderPath; |
461 | 658 | ||
659 | |||
462 | LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse(); | 660 | LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse(); |
463 | uploadResponse.uploader = uploaderURL; | 661 | uploadResponse.uploader = uploaderURL; |
464 | uploadResponse.state = "upload"; | 662 | uploadResponse.state = "upload"; |
663 | uploadResponse.upload_price = (int)cost; | ||
664 | |||
665 | if (llsdRequest.asset_type == "mesh") | ||
666 | { | ||
667 | uploadResponse.data = meshcostdata; | ||
668 | } | ||
669 | |||
465 | uploader.OnUpLoad += UploadCompleteHandler; | 670 | uploader.OnUpLoad += UploadCompleteHandler; |
671 | |||
672 | lock (m_ModelCost) | ||
673 | m_FileAgentInventoryState = FileAgentInventoryState.waitUpload; | ||
674 | |||
466 | return uploadResponse; | 675 | return uploadResponse; |
467 | } | 676 | } |
468 | 677 | ||
@@ -474,8 +683,14 @@ namespace OpenSim.Region.ClientStack.Linden | |||
474 | /// <param name="data"></param> | 683 | /// <param name="data"></param> |
475 | public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID, | 684 | public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID, |
476 | UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType, | 685 | UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType, |
477 | string assetType) | 686 | string assetType, int cost, |
687 | UUID texturesFolder, int nreqtextures, int nreqmeshs, int nreqinstances, | ||
688 | bool IsAtestUpload, ref string error) | ||
478 | { | 689 | { |
690 | |||
691 | lock (m_ModelCost) | ||
692 | m_FileAgentInventoryState = FileAgentInventoryState.processUpload; | ||
693 | |||
479 | m_log.DebugFormat( | 694 | m_log.DebugFormat( |
480 | "[BUNCH OF CAPS]: Uploaded asset {0} for inventory item {1}, inv type {2}, asset type {3}", | 695 | "[BUNCH OF CAPS]: Uploaded asset {0} for inventory item {1}, inv type {2}, asset type {3}", |
481 | assetID, inventoryItem, inventoryType, assetType); | 696 | assetID, inventoryItem, inventoryType, assetType); |
@@ -483,117 +698,247 @@ namespace OpenSim.Region.ClientStack.Linden | |||
483 | sbyte assType = 0; | 698 | sbyte assType = 0; |
484 | sbyte inType = 0; | 699 | sbyte inType = 0; |
485 | 700 | ||
701 | IClientAPI client = null; | ||
702 | |||
703 | UUID owner_id = m_HostCapsObj.AgentID; | ||
704 | UUID creatorID; | ||
705 | |||
706 | bool istest = IsAtestUpload && m_enableFreeTestUpload && (cost > 0); | ||
707 | |||
708 | bool restrictPerms = m_RestrictFreeTestUploadPerms && istest; | ||
709 | |||
710 | if (istest && m_testAssetsCreatorID != UUID.Zero) | ||
711 | creatorID = m_testAssetsCreatorID; | ||
712 | else | ||
713 | creatorID = owner_id; | ||
714 | |||
715 | string creatorIDstr = creatorID.ToString(); | ||
716 | |||
717 | IMoneyModule mm = m_Scene.RequestModuleInterface<IMoneyModule>(); | ||
718 | if (mm != null) | ||
719 | { | ||
720 | // make sure client still has enougth credit | ||
721 | if (!mm.UploadCovered(m_HostCapsObj.AgentID, (int)cost)) | ||
722 | { | ||
723 | error = "Insufficient funds."; | ||
724 | return; | ||
725 | } | ||
726 | } | ||
727 | |||
728 | // strings to types | ||
486 | if (inventoryType == "sound") | 729 | if (inventoryType == "sound") |
487 | { | 730 | { |
488 | inType = 1; | 731 | inType = (sbyte)InventoryType.Sound; |
489 | assType = 1; | 732 | assType = (sbyte)AssetType.Sound; |
490 | } | 733 | } |
491 | else if (inventoryType == "animation") | 734 | else if (inventoryType == "animation") |
492 | { | 735 | { |
493 | inType = 19; | 736 | inType = (sbyte)InventoryType.Animation; |
494 | assType = 20; | 737 | assType = (sbyte)AssetType.Animation; |
495 | } | 738 | } |
496 | else if (inventoryType == "wearable") | 739 | else if (inventoryType == "wearable") |
497 | { | 740 | { |
498 | inType = 18; | 741 | inType = (sbyte)InventoryType.Wearable; |
499 | switch (assetType) | 742 | switch (assetType) |
500 | { | 743 | { |
501 | case "bodypart": | 744 | case "bodypart": |
502 | assType = 13; | 745 | assType = (sbyte)AssetType.Bodypart; |
503 | break; | 746 | break; |
504 | case "clothing": | 747 | case "clothing": |
505 | assType = 5; | 748 | assType = (sbyte)AssetType.Clothing; |
506 | break; | 749 | break; |
507 | } | 750 | } |
508 | } | 751 | } |
509 | else if (inventoryType == "object") | 752 | else if (inventoryType == "object") |
510 | { | 753 | { |
511 | inType = (sbyte)InventoryType.Object; | 754 | if (assetType == "mesh") // this code for now is for mesh models uploads only |
512 | assType = (sbyte)AssetType.Object; | ||
513 | |||
514 | List<Vector3> positions = new List<Vector3>(); | ||
515 | List<Quaternion> rotations = new List<Quaternion>(); | ||
516 | OSDMap request = (OSDMap)OSDParser.DeserializeLLSDXml(data); | ||
517 | OSDArray instance_list = (OSDArray)request["instance_list"]; | ||
518 | OSDArray mesh_list = (OSDArray)request["mesh_list"]; | ||
519 | OSDArray texture_list = (OSDArray)request["texture_list"]; | ||
520 | SceneObjectGroup grp = null; | ||
521 | |||
522 | List<UUID> textures = new List<UUID>(); | ||
523 | for (int i = 0; i < texture_list.Count; i++) | ||
524 | { | 755 | { |
525 | AssetBase textureAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Texture, ""); | 756 | inType = (sbyte)InventoryType.Object; |
526 | textureAsset.Data = texture_list[i].AsBinary(); | 757 | assType = (sbyte)AssetType.Object; |
527 | m_assetService.Store(textureAsset); | ||
528 | textures.Add(textureAsset.FullID); | ||
529 | } | ||
530 | 758 | ||
531 | for (int i = 0; i < mesh_list.Count; i++) | 759 | List<Vector3> positions = new List<Vector3>(); |
532 | { | 760 | List<Quaternion> rotations = new List<Quaternion>(); |
533 | PrimitiveBaseShape pbs = PrimitiveBaseShape.CreateBox(); | 761 | OSDMap request = (OSDMap)OSDParser.DeserializeLLSDXml(data); |
762 | |||
763 | // compare and get updated information | ||
534 | 764 | ||
535 | Primitive.TextureEntry textureEntry | 765 | bool mismatchError = true; |
536 | = new Primitive.TextureEntry(Primitive.TextureEntry.WHITE_TEXTURE); | ||
537 | OSDMap inner_instance_list = (OSDMap)instance_list[i]; | ||
538 | 766 | ||
539 | OSDArray face_list = (OSDArray)inner_instance_list["face_list"]; | 767 | while (mismatchError) |
540 | for (uint face = 0; face < face_list.Count; face++) | ||
541 | { | 768 | { |
542 | OSDMap faceMap = (OSDMap)face_list[(int)face]; | 769 | mismatchError = false; |
543 | Primitive.TextureEntryFace f = pbs.Textures.CreateFace(face); | 770 | } |
544 | if(faceMap.ContainsKey("fullbright")) | ||
545 | f.Fullbright = faceMap["fullbright"].AsBoolean(); | ||
546 | if (faceMap.ContainsKey ("diffuse_color")) | ||
547 | f.RGBA = faceMap["diffuse_color"].AsColor4(); | ||
548 | 771 | ||
549 | int textureNum = faceMap["image"].AsInteger(); | 772 | if (mismatchError) |
550 | float imagerot = faceMap["imagerot"].AsInteger(); | 773 | { |
551 | float offsets = (float)faceMap["offsets"].AsReal(); | 774 | error = "Upload and fee estimation information don't match"; |
552 | float offsett = (float)faceMap["offsett"].AsReal(); | 775 | lock (m_ModelCost) |
553 | float scales = (float)faceMap["scales"].AsReal(); | 776 | m_FileAgentInventoryState = FileAgentInventoryState.idle; |
554 | float scalet = (float)faceMap["scalet"].AsReal(); | ||
555 | 777 | ||
556 | if(imagerot != 0) | 778 | return; |
557 | f.Rotation = imagerot; | 779 | } |
558 | 780 | ||
559 | if(offsets != 0) | 781 | OSDArray instance_list = (OSDArray)request["instance_list"]; |
560 | f.OffsetU = offsets; | 782 | OSDArray mesh_list = (OSDArray)request["mesh_list"]; |
783 | OSDArray texture_list = (OSDArray)request["texture_list"]; | ||
784 | SceneObjectGroup grp = null; | ||
561 | 785 | ||
562 | if (offsett != 0) | 786 | // create and store texture assets |
563 | f.OffsetV = offsett; | 787 | bool doTextInv = (!istest && m_enableModelUploadTextureToInventory && |
788 | texturesFolder != UUID.Zero); | ||
564 | 789 | ||
565 | if (scales != 0) | ||
566 | f.RepeatU = scales; | ||
567 | 790 | ||
568 | if (scalet != 0) | 791 | List<UUID> textures = new List<UUID>(); |
569 | f.RepeatV = scalet; | ||
570 | 792 | ||
571 | if (textures.Count > textureNum) | 793 | |
572 | f.TextureID = textures[textureNum]; | 794 | if (doTextInv) |
573 | else | 795 | m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client); |
574 | f.TextureID = Primitive.TextureEntry.WHITE_TEXTURE; | 796 | |
797 | if(client == null) // don't put textures in inventory if there is no client | ||
798 | doTextInv = false; | ||
575 | 799 | ||
576 | textureEntry.FaceTextures[face] = f; | 800 | for (int i = 0; i < texture_list.Count; i++) |
801 | { | ||
802 | AssetBase textureAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Texture, creatorIDstr); | ||
803 | textureAsset.Data = texture_list[i].AsBinary(); | ||
804 | if (istest) | ||
805 | textureAsset.Local = true; | ||
806 | m_assetService.Store(textureAsset); | ||
807 | textures.Add(textureAsset.FullID); | ||
808 | |||
809 | if (doTextInv) | ||
810 | { | ||
811 | string name = assetName; | ||
812 | if (name.Length > 25) | ||
813 | name = name.Substring(0, 24); | ||
814 | name += "_Texture#" + i.ToString(); | ||
815 | InventoryItemBase texitem = new InventoryItemBase(); | ||
816 | texitem.Owner = m_HostCapsObj.AgentID; | ||
817 | texitem.CreatorId = creatorIDstr; | ||
818 | texitem.CreatorData = String.Empty; | ||
819 | texitem.ID = UUID.Random(); | ||
820 | texitem.AssetID = textureAsset.FullID; | ||
821 | texitem.Description = "mesh model texture"; | ||
822 | texitem.Name = name; | ||
823 | texitem.AssetType = (int)AssetType.Texture; | ||
824 | texitem.InvType = (int)InventoryType.Texture; | ||
825 | texitem.Folder = texturesFolder; | ||
826 | |||
827 | texitem.CurrentPermissions | ||
828 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer); | ||
829 | |||
830 | texitem.BasePermissions = (uint)PermissionMask.All; | ||
831 | texitem.EveryOnePermissions = 0; | ||
832 | texitem.NextPermissions = (uint)PermissionMask.All; | ||
833 | texitem.CreationDate = Util.UnixTimeSinceEpoch(); | ||
834 | |||
835 | m_Scene.AddInventoryItem(client, texitem); | ||
836 | texitem = null; | ||
837 | } | ||
838 | } | ||
839 | |||
840 | // create and store meshs assets | ||
841 | List<UUID> meshAssets = new List<UUID>(); | ||
842 | for (int i = 0; i < mesh_list.Count; i++) | ||
843 | { | ||
844 | AssetBase meshAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Mesh, creatorIDstr); | ||
845 | meshAsset.Data = mesh_list[i].AsBinary(); | ||
846 | if (istest) | ||
847 | meshAsset.Local = true; | ||
848 | m_assetService.Store(meshAsset); | ||
849 | meshAssets.Add(meshAsset.FullID); | ||
577 | } | 850 | } |
578 | 851 | ||
579 | pbs.TextureEntry = textureEntry.GetBytes(); | 852 | int skipedMeshs = 0; |
853 | // build prims from instances | ||
854 | for (int i = 0; i < instance_list.Count; i++) | ||
855 | { | ||
856 | OSDMap inner_instance_list = (OSDMap)instance_list[i]; | ||
857 | |||
858 | // skip prims that are 2 small | ||
859 | Vector3 scale = inner_instance_list["scale"].AsVector3(); | ||
860 | |||
861 | if (scale.X < m_PrimScaleMin || scale.Y < m_PrimScaleMin || scale.Z < m_PrimScaleMin) | ||
862 | { | ||
863 | skipedMeshs++; | ||
864 | continue; | ||
865 | } | ||
866 | |||
867 | PrimitiveBaseShape pbs = PrimitiveBaseShape.CreateBox(); | ||
868 | |||
869 | Primitive.TextureEntry textureEntry | ||
870 | = new Primitive.TextureEntry(Primitive.TextureEntry.WHITE_TEXTURE); | ||
871 | |||
872 | |||
873 | OSDArray face_list = (OSDArray)inner_instance_list["face_list"]; | ||
874 | for (uint face = 0; face < face_list.Count; face++) | ||
875 | { | ||
876 | OSDMap faceMap = (OSDMap)face_list[(int)face]; | ||
877 | Primitive.TextureEntryFace f = pbs.Textures.CreateFace(face); | ||
878 | if (faceMap.ContainsKey("fullbright")) | ||
879 | f.Fullbright = faceMap["fullbright"].AsBoolean(); | ||
880 | if (faceMap.ContainsKey("diffuse_color")) | ||
881 | f.RGBA = faceMap["diffuse_color"].AsColor4(); | ||
882 | |||
883 | int textureNum = faceMap["image"].AsInteger(); | ||
884 | float imagerot = faceMap["imagerot"].AsInteger(); | ||
885 | float offsets = (float)faceMap["offsets"].AsReal(); | ||
886 | float offsett = (float)faceMap["offsett"].AsReal(); | ||
887 | float scales = (float)faceMap["scales"].AsReal(); | ||
888 | float scalet = (float)faceMap["scalet"].AsReal(); | ||
889 | |||
890 | if (imagerot != 0) | ||
891 | f.Rotation = imagerot; | ||
892 | |||
893 | if (offsets != 0) | ||
894 | f.OffsetU = offsets; | ||
580 | 895 | ||
581 | AssetBase meshAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Mesh, ""); | 896 | if (offsett != 0) |
582 | meshAsset.Data = mesh_list[i].AsBinary(); | 897 | f.OffsetV = offsett; |
583 | m_assetService.Store(meshAsset); | ||
584 | 898 | ||
585 | pbs.SculptEntry = true; | 899 | if (scales != 0) |
586 | pbs.SculptTexture = meshAsset.FullID; | 900 | f.RepeatU = scales; |
587 | pbs.SculptType = (byte)SculptType.Mesh; | 901 | |
588 | pbs.SculptData = meshAsset.Data; | 902 | if (scalet != 0) |
903 | f.RepeatV = scalet; | ||
904 | |||
905 | if (textures.Count > textureNum) | ||
906 | f.TextureID = textures[textureNum]; | ||
907 | else | ||
908 | f.TextureID = Primitive.TextureEntry.WHITE_TEXTURE; | ||
909 | |||
910 | textureEntry.FaceTextures[face] = f; | ||
911 | } | ||
589 | 912 | ||
590 | Vector3 position = inner_instance_list["position"].AsVector3(); | 913 | pbs.TextureEntry = textureEntry.GetBytes(); |
591 | Vector3 scale = inner_instance_list["scale"].AsVector3(); | 914 | |
592 | Quaternion rotation = inner_instance_list["rotation"].AsQuaternion(); | 915 | bool hasmesh = false; |
916 | if (inner_instance_list.ContainsKey("mesh")) // seems to happen always but ... | ||
917 | { | ||
918 | int meshindx = inner_instance_list["mesh"].AsInteger(); | ||
919 | if (meshAssets.Count > meshindx) | ||
920 | { | ||
921 | pbs.SculptEntry = true; | ||
922 | pbs.SculptType = (byte)SculptType.Mesh; | ||
923 | pbs.SculptTexture = meshAssets[meshindx]; // actual asset UUID after meshs suport introduction | ||
924 | // data will be requested from asset on rez (i hope) | ||
925 | hasmesh = true; | ||
926 | } | ||
927 | } | ||
928 | |||
929 | Vector3 position = inner_instance_list["position"].AsVector3(); | ||
930 | Quaternion rotation = inner_instance_list["rotation"].AsQuaternion(); | ||
931 | |||
932 | // for now viwers do send fixed defaults | ||
933 | // but this may change | ||
934 | // int physicsShapeType = inner_instance_list["physics_shape_type"].AsInteger(); | ||
935 | byte physicsShapeType = (byte)PhysShapeType.prim; // default for mesh is simple convex | ||
936 | if(hasmesh) | ||
937 | physicsShapeType = (byte) PhysShapeType.convex; // default for mesh is simple convex | ||
938 | // int material = inner_instance_list["material"].AsInteger(); | ||
939 | byte material = (byte)Material.Wood; | ||
593 | 940 | ||
594 | // no longer used - begin ------------------------ | 941 | // no longer used - begin ------------------------ |
595 | // int physicsShapeType = inner_instance_list["physics_shape_type"].AsInteger(); | ||
596 | // int material = inner_instance_list["material"].AsInteger(); | ||
597 | // int mesh = inner_instance_list["mesh"].AsInteger(); | 942 | // int mesh = inner_instance_list["mesh"].AsInteger(); |
598 | 943 | ||
599 | // OSDMap permissions = (OSDMap)inner_instance_list["permissions"]; | 944 | // OSDMap permissions = (OSDMap)inner_instance_list["permissions"]; |
@@ -608,24 +953,42 @@ namespace OpenSim.Region.ClientStack.Linden | |||
608 | // UUID owner_id = permissions["owner_id"].AsUUID(); | 953 | // UUID owner_id = permissions["owner_id"].AsUUID(); |
609 | // int owner_mask = permissions["owner_mask"].AsInteger(); | 954 | // int owner_mask = permissions["owner_mask"].AsInteger(); |
610 | // no longer used - end ------------------------ | 955 | // no longer used - end ------------------------ |
956 | |||
957 | |||
958 | SceneObjectPart prim | ||
959 | = new SceneObjectPart(owner_id, pbs, position, Quaternion.Identity, Vector3.Zero); | ||
960 | |||
961 | prim.Scale = scale; | ||
962 | rotations.Add(rotation); | ||
963 | positions.Add(position); | ||
964 | prim.UUID = UUID.Random(); | ||
965 | prim.CreatorID = creatorID; | ||
966 | prim.OwnerID = owner_id; | ||
967 | prim.GroupID = UUID.Zero; | ||
968 | prim.LastOwnerID = creatorID; | ||
969 | prim.CreationDate = Util.UnixTimeSinceEpoch(); | ||
970 | |||
971 | if (grp == null) | ||
972 | prim.Name = assetName; | ||
973 | else | ||
974 | prim.Name = assetName + "#" + i.ToString(); | ||
611 | 975 | ||
612 | UUID owner_id = m_HostCapsObj.AgentID; | 976 | if (restrictPerms) |
977 | { | ||
978 | prim.BaseMask = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
979 | prim.EveryoneMask = 0; | ||
980 | prim.GroupMask = 0; | ||
981 | prim.NextOwnerMask = 0; | ||
982 | prim.OwnerMask = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
983 | } | ||
613 | 984 | ||
614 | SceneObjectPart prim | 985 | if(istest) |
615 | = new SceneObjectPart(owner_id, pbs, position, Quaternion.Identity, Vector3.Zero); | 986 | prim.Description = "For testing only. Other uses are prohibited"; |
987 | else | ||
988 | prim.Description = ""; | ||
616 | 989 | ||
617 | prim.Scale = scale; | 990 | prim.Material = material; |
618 | prim.OffsetPosition = position; | 991 | prim.PhysicsShapeType = physicsShapeType; |
619 | rotations.Add(rotation); | ||
620 | positions.Add(position); | ||
621 | prim.UUID = UUID.Random(); | ||
622 | prim.CreatorID = owner_id; | ||
623 | prim.OwnerID = owner_id; | ||
624 | prim.GroupID = UUID.Zero; | ||
625 | prim.LastOwnerID = prim.OwnerID; | ||
626 | prim.CreationDate = Util.UnixTimeSinceEpoch(); | ||
627 | prim.Name = assetName; | ||
628 | prim.Description = ""; | ||
629 | 992 | ||
630 | // prim.BaseMask = (uint)base_mask; | 993 | // prim.BaseMask = (uint)base_mask; |
631 | // prim.EveryoneMask = (uint)everyone_mask; | 994 | // prim.EveryoneMask = (uint)everyone_mask; |
@@ -633,37 +996,64 @@ namespace OpenSim.Region.ClientStack.Linden | |||
633 | // prim.NextOwnerMask = (uint)next_owner_mask; | 996 | // prim.NextOwnerMask = (uint)next_owner_mask; |
634 | // prim.OwnerMask = (uint)owner_mask; | 997 | // prim.OwnerMask = (uint)owner_mask; |
635 | 998 | ||
636 | if (grp == null) | 999 | if (grp == null) |
637 | grp = new SceneObjectGroup(prim); | 1000 | { |
638 | else | 1001 | grp = new SceneObjectGroup(prim); |
639 | grp.AddPart(prim); | 1002 | grp.LastOwnerID = creatorID; |
640 | } | 1003 | } |
1004 | else | ||
1005 | grp.AddPart(prim); | ||
1006 | } | ||
641 | 1007 | ||
642 | // Fix first link number | 1008 | Vector3 rootPos = positions[0]; |
643 | if (grp.Parts.Length > 1) | ||
644 | grp.RootPart.LinkNum++; | ||
645 | 1009 | ||
646 | Vector3 rootPos = positions[0]; | 1010 | if (grp.Parts.Length > 1) |
647 | grp.AbsolutePosition = rootPos; | 1011 | { |
648 | for (int i = 0; i < positions.Count; i++) | 1012 | // Fix first link number |
649 | { | 1013 | grp.RootPart.LinkNum++; |
650 | Vector3 offset = positions[i] - rootPos; | 1014 | |
651 | grp.Parts[i].OffsetPosition = offset; | 1015 | Quaternion rootRotConj = Quaternion.Conjugate(rotations[0]); |
1016 | Quaternion tmprot; | ||
1017 | Vector3 offset; | ||
1018 | |||
1019 | // fix children rotations and positions | ||
1020 | for (int i = 1; i < rotations.Count; i++) | ||
1021 | { | ||
1022 | tmprot = rotations[i]; | ||
1023 | tmprot = rootRotConj * tmprot; | ||
1024 | |||
1025 | grp.Parts[i].RotationOffset = tmprot; | ||
1026 | |||
1027 | offset = positions[i] - rootPos; | ||
1028 | |||
1029 | offset *= rootRotConj; | ||
1030 | grp.Parts[i].OffsetPosition = offset; | ||
1031 | } | ||
1032 | |||
1033 | grp.AbsolutePosition = rootPos; | ||
1034 | grp.UpdateGroupRotationR(rotations[0]); | ||
1035 | } | ||
1036 | else | ||
1037 | { | ||
1038 | grp.AbsolutePosition = rootPos; | ||
1039 | grp.UpdateGroupRotationR(rotations[0]); | ||
1040 | } | ||
1041 | |||
1042 | data = ASCIIEncoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(grp)); | ||
652 | } | 1043 | } |
653 | 1044 | ||
654 | for (int i = 0; i < rotations.Count; i++) | 1045 | else // not a mesh model |
655 | { | 1046 | { |
656 | if (i != 0) | 1047 | m_log.ErrorFormat("[CAPS Asset Upload] got unsuported assetType for object upload"); |
657 | grp.Parts[i].RotationOffset = rotations[i]; | 1048 | return; |
658 | } | 1049 | } |
659 | |||
660 | grp.UpdateGroupRotationR(rotations[0]); | ||
661 | data = ASCIIEncoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(grp)); | ||
662 | } | 1050 | } |
663 | 1051 | ||
664 | AssetBase asset; | 1052 | AssetBase asset; |
665 | asset = new AssetBase(assetID, assetName, assType, m_HostCapsObj.AgentID.ToString()); | 1053 | asset = new AssetBase(assetID, assetName, assType, creatorIDstr); |
666 | asset.Data = data; | 1054 | asset.Data = data; |
1055 | if (istest) | ||
1056 | asset.Local = true; | ||
667 | if (AddNewAsset != null) | 1057 | if (AddNewAsset != null) |
668 | AddNewAsset(asset); | 1058 | AddNewAsset(asset); |
669 | else if (m_assetService != null) | 1059 | else if (m_assetService != null) |
@@ -671,11 +1061,17 @@ namespace OpenSim.Region.ClientStack.Linden | |||
671 | 1061 | ||
672 | InventoryItemBase item = new InventoryItemBase(); | 1062 | InventoryItemBase item = new InventoryItemBase(); |
673 | item.Owner = m_HostCapsObj.AgentID; | 1063 | item.Owner = m_HostCapsObj.AgentID; |
674 | item.CreatorId = m_HostCapsObj.AgentID.ToString(); | 1064 | item.CreatorId = creatorIDstr; |
675 | item.CreatorData = String.Empty; | 1065 | item.CreatorData = String.Empty; |
676 | item.ID = inventoryItem; | 1066 | item.ID = inventoryItem; |
677 | item.AssetID = asset.FullID; | 1067 | item.AssetID = asset.FullID; |
678 | item.Description = assetDescription; | 1068 | if (istest) |
1069 | { | ||
1070 | item.Description = "For testing only. Other uses are prohibited"; | ||
1071 | item.Flags = (uint) (InventoryItemFlags.SharedSingleReference); | ||
1072 | } | ||
1073 | else | ||
1074 | item.Description = assetDescription; | ||
679 | item.Name = assetName; | 1075 | item.Name = assetName; |
680 | item.AssetType = assType; | 1076 | item.AssetType = assType; |
681 | item.InvType = inType; | 1077 | item.InvType = inType; |
@@ -683,18 +1079,60 @@ namespace OpenSim.Region.ClientStack.Linden | |||
683 | 1079 | ||
684 | // If we set PermissionMask.All then when we rez the item the next permissions will replace the current | 1080 | // If we set PermissionMask.All then when we rez the item the next permissions will replace the current |
685 | // (owner) permissions. This becomes a problem if next permissions are changed. | 1081 | // (owner) permissions. This becomes a problem if next permissions are changed. |
686 | item.CurrentPermissions | ||
687 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer); | ||
688 | 1082 | ||
689 | item.BasePermissions = (uint)PermissionMask.All; | 1083 | if (restrictPerms) |
690 | item.EveryOnePermissions = 0; | 1084 | { |
691 | item.NextPermissions = (uint)PermissionMask.All; | 1085 | item.CurrentPermissions |
1086 | = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
1087 | |||
1088 | item.BasePermissions = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
1089 | item.EveryOnePermissions = 0; | ||
1090 | item.NextPermissions = 0; | ||
1091 | } | ||
1092 | else | ||
1093 | { | ||
1094 | item.CurrentPermissions | ||
1095 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer); | ||
1096 | |||
1097 | item.BasePermissions = (uint)PermissionMask.All; | ||
1098 | item.EveryOnePermissions = 0; | ||
1099 | item.NextPermissions = (uint)PermissionMask.All; | ||
1100 | } | ||
1101 | |||
692 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 1102 | item.CreationDate = Util.UnixTimeSinceEpoch(); |
693 | 1103 | ||
1104 | m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client); | ||
1105 | |||
694 | if (AddNewInventoryItem != null) | 1106 | if (AddNewInventoryItem != null) |
695 | { | 1107 | { |
696 | AddNewInventoryItem(m_HostCapsObj.AgentID, item); | 1108 | if (istest) |
1109 | { | ||
1110 | m_Scene.AddInventoryItem(client, item); | ||
1111 | /* | ||
1112 | AddNewInventoryItem(m_HostCapsObj.AgentID, item, 0); | ||
1113 | if (client != null) | ||
1114 | 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); | ||
1115 | */ | ||
1116 | } | ||
1117 | else | ||
1118 | { | ||
1119 | AddNewInventoryItem(m_HostCapsObj.AgentID, item, (uint)cost); | ||
1120 | // if (client != null) | ||
1121 | // { | ||
1122 | // // let users see anything.. i don't so far | ||
1123 | // string str; | ||
1124 | // if (cost > 0) | ||
1125 | // // dont remember where is money unit name to put here | ||
1126 | // str = "Upload complete. charged " + cost.ToString() + "$"; | ||
1127 | // else | ||
1128 | // str = "Upload complete"; | ||
1129 | // client.SendAgentAlertMessage(str, true); | ||
1130 | // } | ||
1131 | } | ||
697 | } | 1132 | } |
1133 | |||
1134 | lock (m_ModelCost) | ||
1135 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
698 | } | 1136 | } |
699 | 1137 | ||
700 | /// <summary> | 1138 | /// <summary> |
@@ -855,10 +1293,159 @@ namespace OpenSim.Region.ClientStack.Linden | |||
855 | response["int_response_code"] = 200; | 1293 | response["int_response_code"] = 200; |
856 | return LLSDHelpers.SerialiseLLSDReply(response); | 1294 | return LLSDHelpers.SerialiseLLSDReply(response); |
857 | } | 1295 | } |
1296 | |||
1297 | public string GetObjectPhysicsData(string request, string path, | ||
1298 | string param, IOSHttpRequest httpRequest, | ||
1299 | IOSHttpResponse httpResponse) | ||
1300 | { | ||
1301 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | ||
1302 | OSDMap resp = new OSDMap(); | ||
1303 | OSDArray object_ids = (OSDArray)req["object_ids"]; | ||
1304 | |||
1305 | for (int i = 0 ; i < object_ids.Count ; i++) | ||
1306 | { | ||
1307 | UUID uuid = object_ids[i].AsUUID(); | ||
1308 | |||
1309 | SceneObjectPart obj = m_Scene.GetSceneObjectPart(uuid); | ||
1310 | if (obj != null) | ||
1311 | { | ||
1312 | OSDMap object_data = new OSDMap(); | ||
1313 | |||
1314 | object_data["PhysicsShapeType"] = obj.PhysicsShapeType; | ||
1315 | object_data["Density"] = obj.Density; | ||
1316 | object_data["Friction"] = obj.Friction; | ||
1317 | object_data["Restitution"] = obj.Bounciness; | ||
1318 | object_data["GravityMultiplier"] = obj.GravityModifier; | ||
1319 | |||
1320 | resp[uuid.ToString()] = object_data; | ||
1321 | } | ||
1322 | } | ||
1323 | |||
1324 | string response = OSDParser.SerializeLLSDXmlString(resp); | ||
1325 | return response; | ||
1326 | } | ||
1327 | |||
1328 | public string GetObjectCost(string request, string path, | ||
1329 | string param, IOSHttpRequest httpRequest, | ||
1330 | IOSHttpResponse httpResponse) | ||
1331 | { | ||
1332 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | ||
1333 | OSDMap resp = new OSDMap(); | ||
1334 | |||
1335 | OSDArray object_ids = (OSDArray)req["object_ids"]; | ||
1336 | |||
1337 | for (int i = 0; i < object_ids.Count; i++) | ||
1338 | { | ||
1339 | UUID uuid = object_ids[i].AsUUID(); | ||
1340 | |||
1341 | SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid); | ||
1342 | |||
1343 | if (part != null) | ||
1344 | { | ||
1345 | SceneObjectGroup grp = part.ParentGroup; | ||
1346 | if (grp != null) | ||
1347 | { | ||
1348 | float linksetCost; | ||
1349 | float linksetPhysCost; | ||
1350 | float partCost; | ||
1351 | float partPhysCost; | ||
1352 | |||
1353 | grp.GetResourcesCosts(part, out linksetCost, out linksetPhysCost, out partCost, out partPhysCost); | ||
1354 | |||
1355 | OSDMap object_data = new OSDMap(); | ||
1356 | object_data["linked_set_resource_cost"] = linksetCost; | ||
1357 | object_data["resource_cost"] = partCost; | ||
1358 | object_data["physics_cost"] = partPhysCost; | ||
1359 | object_data["linked_set_physics_cost"] = linksetPhysCost; | ||
1360 | |||
1361 | resp[uuid.ToString()] = object_data; | ||
1362 | } | ||
1363 | } | ||
1364 | } | ||
1365 | |||
1366 | string response = OSDParser.SerializeLLSDXmlString(resp); | ||
1367 | return response; | ||
1368 | } | ||
1369 | |||
1370 | public string ResourceCostSelected(string request, string path, | ||
1371 | string param, IOSHttpRequest httpRequest, | ||
1372 | IOSHttpResponse httpResponse) | ||
1373 | { | ||
1374 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | ||
1375 | OSDMap resp = new OSDMap(); | ||
1376 | |||
1377 | |||
1378 | float phys=0; | ||
1379 | float stream=0; | ||
1380 | float simul=0; | ||
1381 | |||
1382 | if (req.ContainsKey("selected_roots")) | ||
1383 | { | ||
1384 | OSDArray object_ids = (OSDArray)req["selected_roots"]; | ||
1385 | |||
1386 | // should go by SOG suming costs for all parts | ||
1387 | // ll v3 works ok with several objects select we get the list and adds ok | ||
1388 | // FS calls per object so results are wrong guess fs bug | ||
1389 | for (int i = 0; i < object_ids.Count; i++) | ||
1390 | { | ||
1391 | UUID uuid = object_ids[i].AsUUID(); | ||
1392 | float Physc; | ||
1393 | float simulc; | ||
1394 | float streamc; | ||
1395 | |||
1396 | SceneObjectGroup grp = m_Scene.GetGroupByPrim(uuid); | ||
1397 | if (grp != null) | ||
1398 | { | ||
1399 | grp.GetSelectedCosts(out Physc, out streamc, out simulc); | ||
1400 | phys += Physc; | ||
1401 | stream += streamc; | ||
1402 | simul += simulc; | ||
1403 | } | ||
1404 | } | ||
1405 | } | ||
1406 | else if (req.ContainsKey("selected_prims")) | ||
1407 | { | ||
1408 | OSDArray object_ids = (OSDArray)req["selected_prims"]; | ||
1409 | |||
1410 | // don't see in use in any of the 2 viewers | ||
1411 | // guess it should be for edit linked but... nothing | ||
1412 | // should go to SOP per part | ||
1413 | for (int i = 0; i < object_ids.Count; i++) | ||
1414 | { | ||
1415 | UUID uuid = object_ids[i].AsUUID(); | ||
1416 | |||
1417 | SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid); | ||
1418 | if (part != null) | ||
1419 | { | ||
1420 | phys += part.PhysicsCost; | ||
1421 | stream += part.StreamingCost; | ||
1422 | simul += part.SimulationCost; | ||
1423 | } | ||
1424 | } | ||
1425 | } | ||
1426 | |||
1427 | if (simul != 0) | ||
1428 | { | ||
1429 | OSDMap object_data = new OSDMap(); | ||
1430 | |||
1431 | object_data["physics"] = phys; | ||
1432 | object_data["streaming"] = stream; | ||
1433 | object_data["simulation"] = simul; | ||
1434 | |||
1435 | resp["selected"] = object_data; | ||
1436 | } | ||
1437 | |||
1438 | string response = OSDParser.SerializeLLSDXmlString(resp); | ||
1439 | return response; | ||
1440 | } | ||
858 | } | 1441 | } |
859 | 1442 | ||
860 | public class AssetUploader | 1443 | public class AssetUploader |
861 | { | 1444 | { |
1445 | private static readonly ILog m_log = | ||
1446 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
1447 | |||
1448 | |||
862 | public event UpLoadedAsset OnUpLoad; | 1449 | public event UpLoadedAsset OnUpLoad; |
863 | private UpLoadedAsset handlerUpLoad = null; | 1450 | private UpLoadedAsset handlerUpLoad = null; |
864 | 1451 | ||
@@ -873,10 +1460,21 @@ namespace OpenSim.Region.ClientStack.Linden | |||
873 | 1460 | ||
874 | private string m_invType = String.Empty; | 1461 | private string m_invType = String.Empty; |
875 | private string m_assetType = String.Empty; | 1462 | private string m_assetType = String.Empty; |
1463 | private int m_cost; | ||
1464 | private string m_error = String.Empty; | ||
1465 | |||
1466 | private Timer m_timeoutTimer = new Timer(); | ||
1467 | private UUID m_texturesFolder; | ||
1468 | private int m_nreqtextures; | ||
1469 | private int m_nreqmeshs; | ||
1470 | private int m_nreqinstances; | ||
1471 | private bool m_IsAtestUpload; | ||
876 | 1472 | ||
877 | public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem, | 1473 | public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem, |
878 | UUID parentFolderID, string invType, string assetType, string path, | 1474 | UUID parentFolderID, string invType, string assetType, string path, |
879 | IHttpServer httpServer, bool dumpAssetsToFile) | 1475 | IHttpServer httpServer, bool dumpAssetsToFile, |
1476 | int totalCost, UUID texturesFolder, int nreqtextures, int nreqmeshs, int nreqinstances, | ||
1477 | bool IsAtestUpload) | ||
880 | { | 1478 | { |
881 | m_assetName = assetName; | 1479 | m_assetName = assetName; |
882 | m_assetDes = description; | 1480 | m_assetDes = description; |
@@ -888,6 +1486,18 @@ namespace OpenSim.Region.ClientStack.Linden | |||
888 | m_assetType = assetType; | 1486 | m_assetType = assetType; |
889 | m_invType = invType; | 1487 | m_invType = invType; |
890 | m_dumpAssetsToFile = dumpAssetsToFile; | 1488 | m_dumpAssetsToFile = dumpAssetsToFile; |
1489 | m_cost = totalCost; | ||
1490 | |||
1491 | m_texturesFolder = texturesFolder; | ||
1492 | m_nreqtextures = nreqtextures; | ||
1493 | m_nreqmeshs = nreqmeshs; | ||
1494 | m_nreqinstances = nreqinstances; | ||
1495 | m_IsAtestUpload = IsAtestUpload; | ||
1496 | |||
1497 | m_timeoutTimer.Elapsed += TimedOut; | ||
1498 | m_timeoutTimer.Interval = 120000; | ||
1499 | m_timeoutTimer.AutoReset = false; | ||
1500 | m_timeoutTimer.Start(); | ||
891 | } | 1501 | } |
892 | 1502 | ||
893 | /// <summary> | 1503 | /// <summary> |
@@ -902,12 +1512,14 @@ namespace OpenSim.Region.ClientStack.Linden | |||
902 | UUID inv = inventoryItemID; | 1512 | UUID inv = inventoryItemID; |
903 | string res = String.Empty; | 1513 | string res = String.Empty; |
904 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); | 1514 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); |
1515 | /* | ||
905 | uploadComplete.new_asset = newAssetID.ToString(); | 1516 | uploadComplete.new_asset = newAssetID.ToString(); |
906 | uploadComplete.new_inventory_item = inv; | 1517 | uploadComplete.new_inventory_item = inv; |
907 | uploadComplete.state = "complete"; | 1518 | uploadComplete.state = "complete"; |
908 | 1519 | ||
909 | res = LLSDHelpers.SerialiseLLSDReply(uploadComplete); | 1520 | res = LLSDHelpers.SerialiseLLSDReply(uploadComplete); |
910 | 1521 | */ | |
1522 | m_timeoutTimer.Stop(); | ||
911 | httpListener.RemoveStreamHandler("POST", uploaderPath); | 1523 | httpListener.RemoveStreamHandler("POST", uploaderPath); |
912 | 1524 | ||
913 | // TODO: probably make this a better set of extensions here | 1525 | // TODO: probably make this a better set of extensions here |
@@ -924,12 +1536,49 @@ namespace OpenSim.Region.ClientStack.Linden | |||
924 | handlerUpLoad = OnUpLoad; | 1536 | handlerUpLoad = OnUpLoad; |
925 | if (handlerUpLoad != null) | 1537 | if (handlerUpLoad != null) |
926 | { | 1538 | { |
927 | handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType); | 1539 | handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType, |
1540 | m_cost, m_texturesFolder, m_nreqtextures, m_nreqmeshs, m_nreqinstances, m_IsAtestUpload, ref m_error); | ||
1541 | } | ||
1542 | if (m_IsAtestUpload) | ||
1543 | { | ||
1544 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); | ||
1545 | resperror.message = "Upload SUCESSEFULL for testing purposes only. Other uses are prohibited. Item will not work after 48 hours or on other regions"; | ||
1546 | resperror.identifier = inv; | ||
1547 | |||
1548 | uploadComplete.error = resperror; | ||
1549 | uploadComplete.state = "Upload4Testing"; | ||
928 | } | 1550 | } |
1551 | else | ||
1552 | { | ||
1553 | if (m_error == String.Empty) | ||
1554 | { | ||
1555 | uploadComplete.new_asset = newAssetID.ToString(); | ||
1556 | uploadComplete.new_inventory_item = inv; | ||
1557 | // if (m_texturesFolder != UUID.Zero) | ||
1558 | // uploadComplete.new_texture_folder_id = m_texturesFolder; | ||
1559 | uploadComplete.state = "complete"; | ||
1560 | } | ||
1561 | else | ||
1562 | { | ||
1563 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); | ||
1564 | resperror.message = m_error; | ||
1565 | resperror.identifier = inv; | ||
929 | 1566 | ||
1567 | uploadComplete.error = resperror; | ||
1568 | uploadComplete.state = "failed"; | ||
1569 | } | ||
1570 | } | ||
1571 | |||
1572 | res = LLSDHelpers.SerialiseLLSDReply(uploadComplete); | ||
930 | return res; | 1573 | return res; |
931 | } | 1574 | } |
932 | 1575 | ||
1576 | private void TimedOut(object sender, ElapsedEventArgs args) | ||
1577 | { | ||
1578 | m_log.InfoFormat("[CAPS]: Removing URL and handler for timed out mesh upload"); | ||
1579 | httpListener.RemoveStreamHandler("POST", uploaderPath); | ||
1580 | } | ||
1581 | |||
933 | ///Left this in and commented in case there are unforseen issues | 1582 | ///Left this in and commented in case there are unforseen issues |
934 | //private void SaveAssetToFile(string filename, byte[] data) | 1583 | //private void SaveAssetToFile(string filename, byte[] data) |
935 | //{ | 1584 | //{ |
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 b96b1db..05d5577 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); |
@@ -807,5 +807,13 @@ namespace OpenSim.Region.ClientStack.Linden | |||
807 | { | 807 | { |
808 | return EventQueueHelper.BuildEvent(eventName, eventBody); | 808 | return EventQueueHelper.BuildEvent(eventName, eventBody); |
809 | } | 809 | } |
810 | |||
811 | public void partPhysicsProperties(uint localID, byte physhapetype, | ||
812 | float density, float friction, float bounce, float gravmod,UUID avatarID) | ||
813 | { | ||
814 | OSD item = EventQueueHelper.partPhysicsProperties(localID, physhapetype, | ||
815 | density, friction, bounce, gravmod); | ||
816 | Enqueue(item, avatarID); | ||
817 | } | ||
810 | } | 818 | } |
811 | } | 819 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs index 3f49aba..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); |
@@ -395,5 +402,25 @@ namespace OpenSim.Region.ClientStack.Linden | |||
395 | return message; | 402 | return message; |
396 | } | 403 | } |
397 | 404 | ||
405 | public static OSD partPhysicsProperties(uint localID, byte physhapetype, | ||
406 | float density, float friction, float bounce, float gravmod) | ||
407 | { | ||
408 | |||
409 | OSDMap physinfo = new OSDMap(6); | ||
410 | physinfo["LocalID"] = localID; | ||
411 | physinfo["Density"] = density; | ||
412 | physinfo["Friction"] = friction; | ||
413 | physinfo["GravityMultiplier"] = gravmod; | ||
414 | physinfo["Restitution"] = bounce; | ||
415 | physinfo["PhysicsShapeType"] = (int)physhapetype; | ||
416 | |||
417 | OSDArray array = new OSDArray(1); | ||
418 | array.Add(physinfo); | ||
419 | |||
420 | OSDMap llsdBody = new OSDMap(1); | ||
421 | llsdBody.Add("ObjectData", array); | ||
422 | |||
423 | return BuildEvent("ObjectPhysicsProperties", llsdBody); | ||
424 | } | ||
398 | } | 425 | } |
399 | } | 426 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs index 5ae9cc3..d1a1583 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,64 +42,81 @@ 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 | { |
53 | 49 | ||
54 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 50 | /// <summary> |
51 | /// This module implements both WebFetchTextureDescendents and FetchTextureDescendents2 capabilities. | ||
52 | /// </summary> | ||
53 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GetTextureModule")] | ||
55 | public class GetTextureModule : INonSharedRegionModule | 54 | public class GetTextureModule : INonSharedRegionModule |
56 | { | 55 | { |
57 | // private static readonly ILog m_log = | 56 | |
58 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 57 | struct aPollRequest |
59 | 58 | { | |
59 | public PollServiceTextureEventArgs thepoll; | ||
60 | public UUID reqID; | ||
61 | public Hashtable request; | ||
62 | } | ||
63 | |||
64 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
65 | |||
60 | private Scene m_scene; | 66 | private Scene m_scene; |
61 | private IAssetService m_assetService; | ||
62 | 67 | ||
63 | private bool m_Enabled = false; | 68 | private static GetTextureHandler m_getTextureHandler; |
69 | |||
70 | private IAssetService m_assetService = null; | ||
64 | 71 | ||
65 | // TODO: Change this to a config option | 72 | private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>(); |
66 | const string REDIRECT_URL = null; | 73 | private static Thread[] m_workerThreads = null; |
67 | 74 | ||
68 | private string m_URL; | 75 | private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue = |
76 | new OpenMetaverse.BlockingQueue<aPollRequest>(); | ||
69 | 77 | ||
70 | #region ISharedRegionModule Members | 78 | #region ISharedRegionModule Members |
71 | 79 | ||
72 | public void Initialise(IConfigSource source) | 80 | public void Initialise(IConfigSource source) |
73 | { | 81 | { |
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 | } | 82 | } |
83 | 83 | ||
84 | public void AddRegion(Scene s) | 84 | public void AddRegion(Scene s) |
85 | { | 85 | { |
86 | if (!m_Enabled) | ||
87 | return; | ||
88 | |||
89 | m_scene = s; | 86 | m_scene = s; |
87 | m_assetService = s.AssetService; | ||
90 | } | 88 | } |
91 | 89 | ||
92 | public void RemoveRegion(Scene s) | 90 | public void RemoveRegion(Scene s) |
93 | { | 91 | { |
94 | if (!m_Enabled) | ||
95 | return; | ||
96 | |||
97 | m_scene.EventManager.OnRegisterCaps -= RegisterCaps; | 92 | m_scene.EventManager.OnRegisterCaps -= RegisterCaps; |
93 | m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps; | ||
98 | m_scene = null; | 94 | m_scene = null; |
99 | } | 95 | } |
100 | 96 | ||
101 | public void RegionLoaded(Scene s) | 97 | public void RegionLoaded(Scene s) |
102 | { | 98 | { |
103 | if (!m_Enabled) | 99 | // We'll reuse the same handler for all requests. |
104 | return; | 100 | m_getTextureHandler = new GetTextureHandler(m_assetService); |
105 | 101 | ||
106 | m_assetService = m_scene.RequestModuleInterface<IAssetService>(); | ||
107 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | 102 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; |
103 | m_scene.EventManager.OnDeregisterCaps += DeregisterCaps; | ||
104 | |||
105 | if (m_workerThreads == null) | ||
106 | { | ||
107 | m_workerThreads = new Thread[2]; | ||
108 | |||
109 | for (uint i = 0; i < 2; i++) | ||
110 | { | ||
111 | m_workerThreads[i] = Watchdog.StartThread(DoTextureRequests, | ||
112 | String.Format("TextureWorkerThread{0}", i), | ||
113 | ThreadPriority.Normal, | ||
114 | false, | ||
115 | false, | ||
116 | null, | ||
117 | int.MaxValue); | ||
118 | } | ||
119 | } | ||
108 | } | 120 | } |
109 | 121 | ||
110 | public void PostInitialise() | 122 | public void PostInitialise() |
@@ -122,24 +134,152 @@ namespace OpenSim.Region.ClientStack.Linden | |||
122 | 134 | ||
123 | #endregion | 135 | #endregion |
124 | 136 | ||
125 | public void RegisterCaps(UUID agentID, Caps caps) | 137 | ~GetTextureModule() |
138 | { | ||
139 | foreach (Thread t in m_workerThreads) | ||
140 | Watchdog.AbortThread(t.ManagedThreadId); | ||
141 | |||
142 | } | ||
143 | |||
144 | private class PollServiceTextureEventArgs : PollServiceEventArgs | ||
145 | { | ||
146 | private List<Hashtable> requests = | ||
147 | new List<Hashtable>(); | ||
148 | private Dictionary<UUID, Hashtable> responses = | ||
149 | new Dictionary<UUID, Hashtable>(); | ||
150 | |||
151 | private Scene m_scene; | ||
152 | |||
153 | public PollServiceTextureEventArgs(UUID pId, Scene scene) : | ||
154 | base(null, null, null, null, pId, int.MaxValue) | ||
155 | { | ||
156 | m_scene = scene; | ||
157 | |||
158 | HasEvents = (x, y) => | ||
159 | { | ||
160 | lock (responses) | ||
161 | return responses.ContainsKey(x); | ||
162 | }; | ||
163 | GetEvents = (x, y) => | ||
164 | { | ||
165 | lock (responses) | ||
166 | { | ||
167 | try | ||
168 | { | ||
169 | return responses[x]; | ||
170 | } | ||
171 | finally | ||
172 | { | ||
173 | responses.Remove(x); | ||
174 | } | ||
175 | } | ||
176 | }; | ||
177 | |||
178 | Request = (x, y) => | ||
179 | { | ||
180 | aPollRequest reqinfo = new aPollRequest(); | ||
181 | reqinfo.thepoll = this; | ||
182 | reqinfo.reqID = x; | ||
183 | reqinfo.request = y; | ||
184 | |||
185 | m_queue.Enqueue(reqinfo); | ||
186 | }; | ||
187 | |||
188 | // this should never happen except possible on shutdown | ||
189 | NoEvents = (x, y) => | ||
190 | { | ||
191 | /* | ||
192 | lock (requests) | ||
193 | { | ||
194 | Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString()); | ||
195 | requests.Remove(request); | ||
196 | } | ||
197 | */ | ||
198 | Hashtable response = new Hashtable(); | ||
199 | |||
200 | response["int_response_code"] = 500; | ||
201 | response["str_response_string"] = "Script timeout"; | ||
202 | response["content_type"] = "text/plain"; | ||
203 | response["keepalive"] = false; | ||
204 | response["reusecontext"] = false; | ||
205 | |||
206 | return response; | ||
207 | }; | ||
208 | } | ||
209 | |||
210 | public void Process(aPollRequest requestinfo) | ||
211 | { | ||
212 | Hashtable response; | ||
213 | |||
214 | UUID requestID = requestinfo.reqID; | ||
215 | |||
216 | // If the avatar is gone, don't bother to get the texture | ||
217 | if (m_scene.GetScenePresence(Id) == null) | ||
218 | { | ||
219 | response = new Hashtable(); | ||
220 | |||
221 | response["int_response_code"] = 500; | ||
222 | response["str_response_string"] = "Script timeout"; | ||
223 | response["content_type"] = "text/plain"; | ||
224 | response["keepalive"] = false; | ||
225 | response["reusecontext"] = false; | ||
226 | |||
227 | lock (responses) | ||
228 | responses[requestID] = response; | ||
229 | |||
230 | return; | ||
231 | } | ||
232 | |||
233 | response = m_getTextureHandler.Handle(requestinfo.request); | ||
234 | lock (responses) | ||
235 | responses[requestID] = response; | ||
236 | } | ||
237 | } | ||
238 | |||
239 | private void RegisterCaps(UUID agentID, Caps caps) | ||
126 | { | 240 | { |
127 | UUID capID = UUID.Random(); | 241 | string capUrl = "/CAPS/" + UUID.Random() + "/"; |
242 | |||
243 | // Register this as a poll service | ||
244 | PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene); | ||
245 | |||
246 | args.Type = PollServiceEventArgs.EventType.Texture; | ||
247 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); | ||
128 | 248 | ||
129 | //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); | 249 | string hostName = m_scene.RegionInfo.ExternalHostName; |
130 | if (m_URL == "localhost") | 250 | uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port; |
251 | string protocol = "http"; | ||
252 | |||
253 | if (MainServer.Instance.UseSSL) | ||
131 | { | 254 | { |
132 | // m_log.DebugFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); | 255 | hostName = MainServer.Instance.SSLCommonName; |
133 | caps.RegisterHandler( | 256 | port = MainServer.Instance.SSLPort; |
134 | "GetTexture", | 257 | protocol = "https"; |
135 | new GetTextureHandler("/CAPS/" + capID + "/", m_assetService, "GetTexture", agentID.ToString())); | ||
136 | } | 258 | } |
137 | else | 259 | caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); |
260 | |||
261 | m_capsDict[agentID] = capUrl; | ||
262 | } | ||
263 | |||
264 | private void DeregisterCaps(UUID agentID, Caps caps) | ||
265 | { | ||
266 | string capUrl; | ||
267 | |||
268 | if (m_capsDict.TryGetValue(agentID, out capUrl)) | ||
138 | { | 269 | { |
139 | // m_log.DebugFormat("[GETTEXTURE]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName); | 270 | MainServer.Instance.RemoveHTTPHandler("", capUrl); |
140 | caps.RegisterHandler("GetTexture", m_URL); | 271 | m_capsDict.Remove(agentID); |
141 | } | 272 | } |
142 | } | 273 | } |
143 | 274 | ||
275 | private void DoTextureRequests() | ||
276 | { | ||
277 | while (true) | ||
278 | { | ||
279 | aPollRequest poolreq = m_queue.Dequeue(); | ||
280 | |||
281 | poolreq.thepoll.Process(poolreq); | ||
282 | } | ||
283 | } | ||
144 | } | 284 | } |
145 | } | 285 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs index 44a6883..0251ac4 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(m_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"] = m_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(); |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs deleted file mode 100644 index c03e6e6..0000000 --- a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs +++ /dev/null | |||
@@ -1,296 +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 | |||
48 | namespace OpenSim.Region.ClientStack.Linden | ||
49 | { | ||
50 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | ||
51 | public class NewFileAgentInventoryVariablePriceModule : INonSharedRegionModule | ||
52 | { | ||
53 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
54 | |||
55 | private Scene m_scene; | ||
56 | // private IAssetService m_assetService; | ||
57 | private bool m_dumpAssetsToFile = false; | ||
58 | private bool m_enabled = true; | ||
59 | private int m_levelUpload = 0; | ||
60 | |||
61 | #region Region Module interfaceBase Members | ||
62 | |||
63 | |||
64 | public Type ReplaceableInterface | ||
65 | { | ||
66 | get { return null; } | ||
67 | } | ||
68 | |||
69 | public void Initialise(IConfigSource source) | ||
70 | { | ||
71 | IConfig meshConfig = source.Configs["Mesh"]; | ||
72 | if (meshConfig == null) | ||
73 | return; | ||
74 | |||
75 | m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true); | ||
76 | m_levelUpload = meshConfig.GetInt("LevelUpload", 0); | ||
77 | } | ||
78 | |||
79 | public void AddRegion(Scene pScene) | ||
80 | { | ||
81 | m_scene = pScene; | ||
82 | } | ||
83 | |||
84 | public void RemoveRegion(Scene scene) | ||
85 | { | ||
86 | |||
87 | m_scene.EventManager.OnRegisterCaps -= RegisterCaps; | ||
88 | m_scene = null; | ||
89 | } | ||
90 | |||
91 | public void RegionLoaded(Scene scene) | ||
92 | { | ||
93 | |||
94 | // m_assetService = m_scene.RequestModuleInterface<IAssetService>(); | ||
95 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | ||
96 | } | ||
97 | |||
98 | #endregion | ||
99 | |||
100 | |||
101 | #region Region Module interface | ||
102 | |||
103 | |||
104 | |||
105 | public void Close() { } | ||
106 | |||
107 | public string Name { get { return "NewFileAgentInventoryVariablePriceModule"; } } | ||
108 | |||
109 | |||
110 | public void RegisterCaps(UUID agentID, Caps caps) | ||
111 | { | ||
112 | if(!m_enabled) | ||
113 | return; | ||
114 | |||
115 | UUID capID = UUID.Random(); | ||
116 | |||
117 | // m_log.Debug("[NEW FILE AGENT INVENTORY VARIABLE PRICE]: /CAPS/" + capID); | ||
118 | caps.RegisterHandler( | ||
119 | "NewFileAgentInventoryVariablePrice", | ||
120 | new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDNewFileAngentInventoryVariablePriceReplyResponse>( | ||
121 | "POST", | ||
122 | "/CAPS/" + capID.ToString(), | ||
123 | req => NewAgentInventoryRequest(req, agentID), | ||
124 | "NewFileAgentInventoryVariablePrice", | ||
125 | agentID.ToString())); | ||
126 | } | ||
127 | |||
128 | #endregion | ||
129 | |||
130 | public LLSDNewFileAngentInventoryVariablePriceReplyResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest, UUID agentID) | ||
131 | { | ||
132 | //TODO: The Mesh uploader uploads many types of content. If you're going to implement a Money based limit | ||
133 | // you need to be aware of this | ||
134 | |||
135 | //if (llsdRequest.asset_type == "texture" || | ||
136 | // llsdRequest.asset_type == "animation" || | ||
137 | // llsdRequest.asset_type == "sound") | ||
138 | // { | ||
139 | // check user level | ||
140 | |||
141 | ScenePresence avatar = null; | ||
142 | IClientAPI client = null; | ||
143 | m_scene.TryGetScenePresence(agentID, out avatar); | ||
144 | |||
145 | if (avatar != null) | ||
146 | { | ||
147 | client = avatar.ControllingClient; | ||
148 | |||
149 | if (avatar.UserLevel < m_levelUpload) | ||
150 | { | ||
151 | if (client != null) | ||
152 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false); | ||
153 | |||
154 | LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse(); | ||
155 | errorResponse.rsvp = ""; | ||
156 | errorResponse.state = "error"; | ||
157 | return errorResponse; | ||
158 | } | ||
159 | } | ||
160 | |||
161 | // check funds | ||
162 | IMoneyModule mm = m_scene.RequestModuleInterface<IMoneyModule>(); | ||
163 | |||
164 | if (mm != null) | ||
165 | { | ||
166 | if (!mm.UploadCovered(agentID, mm.UploadCharge)) | ||
167 | { | ||
168 | if (client != null) | ||
169 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); | ||
170 | |||
171 | LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse(); | ||
172 | errorResponse.rsvp = ""; | ||
173 | errorResponse.state = "error"; | ||
174 | return errorResponse; | ||
175 | } | ||
176 | } | ||
177 | |||
178 | // } | ||
179 | |||
180 | string assetName = llsdRequest.name; | ||
181 | string assetDes = llsdRequest.description; | ||
182 | string capsBase = "/CAPS/NewFileAgentInventoryVariablePrice/"; | ||
183 | UUID newAsset = UUID.Random(); | ||
184 | UUID newInvItem = UUID.Random(); | ||
185 | UUID parentFolder = llsdRequest.folder_id; | ||
186 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000") + "/"; | ||
187 | |||
188 | AssetUploader uploader = | ||
189 | new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type, | ||
190 | llsdRequest.asset_type, capsBase + uploaderPath, MainServer.Instance, m_dumpAssetsToFile); | ||
191 | |||
192 | MainServer.Instance.AddStreamHandler( | ||
193 | new BinaryStreamHandler( | ||
194 | "POST", | ||
195 | capsBase + uploaderPath, | ||
196 | uploader.uploaderCaps, | ||
197 | "NewFileAgentInventoryVariablePrice", | ||
198 | agentID.ToString())); | ||
199 | |||
200 | string protocol = "http://"; | ||
201 | |||
202 | if (MainServer.Instance.UseSSL) | ||
203 | protocol = "https://"; | ||
204 | |||
205 | string uploaderURL = protocol + m_scene.RegionInfo.ExternalHostName + ":" + MainServer.Instance.Port.ToString() + capsBase + | ||
206 | uploaderPath; | ||
207 | |||
208 | |||
209 | LLSDNewFileAngentInventoryVariablePriceReplyResponse uploadResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse(); | ||
210 | |||
211 | uploadResponse.rsvp = uploaderURL; | ||
212 | uploadResponse.state = "upload"; | ||
213 | uploadResponse.resource_cost = 0; | ||
214 | uploadResponse.upload_price = 0; | ||
215 | |||
216 | uploader.OnUpLoad += //UploadCompleteHandler; | ||
217 | |||
218 | delegate( | ||
219 | string passetName, string passetDescription, UUID passetID, | ||
220 | UUID pinventoryItem, UUID pparentFolder, byte[] pdata, string pinventoryType, | ||
221 | string passetType) | ||
222 | { | ||
223 | UploadCompleteHandler(passetName, passetDescription, passetID, | ||
224 | pinventoryItem, pparentFolder, pdata, pinventoryType, | ||
225 | passetType,agentID); | ||
226 | }; | ||
227 | |||
228 | return uploadResponse; | ||
229 | } | ||
230 | |||
231 | public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID, | ||
232 | UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType, | ||
233 | string assetType,UUID AgentID) | ||
234 | { | ||
235 | // m_log.DebugFormat( | ||
236 | // "[NEW FILE AGENT INVENTORY VARIABLE PRICE MODULE]: Upload complete for {0}", inventoryItem); | ||
237 | |||
238 | sbyte assType = 0; | ||
239 | sbyte inType = 0; | ||
240 | |||
241 | if (inventoryType == "sound") | ||
242 | { | ||
243 | inType = 1; | ||
244 | assType = 1; | ||
245 | } | ||
246 | else if (inventoryType == "animation") | ||
247 | { | ||
248 | inType = 19; | ||
249 | assType = 20; | ||
250 | } | ||
251 | else if (inventoryType == "wearable") | ||
252 | { | ||
253 | inType = 18; | ||
254 | switch (assetType) | ||
255 | { | ||
256 | case "bodypart": | ||
257 | assType = 13; | ||
258 | break; | ||
259 | case "clothing": | ||
260 | assType = 5; | ||
261 | break; | ||
262 | } | ||
263 | } | ||
264 | else if (inventoryType == "mesh") | ||
265 | { | ||
266 | inType = (sbyte)InventoryType.Mesh; | ||
267 | assType = (sbyte)AssetType.Mesh; | ||
268 | } | ||
269 | |||
270 | AssetBase asset; | ||
271 | asset = new AssetBase(assetID, assetName, assType, AgentID.ToString()); | ||
272 | asset.Data = data; | ||
273 | |||
274 | if (m_scene.AssetService != null) | ||
275 | m_scene.AssetService.Store(asset); | ||
276 | |||
277 | InventoryItemBase item = new InventoryItemBase(); | ||
278 | item.Owner = AgentID; | ||
279 | item.CreatorId = AgentID.ToString(); | ||
280 | item.ID = inventoryItem; | ||
281 | item.AssetID = asset.FullID; | ||
282 | item.Description = assetDescription; | ||
283 | item.Name = assetName; | ||
284 | item.AssetType = assType; | ||
285 | item.InvType = inType; | ||
286 | item.Folder = parentFolder; | ||
287 | item.CurrentPermissions | ||
288 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer); | ||
289 | item.BasePermissions = (uint)PermissionMask.All; | ||
290 | item.EveryOnePermissions = 0; | ||
291 | item.NextPermissions = (uint)PermissionMask.All; | ||
292 | item.CreationDate = Util.UnixTimeSinceEpoch(); | ||
293 | m_scene.AddInventoryItem(item); | ||
294 | } | ||
295 | } | ||
296 | } | ||
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs index 17c7270..fcac182 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/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 2359bd6..0caeddf 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -27,18 +27,22 @@ | |||
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; |
39 | using OpenSim.Services.Interfaces; | 42 | using OpenSim.Services.Interfaces; |
40 | using Caps = OpenSim.Framework.Capabilities.Caps; | 43 | using Caps = OpenSim.Framework.Capabilities.Caps; |
41 | using OpenSim.Capabilities.Handlers; | 44 | using OpenSim.Capabilities.Handlers; |
45 | using OpenSim.Framework.Monitoring; | ||
42 | 46 | ||
43 | namespace OpenSim.Region.ClientStack.Linden | 47 | namespace OpenSim.Region.ClientStack.Linden |
44 | { | 48 | { |
@@ -48,67 +52,72 @@ namespace OpenSim.Region.ClientStack.Linden | |||
48 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 52 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
49 | public class WebFetchInvDescModule : INonSharedRegionModule | 53 | public class WebFetchInvDescModule : INonSharedRegionModule |
50 | { | 54 | { |
51 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 55 | struct aPollRequest |
56 | { | ||
57 | public PollServiceInventoryEventArgs thepoll; | ||
58 | public UUID reqID; | ||
59 | public Hashtable request; | ||
60 | } | ||
61 | |||
62 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
52 | 63 | ||
53 | private Scene m_scene; | 64 | private Scene m_scene; |
54 | 65 | ||
55 | private IInventoryService m_InventoryService; | 66 | private IInventoryService m_InventoryService; |
56 | private ILibraryService m_LibraryService; | 67 | private ILibraryService m_LibraryService; |
57 | 68 | ||
58 | private bool m_Enabled; | 69 | private static WebFetchInvDescHandler m_webFetchHandler; |
59 | 70 | ||
60 | private string m_fetchInventoryDescendents2Url; | 71 | private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>(); |
61 | private string m_webFetchInventoryDescendentsUrl; | 72 | private static Thread[] m_workerThreads = null; |
62 | 73 | ||
63 | private WebFetchInvDescHandler m_webFetchHandler; | 74 | private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue = |
75 | new OpenMetaverse.BlockingQueue<aPollRequest>(); | ||
64 | 76 | ||
65 | #region ISharedRegionModule Members | 77 | #region ISharedRegionModule Members |
66 | 78 | ||
67 | public void Initialise(IConfigSource source) | 79 | public void Initialise(IConfigSource source) |
68 | { | 80 | { |
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 | } | 81 | } |
81 | 82 | ||
82 | public void AddRegion(Scene s) | 83 | public void AddRegion(Scene s) |
83 | { | 84 | { |
84 | if (!m_Enabled) | ||
85 | return; | ||
86 | |||
87 | m_scene = s; | 85 | m_scene = s; |
88 | } | 86 | } |
89 | 87 | ||
90 | public void RemoveRegion(Scene s) | 88 | public void RemoveRegion(Scene s) |
91 | { | 89 | { |
92 | if (!m_Enabled) | ||
93 | return; | ||
94 | |||
95 | m_scene.EventManager.OnRegisterCaps -= RegisterCaps; | 90 | m_scene.EventManager.OnRegisterCaps -= RegisterCaps; |
91 | m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps; | ||
96 | m_scene = null; | 92 | m_scene = null; |
97 | } | 93 | } |
98 | 94 | ||
99 | public void RegionLoaded(Scene s) | 95 | public void RegionLoaded(Scene s) |
100 | { | 96 | { |
101 | if (!m_Enabled) | ||
102 | return; | ||
103 | |||
104 | m_InventoryService = m_scene.InventoryService; | 97 | m_InventoryService = m_scene.InventoryService; |
105 | m_LibraryService = m_scene.LibraryService; | 98 | m_LibraryService = m_scene.LibraryService; |
106 | 99 | ||
107 | // We'll reuse the same handler for all requests. | 100 | // We'll reuse the same handler for all requests. |
108 | if (m_fetchInventoryDescendents2Url == "localhost" || m_webFetchInventoryDescendentsUrl == "localhost") | 101 | m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService); |
109 | m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService); | ||
110 | 102 | ||
111 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | 103 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; |
104 | m_scene.EventManager.OnDeregisterCaps += DeregisterCaps; | ||
105 | |||
106 | if (m_workerThreads == null) | ||
107 | { | ||
108 | m_workerThreads = new Thread[2]; | ||
109 | |||
110 | for (uint i = 0; i < 2; i++) | ||
111 | { | ||
112 | m_workerThreads[i] = Watchdog.StartThread(DoInventoryRequests, | ||
113 | String.Format("InventoryWorkerThread{0}", i), | ||
114 | ThreadPriority.Normal, | ||
115 | false, | ||
116 | true, | ||
117 | null, | ||
118 | int.MaxValue); | ||
119 | } | ||
120 | } | ||
112 | } | 121 | } |
113 | 122 | ||
114 | public void PostInitialise() | 123 | public void PostInitialise() |
@@ -126,43 +135,130 @@ namespace OpenSim.Region.ClientStack.Linden | |||
126 | 135 | ||
127 | #endregion | 136 | #endregion |
128 | 137 | ||
129 | private void RegisterCaps(UUID agentID, Caps caps) | 138 | ~WebFetchInvDescModule() |
130 | { | 139 | { |
131 | if (m_webFetchInventoryDescendentsUrl != "") | 140 | foreach (Thread t in m_workerThreads) |
132 | RegisterFetchCap(agentID, caps, "WebFetchInventoryDescendents", m_webFetchInventoryDescendentsUrl); | 141 | Watchdog.AbortThread(t.ManagedThreadId); |
133 | |||
134 | if (m_fetchInventoryDescendents2Url != "") | ||
135 | RegisterFetchCap(agentID, caps, "FetchInventoryDescendents2", m_fetchInventoryDescendents2Url); | ||
136 | } | 142 | } |
137 | 143 | ||
138 | private void RegisterFetchCap(UUID agentID, Caps caps, string capName, string url) | 144 | private class PollServiceInventoryEventArgs : PollServiceEventArgs |
139 | { | 145 | { |
140 | string capUrl; | 146 | private Dictionary<UUID, Hashtable> responses = |
147 | new Dictionary<UUID, Hashtable>(); | ||
148 | |||
149 | public PollServiceInventoryEventArgs(UUID pId) : | ||
150 | base(null, null, null, null, pId, int.MaxValue) | ||
151 | { | ||
152 | HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); }; | ||
153 | GetEvents = (x, y) => | ||
154 | { | ||
155 | lock (responses) | ||
156 | { | ||
157 | try | ||
158 | { | ||
159 | return responses[x]; | ||
160 | } | ||
161 | finally | ||
162 | { | ||
163 | responses.Remove(x); | ||
164 | } | ||
165 | } | ||
166 | }; | ||
167 | |||
168 | Request = (x, y) => | ||
169 | { | ||
170 | aPollRequest reqinfo = new aPollRequest(); | ||
171 | reqinfo.thepoll = this; | ||
172 | reqinfo.reqID = x; | ||
173 | reqinfo.request = y; | ||
174 | |||
175 | m_queue.Enqueue(reqinfo); | ||
176 | }; | ||
177 | |||
178 | NoEvents = (x, y) => | ||
179 | { | ||
180 | /* | ||
181 | lock (requests) | ||
182 | { | ||
183 | Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString()); | ||
184 | requests.Remove(request); | ||
185 | } | ||
186 | */ | ||
187 | Hashtable response = new Hashtable(); | ||
188 | |||
189 | response["int_response_code"] = 500; | ||
190 | response["str_response_string"] = "Script timeout"; | ||
191 | response["content_type"] = "text/plain"; | ||
192 | response["keepalive"] = false; | ||
193 | response["reusecontext"] = false; | ||
194 | |||
195 | return response; | ||
196 | }; | ||
197 | } | ||
141 | 198 | ||
142 | if (url == "localhost") | 199 | public void Process(aPollRequest requestinfo) |
143 | { | 200 | { |
144 | capUrl = "/CAPS/" + UUID.Random(); | 201 | UUID requestID = requestinfo.reqID; |
202 | |||
203 | Hashtable response = new Hashtable(); | ||
204 | |||
205 | response["int_response_code"] = 200; | ||
206 | response["content_type"] = "text/plain"; | ||
207 | response["keepalive"] = false; | ||
208 | response["reusecontext"] = false; | ||
145 | 209 | ||
146 | IRequestHandler reqHandler | 210 | response["str_response_string"] = m_webFetchHandler.FetchInventoryDescendentsRequest( |
147 | = new RestStreamHandler( | 211 | requestinfo.request["body"].ToString(), String.Empty, String.Empty, null, null); |
148 | "POST", | ||
149 | capUrl, | ||
150 | m_webFetchHandler.FetchInventoryDescendentsRequest, | ||
151 | "FetchInventoryDescendents2", | ||
152 | agentID.ToString()); | ||
153 | 212 | ||
154 | caps.RegisterHandler(capName, reqHandler); | 213 | lock (responses) |
214 | responses[requestID] = response; | ||
155 | } | 215 | } |
156 | else | 216 | } |
217 | |||
218 | private void RegisterCaps(UUID agentID, Caps caps) | ||
219 | { | ||
220 | string capUrl = "/CAPS/" + UUID.Random() + "/"; | ||
221 | |||
222 | // Register this as a poll service | ||
223 | PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(agentID); | ||
224 | |||
225 | args.Type = PollServiceEventArgs.EventType.Inventory; | ||
226 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); | ||
227 | |||
228 | string hostName = m_scene.RegionInfo.ExternalHostName; | ||
229 | uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port; | ||
230 | string protocol = "http"; | ||
231 | |||
232 | if (MainServer.Instance.UseSSL) | ||
157 | { | 233 | { |
158 | capUrl = url; | 234 | hostName = MainServer.Instance.SSLCommonName; |
235 | port = MainServer.Instance.SSLPort; | ||
236 | protocol = "https"; | ||
237 | } | ||
238 | caps.RegisterHandler("FetchInventoryDescendents2", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); | ||
239 | |||
240 | m_capsDict[agentID] = capUrl; | ||
241 | } | ||
159 | 242 | ||
160 | caps.RegisterHandler(capName, capUrl); | 243 | private void DeregisterCaps(UUID agentID, Caps caps) |
244 | { | ||
245 | string capUrl; | ||
246 | |||
247 | if (m_capsDict.TryGetValue(agentID, out capUrl)) | ||
248 | { | ||
249 | MainServer.Instance.RemoveHTTPHandler("", capUrl); | ||
250 | m_capsDict.Remove(agentID); | ||
161 | } | 251 | } |
252 | } | ||
162 | 253 | ||
163 | // m_log.DebugFormat( | 254 | private void DoInventoryRequests() |
164 | // "[WEB FETCH INV DESC MODULE]: Registered capability {0} at {1} in region {2} for {3}", | 255 | { |
165 | // capName, capUrl, m_scene.RegionInfo.RegionName, agentID); | 256 | while (true) |
257 | { | ||
258 | aPollRequest poolreq = m_queue.Dequeue(); | ||
259 | |||
260 | poolreq.thepoll.Process(poolreq); | ||
261 | } | ||
166 | } | 262 | } |
167 | } | 263 | } |
168 | } \ No newline at end of file | 264 | } |