diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 883 |
1 files changed, 744 insertions, 139 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index a4fe81c..613bc24 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Timers; | ||
29 | using System.Collections; | 30 | using System.Collections; |
30 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
31 | using System.IO; | 32 | using System.IO; |
@@ -54,14 +55,16 @@ using PermissionMask = OpenSim.Framework.PermissionMask; | |||
54 | namespace OpenSim.Region.ClientStack.Linden | 55 | namespace OpenSim.Region.ClientStack.Linden |
55 | { | 56 | { |
56 | public delegate void UpLoadedAsset( | 57 | public delegate void UpLoadedAsset( |
57 | string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder, | 58 | string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder, |
58 | byte[] data, string inventoryType, string assetType); | 59 | byte[] data, string inventoryType, string assetType, |
60 | int cost, UUID texturesFolder, int nreqtextures, int nreqmeshs, int nreqinstances, | ||
61 | bool IsAtestUpload, ref string error); | ||
59 | 62 | ||
60 | public delegate UUID UpdateItem(UUID itemID, byte[] data); | 63 | public delegate UUID UpdateItem(UUID itemID, byte[] data); |
61 | 64 | ||
62 | public delegate void UpdateTaskScript(UUID itemID, UUID primID, bool isScriptRunning, byte[] data, ref ArrayList errors); | 65 | public delegate void UpdateTaskScript(UUID itemID, UUID primID, bool isScriptRunning, byte[] data, ref ArrayList errors); |
63 | 66 | ||
64 | public delegate void NewInventoryItem(UUID userID, InventoryItemBase item); | 67 | public delegate void NewInventoryItem(UUID userID, InventoryItemBase item, uint cost); |
65 | 68 | ||
66 | public delegate void NewAsset(AssetBase asset); | 69 | public delegate void NewAsset(AssetBase asset); |
67 | 70 | ||
@@ -87,6 +90,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
87 | 90 | ||
88 | private Scene m_Scene; | 91 | private Scene m_Scene; |
89 | private Caps m_HostCapsObj; | 92 | private Caps m_HostCapsObj; |
93 | private ModelCost m_ModelCost; | ||
90 | 94 | ||
91 | private static readonly string m_requestPath = "0000/"; | 95 | private static readonly string m_requestPath = "0000/"; |
92 | // private static readonly string m_mapLayerPath = "0001/"; | 96 | // private static readonly string m_mapLayerPath = "0001/"; |
@@ -98,7 +102,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
98 | private static readonly string m_copyFromNotecardPath = "0007/"; | 102 | private static readonly string m_copyFromNotecardPath = "0007/"; |
99 | // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule. | 103 | // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule. |
100 | private static readonly string m_getObjectPhysicsDataPath = "0101/"; | 104 | private static readonly string m_getObjectPhysicsDataPath = "0101/"; |
101 | /* 0102 - 0103 RESERVED */ | 105 | private static readonly string m_getObjectCostPath = "0102/"; |
106 | private static readonly string m_ResourceCostSelectedPath = "0103/"; | ||
102 | private static readonly string m_UpdateAgentInformationPath = "0500/"; | 107 | private static readonly string m_UpdateAgentInformationPath = "0500/"; |
103 | 108 | ||
104 | // These are callbacks which will be setup by the scene so that we can update scene data when we | 109 | // These are callbacks which will be setup by the scene so that we can update scene data when we |
@@ -114,12 +119,50 @@ namespace OpenSim.Region.ClientStack.Linden | |||
114 | private IAssetService m_assetService; | 119 | private IAssetService m_assetService; |
115 | private bool m_dumpAssetsToFile = false; | 120 | private bool m_dumpAssetsToFile = false; |
116 | private string m_regionName; | 121 | private string m_regionName; |
122 | |||
117 | private int m_levelUpload = 0; | 123 | private int m_levelUpload = 0; |
118 | 124 | ||
125 | private bool m_enableFreeTestUpload = false; // allows "TEST-" prefix hack | ||
126 | private bool m_ForceFreeTestUpload = false; // forces all uploads to be test | ||
127 | |||
128 | private bool m_enableModelUploadTextureToInventory = false; // place uploaded textures also in inventory | ||
129 | // may not be visible till relog | ||
130 | |||
131 | private bool m_RestrictFreeTestUploadPerms = false; // reduces also the permitions. Needs a creator defined!! | ||
132 | private UUID m_testAssetsCreatorID = UUID.Zero; | ||
133 | |||
134 | private float m_PrimScaleMin = 0.001f; | ||
135 | |||
136 | private enum FileAgentInventoryState : int | ||
137 | { | ||
138 | idle = 0, | ||
139 | processRequest = 1, | ||
140 | waitUpload = 2, | ||
141 | processUpload = 3 | ||
142 | } | ||
143 | private FileAgentInventoryState m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
144 | |||
119 | public BunchOfCaps(Scene scene, Caps caps) | 145 | public BunchOfCaps(Scene scene, Caps caps) |
120 | { | 146 | { |
121 | m_Scene = scene; | 147 | m_Scene = scene; |
122 | m_HostCapsObj = caps; | 148 | m_HostCapsObj = caps; |
149 | |||
150 | // create a model upload cost provider | ||
151 | m_ModelCost = new ModelCost(); | ||
152 | // tell it about scene object limits | ||
153 | m_ModelCost.NonPhysicalPrimScaleMax = m_Scene.m_maxNonphys; | ||
154 | m_ModelCost.PhysicalPrimScaleMax = m_Scene.m_maxPhys; | ||
155 | |||
156 | // m_ModelCost.ObjectLinkedPartsMax = ?? | ||
157 | // m_ModelCost.PrimScaleMin = ?? | ||
158 | |||
159 | m_PrimScaleMin = m_ModelCost.PrimScaleMin; | ||
160 | float modelTextureUploadFactor = m_ModelCost.ModelTextureCostFactor; | ||
161 | float modelUploadFactor = m_ModelCost.ModelMeshCostFactor; | ||
162 | float modelMinUploadCostFactor = m_ModelCost.ModelMinCostFactor; | ||
163 | float modelPrimCreationCost = m_ModelCost.primCreationCost; | ||
164 | float modelMeshByteCost = m_ModelCost.bytecost; | ||
165 | |||
123 | IConfigSource config = m_Scene.Config; | 166 | IConfigSource config = m_Scene.Config; |
124 | if (config != null) | 167 | if (config != null) |
125 | { | 168 | { |
@@ -134,6 +177,37 @@ namespace OpenSim.Region.ClientStack.Linden | |||
134 | { | 177 | { |
135 | m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures); | 178 | m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures); |
136 | } | 179 | } |
180 | // economy for model upload | ||
181 | IConfig EconomyConfig = config.Configs["Economy"]; | ||
182 | if (EconomyConfig != null) | ||
183 | { | ||
184 | modelUploadFactor = EconomyConfig.GetFloat("MeshModelUploadCostFactor", modelUploadFactor); | ||
185 | modelTextureUploadFactor = EconomyConfig.GetFloat("MeshModelUploadTextureCostFactor", modelTextureUploadFactor); | ||
186 | modelMinUploadCostFactor = EconomyConfig.GetFloat("MeshModelMinCostFactor", modelMinUploadCostFactor); | ||
187 | // next 2 are normalized so final cost is afected by modelUploadFactor above and normal cost | ||
188 | modelPrimCreationCost = EconomyConfig.GetFloat("ModelPrimCreationCost", modelPrimCreationCost); | ||
189 | modelMeshByteCost = EconomyConfig.GetFloat("ModelMeshByteCost", modelMeshByteCost); | ||
190 | |||
191 | m_enableModelUploadTextureToInventory = EconomyConfig.GetBoolean("MeshModelAllowTextureToInventory", m_enableModelUploadTextureToInventory); | ||
192 | |||
193 | m_RestrictFreeTestUploadPerms = EconomyConfig.GetBoolean("m_RestrictFreeTestUploadPerms", m_RestrictFreeTestUploadPerms); | ||
194 | m_enableFreeTestUpload = EconomyConfig.GetBoolean("AllowFreeTestUpload", m_enableFreeTestUpload); | ||
195 | m_ForceFreeTestUpload = EconomyConfig.GetBoolean("ForceFreeTestUpload", m_ForceFreeTestUpload); | ||
196 | string testcreator = EconomyConfig.GetString("TestAssetsCreatorID", ""); | ||
197 | if (testcreator != "") | ||
198 | { | ||
199 | UUID id; | ||
200 | UUID.TryParse(testcreator, out id); | ||
201 | if (id != null) | ||
202 | m_testAssetsCreatorID = id; | ||
203 | } | ||
204 | |||
205 | m_ModelCost.ModelMeshCostFactor = modelUploadFactor; | ||
206 | m_ModelCost.ModelTextureCostFactor = modelTextureUploadFactor; | ||
207 | m_ModelCost.ModelMinCostFactor = modelMinUploadCostFactor; | ||
208 | m_ModelCost.primCreationCost = modelPrimCreationCost; | ||
209 | m_ModelCost.bytecost = modelMeshByteCost; | ||
210 | } | ||
137 | } | 211 | } |
138 | 212 | ||
139 | m_assetService = m_Scene.AssetService; | 213 | m_assetService = m_Scene.AssetService; |
@@ -145,6 +219,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
145 | ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; | 219 | ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; |
146 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; | 220 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; |
147 | GetClient = m_Scene.SceneGraph.GetControllingClient; | 221 | GetClient = m_Scene.SceneGraph.GetControllingClient; |
222 | |||
223 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
148 | } | 224 | } |
149 | 225 | ||
150 | /// <summary> | 226 | /// <summary> |
@@ -190,7 +266,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
190 | { | 266 | { |
191 | try | 267 | try |
192 | { | 268 | { |
193 | // I don't think this one works... | ||
194 | m_HostCapsObj.RegisterHandler( | 269 | m_HostCapsObj.RegisterHandler( |
195 | "NewFileAgentInventory", | 270 | "NewFileAgentInventory", |
196 | new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>( | 271 | new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>( |
@@ -212,6 +287,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
212 | = new RestStreamHandler( | 287 | = new RestStreamHandler( |
213 | "POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData, "GetObjectPhysicsData", null); | 288 | "POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData, "GetObjectPhysicsData", null); |
214 | m_HostCapsObj.RegisterHandler("GetObjectPhysicsData", getObjectPhysicsDataHandler); | 289 | m_HostCapsObj.RegisterHandler("GetObjectPhysicsData", getObjectPhysicsDataHandler); |
290 | IRequestHandler getObjectCostHandler = new RestStreamHandler("POST", capsBase + m_getObjectCostPath, GetObjectCost); | ||
291 | m_HostCapsObj.RegisterHandler("GetObjectCost", getObjectCostHandler); | ||
292 | IRequestHandler ResourceCostSelectedHandler = new RestStreamHandler("POST", capsBase + m_ResourceCostSelectedPath, ResourceCostSelected); | ||
293 | m_HostCapsObj.RegisterHandler("ResourceCostSelected", ResourceCostSelectedHandler); | ||
215 | 294 | ||
216 | IRequestHandler UpdateAgentInformationHandler | 295 | IRequestHandler UpdateAgentInformationHandler |
217 | = new RestStreamHandler( | 296 | = new RestStreamHandler( |
@@ -270,6 +349,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
270 | m_log.DebugFormat( | 349 | m_log.DebugFormat( |
271 | "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); | 350 | "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); |
272 | 351 | ||
352 | if (!m_HostCapsObj.WaitForActivation()) | ||
353 | return string.Empty; | ||
354 | |||
273 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) | 355 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) |
274 | { | 356 | { |
275 | m_log.WarnFormat( | 357 | m_log.WarnFormat( |
@@ -399,62 +481,176 @@ namespace OpenSim.Region.ClientStack.Linden | |||
399 | //m_log.Debug("[CAPS]: NewAgentInventoryRequest Request is: " + llsdRequest.ToString()); | 481 | //m_log.Debug("[CAPS]: NewAgentInventoryRequest Request is: " + llsdRequest.ToString()); |
400 | //m_log.Debug("asset upload request via CAPS" + llsdRequest.inventory_type + " , " + llsdRequest.asset_type); | 482 | //m_log.Debug("asset upload request via CAPS" + llsdRequest.inventory_type + " , " + llsdRequest.asset_type); |
401 | 483 | ||
484 | // start by getting the client | ||
485 | IClientAPI client = null; | ||
486 | m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client); | ||
487 | |||
488 | // check current state so we only have one service at a time | ||
489 | lock (m_ModelCost) | ||
490 | { | ||
491 | switch (m_FileAgentInventoryState) | ||
492 | { | ||
493 | case FileAgentInventoryState.processRequest: | ||
494 | case FileAgentInventoryState.processUpload: | ||
495 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); | ||
496 | resperror.message = "Uploader busy processing previus request"; | ||
497 | resperror.identifier = UUID.Zero; | ||
498 | |||
499 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); | ||
500 | errorResponse.uploader = ""; | ||
501 | errorResponse.state = "error"; | ||
502 | errorResponse.error = resperror; | ||
503 | return errorResponse; | ||
504 | break; | ||
505 | case FileAgentInventoryState.waitUpload: | ||
506 | // todo stop current uploader server | ||
507 | break; | ||
508 | case FileAgentInventoryState.idle: | ||
509 | default: | ||
510 | break; | ||
511 | } | ||
512 | |||
513 | m_FileAgentInventoryState = FileAgentInventoryState.processRequest; | ||
514 | } | ||
515 | |||
516 | int cost = 0; | ||
517 | int nreqtextures = 0; | ||
518 | int nreqmeshs= 0; | ||
519 | int nreqinstances = 0; | ||
520 | bool IsAtestUpload = false; | ||
521 | |||
522 | string assetName = llsdRequest.name; | ||
523 | |||
524 | LLSDAssetUploadResponseData meshcostdata = new LLSDAssetUploadResponseData(); | ||
525 | |||
402 | if (llsdRequest.asset_type == "texture" || | 526 | if (llsdRequest.asset_type == "texture" || |
403 | llsdRequest.asset_type == "animation" || | 527 | llsdRequest.asset_type == "animation" || |
528 | llsdRequest.asset_type == "mesh" || | ||
404 | llsdRequest.asset_type == "sound") | 529 | llsdRequest.asset_type == "sound") |
405 | { | 530 | { |
406 | ScenePresence avatar = null; | 531 | ScenePresence avatar = null; |
407 | IClientAPI client = null; | ||
408 | m_Scene.TryGetScenePresence(m_HostCapsObj.AgentID, out avatar); | 532 | m_Scene.TryGetScenePresence(m_HostCapsObj.AgentID, out avatar); |
409 | 533 | ||
410 | // check user level | 534 | // check user level |
411 | if (avatar != null) | 535 | if (avatar != null) |
412 | { | 536 | { |
413 | client = avatar.ControllingClient; | ||
414 | |||
415 | if (avatar.UserLevel < m_levelUpload) | 537 | if (avatar.UserLevel < m_levelUpload) |
416 | { | 538 | { |
417 | if (client != null) | 539 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); |
418 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false); | 540 | resperror.message = "Insufficient permissions to upload"; |
541 | resperror.identifier = UUID.Zero; | ||
419 | 542 | ||
420 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); | 543 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); |
421 | errorResponse.uploader = ""; | 544 | errorResponse.uploader = ""; |
422 | errorResponse.state = "error"; | 545 | errorResponse.state = "error"; |
546 | errorResponse.error = resperror; | ||
547 | lock (m_ModelCost) | ||
548 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
423 | return errorResponse; | 549 | return errorResponse; |
424 | } | 550 | } |
425 | } | 551 | } |
426 | 552 | ||
427 | // check funds | 553 | // check test upload and funds |
428 | if (client != null) | 554 | if (client != null) |
429 | { | 555 | { |
430 | IMoneyModule mm = m_Scene.RequestModuleInterface<IMoneyModule>(); | 556 | IMoneyModule mm = m_Scene.RequestModuleInterface<IMoneyModule>(); |
431 | 557 | ||
558 | int baseCost = 0; | ||
432 | if (mm != null) | 559 | if (mm != null) |
560 | baseCost = mm.UploadCharge; | ||
561 | |||
562 | string warning = String.Empty; | ||
563 | |||
564 | if (llsdRequest.asset_type == "mesh") | ||
433 | { | 565 | { |
434 | if (!mm.UploadCovered(client.AgentId, mm.UploadCharge)) | 566 | string error; |
567 | int modelcost; | ||
568 | |||
569 | if (!m_ModelCost.MeshModelCost(llsdRequest.asset_resources, baseCost, out modelcost, | ||
570 | meshcostdata, out error, ref warning)) | ||
435 | { | 571 | { |
436 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); | 572 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); |
573 | resperror.message = error; | ||
574 | resperror.identifier = UUID.Zero; | ||
437 | 575 | ||
438 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); | 576 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); |
439 | errorResponse.uploader = ""; | 577 | errorResponse.uploader = ""; |
440 | errorResponse.state = "error"; | 578 | errorResponse.state = "error"; |
579 | errorResponse.error = resperror; | ||
580 | |||
581 | lock (m_ModelCost) | ||
582 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
441 | return errorResponse; | 583 | return errorResponse; |
442 | } | 584 | } |
585 | cost = modelcost; | ||
586 | } | ||
587 | else | ||
588 | { | ||
589 | cost = baseCost; | ||
590 | } | ||
591 | |||
592 | if (cost > 0 && mm != null) | ||
593 | { | ||
594 | // check for test upload | ||
595 | |||
596 | if (m_ForceFreeTestUpload) // all are test | ||
597 | { | ||
598 | if (!(assetName.Length > 5 && assetName.StartsWith("TEST-"))) // has normal name lets change it | ||
599 | assetName = "TEST-" + assetName; | ||
600 | |||
601 | IsAtestUpload = true; | ||
602 | } | ||
603 | |||
604 | else if (m_enableFreeTestUpload) // only if prefixed with "TEST-" | ||
605 | { | ||
606 | |||
607 | IsAtestUpload = (assetName.Length > 5 && assetName.StartsWith("TEST-")); | ||
608 | } | ||
609 | |||
610 | |||
611 | if(IsAtestUpload) // let user know, still showing cost estimation | ||
612 | 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"; | ||
613 | |||
614 | // check funds | ||
615 | else | ||
616 | { | ||
617 | if (!mm.UploadCovered(client.AgentId, (int)cost)) | ||
618 | { | ||
619 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); | ||
620 | resperror.message = "Insuficient funds"; | ||
621 | resperror.identifier = UUID.Zero; | ||
622 | |||
623 | LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse(); | ||
624 | errorResponse.uploader = ""; | ||
625 | errorResponse.state = "error"; | ||
626 | errorResponse.error = resperror; | ||
627 | lock (m_ModelCost) | ||
628 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
629 | return errorResponse; | ||
630 | } | ||
631 | } | ||
443 | } | 632 | } |
633 | |||
634 | if (client != null && warning != String.Empty) | ||
635 | client.SendAgentAlertMessage(warning, true); | ||
444 | } | 636 | } |
445 | } | 637 | } |
446 | 638 | ||
447 | string assetName = llsdRequest.name; | ||
448 | string assetDes = llsdRequest.description; | 639 | string assetDes = llsdRequest.description; |
449 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; | 640 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; |
450 | UUID newAsset = UUID.Random(); | 641 | UUID newAsset = UUID.Random(); |
451 | UUID newInvItem = UUID.Random(); | 642 | UUID newInvItem = UUID.Random(); |
452 | UUID parentFolder = llsdRequest.folder_id; | 643 | UUID parentFolder = llsdRequest.folder_id; |
453 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); | 644 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); |
645 | UUID texturesFolder = UUID.Zero; | ||
646 | |||
647 | if(!IsAtestUpload && m_enableModelUploadTextureToInventory) | ||
648 | texturesFolder = llsdRequest.texture_folder_id; | ||
454 | 649 | ||
455 | AssetUploader uploader = | 650 | AssetUploader uploader = |
456 | new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type, | 651 | new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type, |
457 | llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile); | 652 | llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile, cost, |
653 | texturesFolder, nreqtextures, nreqmeshs, nreqinstances, IsAtestUpload); | ||
458 | 654 | ||
459 | m_HostCapsObj.HttpListener.AddStreamHandler( | 655 | m_HostCapsObj.HttpListener.AddStreamHandler( |
460 | new BinaryStreamHandler( | 656 | new BinaryStreamHandler( |
@@ -472,10 +668,22 @@ namespace OpenSim.Region.ClientStack.Linden | |||
472 | string uploaderURL = protocol + m_HostCapsObj.HostName + ":" + m_HostCapsObj.Port.ToString() + capsBase + | 668 | string uploaderURL = protocol + m_HostCapsObj.HostName + ":" + m_HostCapsObj.Port.ToString() + capsBase + |
473 | uploaderPath; | 669 | uploaderPath; |
474 | 670 | ||
671 | |||
475 | LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse(); | 672 | LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse(); |
476 | uploadResponse.uploader = uploaderURL; | 673 | uploadResponse.uploader = uploaderURL; |
477 | uploadResponse.state = "upload"; | 674 | uploadResponse.state = "upload"; |
675 | uploadResponse.upload_price = (int)cost; | ||
676 | |||
677 | if (llsdRequest.asset_type == "mesh") | ||
678 | { | ||
679 | uploadResponse.data = meshcostdata; | ||
680 | } | ||
681 | |||
478 | uploader.OnUpLoad += UploadCompleteHandler; | 682 | uploader.OnUpLoad += UploadCompleteHandler; |
683 | |||
684 | lock (m_ModelCost) | ||
685 | m_FileAgentInventoryState = FileAgentInventoryState.waitUpload; | ||
686 | |||
479 | return uploadResponse; | 687 | return uploadResponse; |
480 | } | 688 | } |
481 | 689 | ||
@@ -487,8 +695,14 @@ namespace OpenSim.Region.ClientStack.Linden | |||
487 | /// <param name="data"></param> | 695 | /// <param name="data"></param> |
488 | public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID, | 696 | public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID, |
489 | UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType, | 697 | UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType, |
490 | string assetType) | 698 | string assetType, int cost, |
699 | UUID texturesFolder, int nreqtextures, int nreqmeshs, int nreqinstances, | ||
700 | bool IsAtestUpload, ref string error) | ||
491 | { | 701 | { |
702 | |||
703 | lock (m_ModelCost) | ||
704 | m_FileAgentInventoryState = FileAgentInventoryState.processUpload; | ||
705 | |||
492 | m_log.DebugFormat( | 706 | m_log.DebugFormat( |
493 | "[BUNCH OF CAPS]: Uploaded asset {0} for inventory item {1}, inv type {2}, asset type {3}", | 707 | "[BUNCH OF CAPS]: Uploaded asset {0} for inventory item {1}, inv type {2}, asset type {3}", |
494 | assetID, inventoryItem, inventoryType, assetType); | 708 | assetID, inventoryItem, inventoryType, assetType); |
@@ -496,6 +710,34 @@ namespace OpenSim.Region.ClientStack.Linden | |||
496 | sbyte assType = 0; | 710 | sbyte assType = 0; |
497 | sbyte inType = 0; | 711 | sbyte inType = 0; |
498 | 712 | ||
713 | IClientAPI client = null; | ||
714 | |||
715 | UUID owner_id = m_HostCapsObj.AgentID; | ||
716 | UUID creatorID; | ||
717 | |||
718 | bool istest = IsAtestUpload && m_enableFreeTestUpload && (cost > 0); | ||
719 | |||
720 | bool restrictPerms = m_RestrictFreeTestUploadPerms && istest; | ||
721 | |||
722 | if (istest && m_testAssetsCreatorID != UUID.Zero) | ||
723 | creatorID = m_testAssetsCreatorID; | ||
724 | else | ||
725 | creatorID = owner_id; | ||
726 | |||
727 | string creatorIDstr = creatorID.ToString(); | ||
728 | |||
729 | IMoneyModule mm = m_Scene.RequestModuleInterface<IMoneyModule>(); | ||
730 | if (mm != null) | ||
731 | { | ||
732 | // make sure client still has enougth credit | ||
733 | if (!mm.UploadCovered(m_HostCapsObj.AgentID, (int)cost)) | ||
734 | { | ||
735 | error = "Insufficient funds."; | ||
736 | return; | ||
737 | } | ||
738 | } | ||
739 | |||
740 | // strings to types | ||
499 | if (inventoryType == "sound") | 741 | if (inventoryType == "sound") |
500 | { | 742 | { |
501 | inType = (sbyte)InventoryType.Sound; | 743 | inType = (sbyte)InventoryType.Sound; |
@@ -525,92 +767,194 @@ namespace OpenSim.Region.ClientStack.Linden | |||
525 | } | 767 | } |
526 | else if (inventoryType == "object") | 768 | else if (inventoryType == "object") |
527 | { | 769 | { |
528 | inType = (sbyte)InventoryType.Object; | 770 | if (assetType == "mesh") // this code for now is for mesh models uploads only |
529 | assType = (sbyte)AssetType.Object; | ||
530 | |||
531 | List<Vector3> positions = new List<Vector3>(); | ||
532 | List<Quaternion> rotations = new List<Quaternion>(); | ||
533 | OSDMap request = (OSDMap)OSDParser.DeserializeLLSDXml(data); | ||
534 | OSDArray instance_list = (OSDArray)request["instance_list"]; | ||
535 | OSDArray mesh_list = (OSDArray)request["mesh_list"]; | ||
536 | OSDArray texture_list = (OSDArray)request["texture_list"]; | ||
537 | SceneObjectGroup grp = null; | ||
538 | |||
539 | List<UUID> textures = new List<UUID>(); | ||
540 | for (int i = 0; i < texture_list.Count; i++) | ||
541 | { | 771 | { |
542 | AssetBase textureAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Texture, ""); | 772 | inType = (sbyte)InventoryType.Object; |
543 | textureAsset.Data = texture_list[i].AsBinary(); | 773 | assType = (sbyte)AssetType.Object; |
544 | m_assetService.Store(textureAsset); | ||
545 | textures.Add(textureAsset.FullID); | ||
546 | } | ||
547 | 774 | ||
548 | for (int i = 0; i < mesh_list.Count; i++) | 775 | List<Vector3> positions = new List<Vector3>(); |
549 | { | 776 | List<Quaternion> rotations = new List<Quaternion>(); |
550 | PrimitiveBaseShape pbs = PrimitiveBaseShape.CreateBox(); | 777 | OSDMap request = (OSDMap)OSDParser.DeserializeLLSDXml(data); |
551 | 778 | ||
552 | Primitive.TextureEntry textureEntry | 779 | // compare and get updated information |
553 | = new Primitive.TextureEntry(Primitive.TextureEntry.WHITE_TEXTURE); | ||
554 | OSDMap inner_instance_list = (OSDMap)instance_list[i]; | ||
555 | 780 | ||
556 | OSDArray face_list = (OSDArray)inner_instance_list["face_list"]; | 781 | bool mismatchError = true; |
557 | for (uint face = 0; face < face_list.Count; face++) | 782 | |
783 | while (mismatchError) | ||
558 | { | 784 | { |
559 | OSDMap faceMap = (OSDMap)face_list[(int)face]; | 785 | mismatchError = false; |
560 | Primitive.TextureEntryFace f = pbs.Textures.CreateFace(face); | 786 | } |
561 | if(faceMap.ContainsKey("fullbright")) | ||
562 | f.Fullbright = faceMap["fullbright"].AsBoolean(); | ||
563 | if (faceMap.ContainsKey ("diffuse_color")) | ||
564 | f.RGBA = faceMap["diffuse_color"].AsColor4(); | ||
565 | 787 | ||
566 | int textureNum = faceMap["image"].AsInteger(); | 788 | if (mismatchError) |
567 | float imagerot = faceMap["imagerot"].AsInteger(); | 789 | { |
568 | float offsets = (float)faceMap["offsets"].AsReal(); | 790 | error = "Upload and fee estimation information don't match"; |
569 | float offsett = (float)faceMap["offsett"].AsReal(); | 791 | lock (m_ModelCost) |
570 | float scales = (float)faceMap["scales"].AsReal(); | 792 | m_FileAgentInventoryState = FileAgentInventoryState.idle; |
571 | float scalet = (float)faceMap["scalet"].AsReal(); | ||
572 | 793 | ||
573 | if(imagerot != 0) | 794 | return; |
574 | f.Rotation = imagerot; | 795 | } |
575 | 796 | ||
576 | if(offsets != 0) | 797 | OSDArray instance_list = (OSDArray)request["instance_list"]; |
577 | f.OffsetU = offsets; | 798 | OSDArray mesh_list = (OSDArray)request["mesh_list"]; |
799 | OSDArray texture_list = (OSDArray)request["texture_list"]; | ||
800 | SceneObjectGroup grp = null; | ||
578 | 801 | ||
579 | if (offsett != 0) | 802 | // create and store texture assets |
580 | f.OffsetV = offsett; | 803 | bool doTextInv = (!istest && m_enableModelUploadTextureToInventory && |
804 | texturesFolder != UUID.Zero); | ||
581 | 805 | ||
582 | if (scales != 0) | ||
583 | f.RepeatU = scales; | ||
584 | 806 | ||
585 | if (scalet != 0) | 807 | List<UUID> textures = new List<UUID>(); |
586 | f.RepeatV = scalet; | ||
587 | 808 | ||
588 | if (textures.Count > textureNum) | 809 | |
589 | f.TextureID = textures[textureNum]; | 810 | if (doTextInv) |
590 | else | 811 | m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client); |
591 | f.TextureID = Primitive.TextureEntry.WHITE_TEXTURE; | ||
592 | 812 | ||
593 | textureEntry.FaceTextures[face] = f; | 813 | if(client == null) // don't put textures in inventory if there is no client |
814 | doTextInv = false; | ||
815 | |||
816 | for (int i = 0; i < texture_list.Count; i++) | ||
817 | { | ||
818 | AssetBase textureAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Texture, creatorIDstr); | ||
819 | textureAsset.Data = texture_list[i].AsBinary(); | ||
820 | if (istest) | ||
821 | textureAsset.Local = true; | ||
822 | m_assetService.Store(textureAsset); | ||
823 | textures.Add(textureAsset.FullID); | ||
824 | |||
825 | if (doTextInv) | ||
826 | { | ||
827 | string name = assetName; | ||
828 | if (name.Length > 25) | ||
829 | name = name.Substring(0, 24); | ||
830 | name += "_Texture#" + i.ToString(); | ||
831 | InventoryItemBase texitem = new InventoryItemBase(); | ||
832 | texitem.Owner = m_HostCapsObj.AgentID; | ||
833 | texitem.CreatorId = creatorIDstr; | ||
834 | texitem.CreatorData = String.Empty; | ||
835 | texitem.ID = UUID.Random(); | ||
836 | texitem.AssetID = textureAsset.FullID; | ||
837 | texitem.Description = "mesh model texture"; | ||
838 | texitem.Name = name; | ||
839 | texitem.AssetType = (int)AssetType.Texture; | ||
840 | texitem.InvType = (int)InventoryType.Texture; | ||
841 | texitem.Folder = texturesFolder; | ||
842 | |||
843 | texitem.CurrentPermissions | ||
844 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Export); | ||
845 | |||
846 | texitem.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; | ||
847 | texitem.EveryOnePermissions = 0; | ||
848 | texitem.NextPermissions = (uint)PermissionMask.All; | ||
849 | texitem.CreationDate = Util.UnixTimeSinceEpoch(); | ||
850 | |||
851 | m_Scene.AddInventoryItem(client, texitem); | ||
852 | texitem = null; | ||
853 | } | ||
594 | } | 854 | } |
595 | 855 | ||
596 | pbs.TextureEntry = textureEntry.GetBytes(); | 856 | // create and store meshs assets |
857 | List<UUID> meshAssets = new List<UUID>(); | ||
858 | for (int i = 0; i < mesh_list.Count; i++) | ||
859 | { | ||
860 | AssetBase meshAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Mesh, creatorIDstr); | ||
861 | meshAsset.Data = mesh_list[i].AsBinary(); | ||
862 | if (istest) | ||
863 | meshAsset.Local = true; | ||
864 | m_assetService.Store(meshAsset); | ||
865 | meshAssets.Add(meshAsset.FullID); | ||
866 | } | ||
867 | |||
868 | int skipedMeshs = 0; | ||
869 | // build prims from instances | ||
870 | for (int i = 0; i < instance_list.Count; i++) | ||
871 | { | ||
872 | OSDMap inner_instance_list = (OSDMap)instance_list[i]; | ||
873 | |||
874 | // skip prims that are 2 small | ||
875 | Vector3 scale = inner_instance_list["scale"].AsVector3(); | ||
876 | |||
877 | if (scale.X < m_PrimScaleMin || scale.Y < m_PrimScaleMin || scale.Z < m_PrimScaleMin) | ||
878 | { | ||
879 | skipedMeshs++; | ||
880 | continue; | ||
881 | } | ||
882 | |||
883 | PrimitiveBaseShape pbs = PrimitiveBaseShape.CreateBox(); | ||
884 | |||
885 | Primitive.TextureEntry textureEntry | ||
886 | = new Primitive.TextureEntry(Primitive.TextureEntry.WHITE_TEXTURE); | ||
887 | |||
597 | 888 | ||
598 | AssetBase meshAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Mesh, ""); | 889 | OSDArray face_list = (OSDArray)inner_instance_list["face_list"]; |
599 | meshAsset.Data = mesh_list[i].AsBinary(); | 890 | for (uint face = 0; face < face_list.Count; face++) |
600 | m_assetService.Store(meshAsset); | 891 | { |
892 | OSDMap faceMap = (OSDMap)face_list[(int)face]; | ||
893 | Primitive.TextureEntryFace f = pbs.Textures.CreateFace(face); | ||
894 | if (faceMap.ContainsKey("fullbright")) | ||
895 | f.Fullbright = faceMap["fullbright"].AsBoolean(); | ||
896 | if (faceMap.ContainsKey("diffuse_color")) | ||
897 | f.RGBA = faceMap["diffuse_color"].AsColor4(); | ||
898 | |||
899 | int textureNum = faceMap["image"].AsInteger(); | ||
900 | float imagerot = faceMap["imagerot"].AsInteger(); | ||
901 | float offsets = (float)faceMap["offsets"].AsReal(); | ||
902 | float offsett = (float)faceMap["offsett"].AsReal(); | ||
903 | float scales = (float)faceMap["scales"].AsReal(); | ||
904 | float scalet = (float)faceMap["scalet"].AsReal(); | ||
905 | |||
906 | if (imagerot != 0) | ||
907 | f.Rotation = imagerot; | ||
908 | |||
909 | if (offsets != 0) | ||
910 | f.OffsetU = offsets; | ||
601 | 911 | ||
602 | pbs.SculptEntry = true; | 912 | if (offsett != 0) |
603 | pbs.SculptTexture = meshAsset.FullID; | 913 | f.OffsetV = offsett; |
604 | pbs.SculptType = (byte)SculptType.Mesh; | ||
605 | pbs.SculptData = meshAsset.Data; | ||
606 | 914 | ||
607 | Vector3 position = inner_instance_list["position"].AsVector3(); | 915 | if (scales != 0) |
608 | Vector3 scale = inner_instance_list["scale"].AsVector3(); | 916 | f.RepeatU = scales; |
609 | Quaternion rotation = inner_instance_list["rotation"].AsQuaternion(); | 917 | |
918 | if (scalet != 0) | ||
919 | f.RepeatV = scalet; | ||
920 | |||
921 | if (textures.Count > textureNum) | ||
922 | f.TextureID = textures[textureNum]; | ||
923 | else | ||
924 | f.TextureID = Primitive.TextureEntry.WHITE_TEXTURE; | ||
925 | |||
926 | textureEntry.FaceTextures[face] = f; | ||
927 | } | ||
928 | |||
929 | pbs.TextureEntry = textureEntry.GetBytes(); | ||
930 | |||
931 | bool hasmesh = false; | ||
932 | if (inner_instance_list.ContainsKey("mesh")) // seems to happen always but ... | ||
933 | { | ||
934 | int meshindx = inner_instance_list["mesh"].AsInteger(); | ||
935 | if (meshAssets.Count > meshindx) | ||
936 | { | ||
937 | pbs.SculptEntry = true; | ||
938 | pbs.SculptType = (byte)SculptType.Mesh; | ||
939 | pbs.SculptTexture = meshAssets[meshindx]; // actual asset UUID after meshs suport introduction | ||
940 | // data will be requested from asset on rez (i hope) | ||
941 | hasmesh = true; | ||
942 | } | ||
943 | } | ||
944 | |||
945 | Vector3 position = inner_instance_list["position"].AsVector3(); | ||
946 | Quaternion rotation = inner_instance_list["rotation"].AsQuaternion(); | ||
947 | |||
948 | // for now viwers do send fixed defaults | ||
949 | // but this may change | ||
950 | // int physicsShapeType = inner_instance_list["physics_shape_type"].AsInteger(); | ||
951 | byte physicsShapeType = (byte)PhysShapeType.prim; // default for mesh is simple convex | ||
952 | if(hasmesh) | ||
953 | physicsShapeType = (byte) PhysShapeType.convex; // default for mesh is simple convex | ||
954 | // int material = inner_instance_list["material"].AsInteger(); | ||
955 | byte material = (byte)Material.Wood; | ||
610 | 956 | ||
611 | // no longer used - begin ------------------------ | 957 | // no longer used - begin ------------------------ |
612 | // int physicsShapeType = inner_instance_list["physics_shape_type"].AsInteger(); | ||
613 | // int material = inner_instance_list["material"].AsInteger(); | ||
614 | // int mesh = inner_instance_list["mesh"].AsInteger(); | 958 | // int mesh = inner_instance_list["mesh"].AsInteger(); |
615 | 959 | ||
616 | // OSDMap permissions = (OSDMap)inner_instance_list["permissions"]; | 960 | // OSDMap permissions = (OSDMap)inner_instance_list["permissions"]; |
@@ -625,24 +969,49 @@ namespace OpenSim.Region.ClientStack.Linden | |||
625 | // UUID owner_id = permissions["owner_id"].AsUUID(); | 969 | // UUID owner_id = permissions["owner_id"].AsUUID(); |
626 | // int owner_mask = permissions["owner_mask"].AsInteger(); | 970 | // int owner_mask = permissions["owner_mask"].AsInteger(); |
627 | // no longer used - end ------------------------ | 971 | // no longer used - end ------------------------ |
972 | |||
973 | |||
974 | SceneObjectPart prim | ||
975 | = new SceneObjectPart(owner_id, pbs, position, Quaternion.Identity, Vector3.Zero); | ||
976 | |||
977 | prim.Scale = scale; | ||
978 | rotations.Add(rotation); | ||
979 | positions.Add(position); | ||
980 | prim.UUID = UUID.Random(); | ||
981 | prim.CreatorID = creatorID; | ||
982 | prim.OwnerID = owner_id; | ||
983 | prim.GroupID = UUID.Zero; | ||
984 | prim.LastOwnerID = creatorID; | ||
985 | prim.CreationDate = Util.UnixTimeSinceEpoch(); | ||
986 | |||
987 | if (grp == null) | ||
988 | prim.Name = assetName; | ||
989 | else | ||
990 | prim.Name = assetName + "#" + i.ToString(); | ||
628 | 991 | ||
629 | UUID owner_id = m_HostCapsObj.AgentID; | 992 | prim.EveryoneMask = 0; |
993 | prim.GroupMask = 0; | ||
630 | 994 | ||
631 | SceneObjectPart prim | 995 | if (restrictPerms) |
632 | = new SceneObjectPart(owner_id, pbs, position, Quaternion.Identity, Vector3.Zero); | 996 | { |
997 | prim.BaseMask = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
998 | prim.OwnerMask = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
999 | prim.NextOwnerMask = 0; | ||
1000 | } | ||
1001 | else | ||
1002 | { | ||
1003 | prim.BaseMask = (uint)PermissionMask.All | (uint)PermissionMask.Export; | ||
1004 | prim.OwnerMask = (uint)PermissionMask.All | (uint)PermissionMask.Export; | ||
1005 | prim.NextOwnerMask = (uint)PermissionMask.Transfer; | ||
1006 | } | ||
1007 | |||
1008 | if(istest) | ||
1009 | prim.Description = "For testing only. Other uses are prohibited"; | ||
1010 | else | ||
1011 | prim.Description = ""; | ||
633 | 1012 | ||
634 | prim.Scale = scale; | 1013 | prim.Material = material; |
635 | //prim.OffsetPosition = position; | 1014 | prim.PhysicsShapeType = physicsShapeType; |
636 | rotations.Add(rotation); | ||
637 | positions.Add(position); | ||
638 | prim.UUID = UUID.Random(); | ||
639 | prim.CreatorID = owner_id; | ||
640 | prim.OwnerID = owner_id; | ||
641 | prim.GroupID = UUID.Zero; | ||
642 | prim.LastOwnerID = prim.OwnerID; | ||
643 | prim.CreationDate = Util.UnixTimeSinceEpoch(); | ||
644 | prim.Name = assetName; | ||
645 | prim.Description = ""; | ||
646 | 1015 | ||
647 | // prim.BaseMask = (uint)base_mask; | 1016 | // prim.BaseMask = (uint)base_mask; |
648 | // prim.EveryoneMask = (uint)everyone_mask; | 1017 | // prim.EveryoneMask = (uint)everyone_mask; |
@@ -650,52 +1019,64 @@ namespace OpenSim.Region.ClientStack.Linden | |||
650 | // prim.NextOwnerMask = (uint)next_owner_mask; | 1019 | // prim.NextOwnerMask = (uint)next_owner_mask; |
651 | // prim.OwnerMask = (uint)owner_mask; | 1020 | // prim.OwnerMask = (uint)owner_mask; |
652 | 1021 | ||
653 | if (grp == null) | 1022 | if (grp == null) |
654 | grp = new SceneObjectGroup(prim); | 1023 | { |
655 | else | 1024 | grp = new SceneObjectGroup(prim); |
656 | grp.AddPart(prim); | 1025 | grp.LastOwnerID = creatorID; |
657 | } | 1026 | } |
1027 | else | ||
1028 | grp.AddPart(prim); | ||
1029 | } | ||
658 | 1030 | ||
659 | Vector3 rootPos = positions[0]; | 1031 | Vector3 rootPos = positions[0]; |
660 | 1032 | ||
661 | if (grp.Parts.Length > 1) | 1033 | if (grp.Parts.Length > 1) |
662 | { | 1034 | { |
663 | // Fix first link number | 1035 | // Fix first link number |
664 | grp.RootPart.LinkNum++; | 1036 | grp.RootPart.LinkNum++; |
665 | 1037 | ||
666 | Quaternion rootRotConj = Quaternion.Conjugate(rotations[0]); | 1038 | Quaternion rootRotConj = Quaternion.Conjugate(rotations[0]); |
667 | Quaternion tmprot; | 1039 | Quaternion tmprot; |
668 | Vector3 offset; | 1040 | Vector3 offset; |
669 | 1041 | ||
670 | // fix children rotations and positions | 1042 | // fix children rotations and positions |
671 | for (int i = 1; i < rotations.Count; i++) | 1043 | for (int i = 1; i < rotations.Count; i++) |
672 | { | 1044 | { |
673 | tmprot = rotations[i]; | 1045 | tmprot = rotations[i]; |
674 | tmprot = rootRotConj * tmprot; | 1046 | tmprot = rootRotConj * tmprot; |
1047 | |||
1048 | grp.Parts[i].RotationOffset = tmprot; | ||
675 | 1049 | ||
676 | grp.Parts[i].RotationOffset = tmprot; | 1050 | offset = positions[i] - rootPos; |
677 | 1051 | ||
678 | offset = positions[i] - rootPos; | 1052 | offset *= rootRotConj; |
1053 | grp.Parts[i].OffsetPosition = offset; | ||
1054 | } | ||
679 | 1055 | ||
680 | offset *= rootRotConj; | 1056 | grp.AbsolutePosition = rootPos; |
681 | grp.Parts[i].OffsetPosition = offset; | 1057 | grp.UpdateGroupRotationR(rotations[0]); |
1058 | } | ||
1059 | else | ||
1060 | { | ||
1061 | grp.AbsolutePosition = rootPos; | ||
1062 | grp.UpdateGroupRotationR(rotations[0]); | ||
682 | } | 1063 | } |
683 | 1064 | ||
684 | grp.AbsolutePosition = rootPos; | 1065 | data = ASCIIEncoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(grp)); |
685 | grp.UpdateGroupRotationR(rotations[0]); | ||
686 | } | 1066 | } |
687 | else | 1067 | |
1068 | else // not a mesh model | ||
688 | { | 1069 | { |
689 | grp.AbsolutePosition = rootPos; | 1070 | m_log.ErrorFormat("[CAPS Asset Upload] got unsuported assetType for object upload"); |
690 | grp.UpdateGroupRotationR(rotations[0]); | 1071 | return; |
691 | } | 1072 | } |
692 | |||
693 | data = ASCIIEncoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(grp)); | ||
694 | } | 1073 | } |
695 | 1074 | ||
696 | AssetBase asset; | 1075 | AssetBase asset; |
697 | asset = new AssetBase(assetID, assetName, assType, m_HostCapsObj.AgentID.ToString()); | 1076 | asset = new AssetBase(assetID, assetName, assType, creatorIDstr); |
698 | asset.Data = data; | 1077 | asset.Data = data; |
1078 | if (istest) | ||
1079 | asset.Local = true; | ||
699 | if (AddNewAsset != null) | 1080 | if (AddNewAsset != null) |
700 | AddNewAsset(asset); | 1081 | AddNewAsset(asset); |
701 | else if (m_assetService != null) | 1082 | else if (m_assetService != null) |
@@ -703,11 +1084,17 @@ namespace OpenSim.Region.ClientStack.Linden | |||
703 | 1084 | ||
704 | InventoryItemBase item = new InventoryItemBase(); | 1085 | InventoryItemBase item = new InventoryItemBase(); |
705 | item.Owner = m_HostCapsObj.AgentID; | 1086 | item.Owner = m_HostCapsObj.AgentID; |
706 | item.CreatorId = m_HostCapsObj.AgentID.ToString(); | 1087 | item.CreatorId = creatorIDstr; |
707 | item.CreatorData = String.Empty; | 1088 | item.CreatorData = String.Empty; |
708 | item.ID = inventoryItem; | 1089 | item.ID = inventoryItem; |
709 | item.AssetID = asset.FullID; | 1090 | item.AssetID = asset.FullID; |
710 | item.Description = assetDescription; | 1091 | if (istest) |
1092 | { | ||
1093 | item.Description = "For testing only. Other uses are prohibited"; | ||
1094 | item.Flags = (uint) (InventoryItemFlags.SharedSingleReference); | ||
1095 | } | ||
1096 | else | ||
1097 | item.Description = assetDescription; | ||
711 | item.Name = assetName; | 1098 | item.Name = assetName; |
712 | item.AssetType = assType; | 1099 | item.AssetType = assType; |
713 | item.InvType = inType; | 1100 | item.InvType = inType; |
@@ -715,18 +1102,56 @@ namespace OpenSim.Region.ClientStack.Linden | |||
715 | 1102 | ||
716 | // If we set PermissionMask.All then when we rez the item the next permissions will replace the current | 1103 | // If we set PermissionMask.All then when we rez the item the next permissions will replace the current |
717 | // (owner) permissions. This becomes a problem if next permissions are changed. | 1104 | // (owner) permissions. This becomes a problem if next permissions are changed. |
718 | item.CurrentPermissions | ||
719 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Export); | ||
720 | 1105 | ||
721 | item.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; | 1106 | if (restrictPerms) |
722 | item.EveryOnePermissions = 0; | 1107 | { |
723 | item.NextPermissions = (uint)PermissionMask.All; | 1108 | item.BasePermissions = (uint)(PermissionMask.Move | PermissionMask.Modify); |
1109 | item.CurrentPermissions = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
1110 | item.EveryOnePermissions = 0; | ||
1111 | item.NextPermissions = 0; | ||
1112 | } | ||
1113 | else | ||
1114 | { | ||
1115 | item.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; | ||
1116 | item.CurrentPermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; | ||
1117 | item.EveryOnePermissions = 0; | ||
1118 | item.NextPermissions = (uint)PermissionMask.Transfer; | ||
1119 | } | ||
1120 | |||
724 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 1121 | item.CreationDate = Util.UnixTimeSinceEpoch(); |
725 | 1122 | ||
1123 | m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client); | ||
1124 | |||
726 | if (AddNewInventoryItem != null) | 1125 | if (AddNewInventoryItem != null) |
727 | { | 1126 | { |
728 | AddNewInventoryItem(m_HostCapsObj.AgentID, item); | 1127 | if (istest) |
1128 | { | ||
1129 | m_Scene.AddInventoryItem(client, item); | ||
1130 | /* | ||
1131 | AddNewInventoryItem(m_HostCapsObj.AgentID, item, 0); | ||
1132 | if (client != null) | ||
1133 | 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); | ||
1134 | */ | ||
1135 | } | ||
1136 | else | ||
1137 | { | ||
1138 | AddNewInventoryItem(m_HostCapsObj.AgentID, item, (uint)cost); | ||
1139 | // if (client != null) | ||
1140 | // { | ||
1141 | // // let users see anything.. i don't so far | ||
1142 | // string str; | ||
1143 | // if (cost > 0) | ||
1144 | // // dont remember where is money unit name to put here | ||
1145 | // str = "Upload complete. charged " + cost.ToString() + "$"; | ||
1146 | // else | ||
1147 | // str = "Upload complete"; | ||
1148 | // client.SendAgentAlertMessage(str, true); | ||
1149 | // } | ||
1150 | } | ||
729 | } | 1151 | } |
1152 | |||
1153 | lock (m_ModelCost) | ||
1154 | m_FileAgentInventoryState = FileAgentInventoryState.idle; | ||
730 | } | 1155 | } |
731 | 1156 | ||
732 | /// <summary> | 1157 | /// <summary> |
@@ -919,6 +1344,120 @@ namespace OpenSim.Region.ClientStack.Linden | |||
919 | return response; | 1344 | return response; |
920 | } | 1345 | } |
921 | 1346 | ||
1347 | public string GetObjectCost(string request, string path, | ||
1348 | string param, IOSHttpRequest httpRequest, | ||
1349 | IOSHttpResponse httpResponse) | ||
1350 | { | ||
1351 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | ||
1352 | OSDMap resp = new OSDMap(); | ||
1353 | |||
1354 | OSDArray object_ids = (OSDArray)req["object_ids"]; | ||
1355 | |||
1356 | for (int i = 0; i < object_ids.Count; i++) | ||
1357 | { | ||
1358 | UUID uuid = object_ids[i].AsUUID(); | ||
1359 | |||
1360 | SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid); | ||
1361 | |||
1362 | if (part != null) | ||
1363 | { | ||
1364 | SceneObjectGroup grp = part.ParentGroup; | ||
1365 | if (grp != null) | ||
1366 | { | ||
1367 | float linksetCost; | ||
1368 | float linksetPhysCost; | ||
1369 | float partCost; | ||
1370 | float partPhysCost; | ||
1371 | |||
1372 | grp.GetResourcesCosts(part, out linksetCost, out linksetPhysCost, out partCost, out partPhysCost); | ||
1373 | |||
1374 | OSDMap object_data = new OSDMap(); | ||
1375 | object_data["linked_set_resource_cost"] = linksetCost; | ||
1376 | object_data["resource_cost"] = partCost; | ||
1377 | object_data["physics_cost"] = partPhysCost; | ||
1378 | object_data["linked_set_physics_cost"] = linksetPhysCost; | ||
1379 | |||
1380 | resp[uuid.ToString()] = object_data; | ||
1381 | } | ||
1382 | } | ||
1383 | } | ||
1384 | |||
1385 | string response = OSDParser.SerializeLLSDXmlString(resp); | ||
1386 | return response; | ||
1387 | } | ||
1388 | |||
1389 | public string ResourceCostSelected(string request, string path, | ||
1390 | string param, IOSHttpRequest httpRequest, | ||
1391 | IOSHttpResponse httpResponse) | ||
1392 | { | ||
1393 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | ||
1394 | OSDMap resp = new OSDMap(); | ||
1395 | |||
1396 | |||
1397 | float phys=0; | ||
1398 | float stream=0; | ||
1399 | float simul=0; | ||
1400 | |||
1401 | if (req.ContainsKey("selected_roots")) | ||
1402 | { | ||
1403 | OSDArray object_ids = (OSDArray)req["selected_roots"]; | ||
1404 | |||
1405 | // should go by SOG suming costs for all parts | ||
1406 | // ll v3 works ok with several objects select we get the list and adds ok | ||
1407 | // FS calls per object so results are wrong guess fs bug | ||
1408 | for (int i = 0; i < object_ids.Count; i++) | ||
1409 | { | ||
1410 | UUID uuid = object_ids[i].AsUUID(); | ||
1411 | float Physc; | ||
1412 | float simulc; | ||
1413 | float streamc; | ||
1414 | |||
1415 | SceneObjectGroup grp = m_Scene.GetGroupByPrim(uuid); | ||
1416 | if (grp != null) | ||
1417 | { | ||
1418 | grp.GetSelectedCosts(out Physc, out streamc, out simulc); | ||
1419 | phys += Physc; | ||
1420 | stream += streamc; | ||
1421 | simul += simulc; | ||
1422 | } | ||
1423 | } | ||
1424 | } | ||
1425 | else if (req.ContainsKey("selected_prims")) | ||
1426 | { | ||
1427 | OSDArray object_ids = (OSDArray)req["selected_prims"]; | ||
1428 | |||
1429 | // don't see in use in any of the 2 viewers | ||
1430 | // guess it should be for edit linked but... nothing | ||
1431 | // should go to SOP per part | ||
1432 | for (int i = 0; i < object_ids.Count; i++) | ||
1433 | { | ||
1434 | UUID uuid = object_ids[i].AsUUID(); | ||
1435 | |||
1436 | SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid); | ||
1437 | if (part != null) | ||
1438 | { | ||
1439 | phys += part.PhysicsCost; | ||
1440 | stream += part.StreamingCost; | ||
1441 | simul += part.SimulationCost; | ||
1442 | } | ||
1443 | } | ||
1444 | } | ||
1445 | |||
1446 | if (simul != 0) | ||
1447 | { | ||
1448 | OSDMap object_data = new OSDMap(); | ||
1449 | |||
1450 | object_data["physics"] = phys; | ||
1451 | object_data["streaming"] = stream; | ||
1452 | object_data["simulation"] = simul; | ||
1453 | |||
1454 | resp["selected"] = object_data; | ||
1455 | } | ||
1456 | |||
1457 | string response = OSDParser.SerializeLLSDXmlString(resp); | ||
1458 | return response; | ||
1459 | } | ||
1460 | |||
922 | public string UpdateAgentInformation(string request, string path, | 1461 | public string UpdateAgentInformation(string request, string path, |
923 | string param, IOSHttpRequest httpRequest, | 1462 | string param, IOSHttpRequest httpRequest, |
924 | IOSHttpResponse httpResponse) | 1463 | IOSHttpResponse httpResponse) |
@@ -938,6 +1477,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
938 | 1477 | ||
939 | public class AssetUploader | 1478 | public class AssetUploader |
940 | { | 1479 | { |
1480 | private static readonly ILog m_log = | ||
1481 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
1482 | |||
1483 | |||
941 | public event UpLoadedAsset OnUpLoad; | 1484 | public event UpLoadedAsset OnUpLoad; |
942 | private UpLoadedAsset handlerUpLoad = null; | 1485 | private UpLoadedAsset handlerUpLoad = null; |
943 | 1486 | ||
@@ -952,10 +1495,21 @@ namespace OpenSim.Region.ClientStack.Linden | |||
952 | 1495 | ||
953 | private string m_invType = String.Empty; | 1496 | private string m_invType = String.Empty; |
954 | private string m_assetType = String.Empty; | 1497 | private string m_assetType = String.Empty; |
1498 | private int m_cost; | ||
1499 | private string m_error = String.Empty; | ||
1500 | |||
1501 | private Timer m_timeoutTimer = new Timer(); | ||
1502 | private UUID m_texturesFolder; | ||
1503 | private int m_nreqtextures; | ||
1504 | private int m_nreqmeshs; | ||
1505 | private int m_nreqinstances; | ||
1506 | private bool m_IsAtestUpload; | ||
955 | 1507 | ||
956 | public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem, | 1508 | public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem, |
957 | UUID parentFolderID, string invType, string assetType, string path, | 1509 | UUID parentFolderID, string invType, string assetType, string path, |
958 | IHttpServer httpServer, bool dumpAssetsToFile) | 1510 | IHttpServer httpServer, bool dumpAssetsToFile, |
1511 | int totalCost, UUID texturesFolder, int nreqtextures, int nreqmeshs, int nreqinstances, | ||
1512 | bool IsAtestUpload) | ||
959 | { | 1513 | { |
960 | m_assetName = assetName; | 1514 | m_assetName = assetName; |
961 | m_assetDes = description; | 1515 | m_assetDes = description; |
@@ -967,6 +1521,18 @@ namespace OpenSim.Region.ClientStack.Linden | |||
967 | m_assetType = assetType; | 1521 | m_assetType = assetType; |
968 | m_invType = invType; | 1522 | m_invType = invType; |
969 | m_dumpAssetsToFile = dumpAssetsToFile; | 1523 | m_dumpAssetsToFile = dumpAssetsToFile; |
1524 | m_cost = totalCost; | ||
1525 | |||
1526 | m_texturesFolder = texturesFolder; | ||
1527 | m_nreqtextures = nreqtextures; | ||
1528 | m_nreqmeshs = nreqmeshs; | ||
1529 | m_nreqinstances = nreqinstances; | ||
1530 | m_IsAtestUpload = IsAtestUpload; | ||
1531 | |||
1532 | m_timeoutTimer.Elapsed += TimedOut; | ||
1533 | m_timeoutTimer.Interval = 120000; | ||
1534 | m_timeoutTimer.AutoReset = false; | ||
1535 | m_timeoutTimer.Start(); | ||
970 | } | 1536 | } |
971 | 1537 | ||
972 | /// <summary> | 1538 | /// <summary> |
@@ -981,12 +1547,14 @@ namespace OpenSim.Region.ClientStack.Linden | |||
981 | UUID inv = inventoryItemID; | 1547 | UUID inv = inventoryItemID; |
982 | string res = String.Empty; | 1548 | string res = String.Empty; |
983 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); | 1549 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); |
1550 | /* | ||
984 | uploadComplete.new_asset = newAssetID.ToString(); | 1551 | uploadComplete.new_asset = newAssetID.ToString(); |
985 | uploadComplete.new_inventory_item = inv; | 1552 | uploadComplete.new_inventory_item = inv; |
986 | uploadComplete.state = "complete"; | 1553 | uploadComplete.state = "complete"; |
987 | 1554 | ||
988 | res = LLSDHelpers.SerialiseLLSDReply(uploadComplete); | 1555 | res = LLSDHelpers.SerialiseLLSDReply(uploadComplete); |
989 | 1556 | */ | |
1557 | m_timeoutTimer.Stop(); | ||
990 | httpListener.RemoveStreamHandler("POST", uploaderPath); | 1558 | httpListener.RemoveStreamHandler("POST", uploaderPath); |
991 | 1559 | ||
992 | // TODO: probably make this a better set of extensions here | 1560 | // TODO: probably make this a better set of extensions here |
@@ -1003,12 +1571,49 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1003 | handlerUpLoad = OnUpLoad; | 1571 | handlerUpLoad = OnUpLoad; |
1004 | if (handlerUpLoad != null) | 1572 | if (handlerUpLoad != null) |
1005 | { | 1573 | { |
1006 | handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType); | 1574 | handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType, |
1575 | m_cost, m_texturesFolder, m_nreqtextures, m_nreqmeshs, m_nreqinstances, m_IsAtestUpload, ref m_error); | ||
1576 | } | ||
1577 | if (m_IsAtestUpload) | ||
1578 | { | ||
1579 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); | ||
1580 | resperror.message = "Upload SUCESSEFULL for testing purposes only. Other uses are prohibited. Item will not work after 48 hours or on other regions"; | ||
1581 | resperror.identifier = inv; | ||
1582 | |||
1583 | uploadComplete.error = resperror; | ||
1584 | uploadComplete.state = "Upload4Testing"; | ||
1007 | } | 1585 | } |
1586 | else | ||
1587 | { | ||
1588 | if (m_error == String.Empty) | ||
1589 | { | ||
1590 | uploadComplete.new_asset = newAssetID.ToString(); | ||
1591 | uploadComplete.new_inventory_item = inv; | ||
1592 | // if (m_texturesFolder != UUID.Zero) | ||
1593 | // uploadComplete.new_texture_folder_id = m_texturesFolder; | ||
1594 | uploadComplete.state = "complete"; | ||
1595 | } | ||
1596 | else | ||
1597 | { | ||
1598 | LLSDAssetUploadError resperror = new LLSDAssetUploadError(); | ||
1599 | resperror.message = m_error; | ||
1600 | resperror.identifier = inv; | ||
1008 | 1601 | ||
1602 | uploadComplete.error = resperror; | ||
1603 | uploadComplete.state = "failed"; | ||
1604 | } | ||
1605 | } | ||
1606 | |||
1607 | res = LLSDHelpers.SerialiseLLSDReply(uploadComplete); | ||
1009 | return res; | 1608 | return res; |
1010 | } | 1609 | } |
1011 | 1610 | ||
1611 | private void TimedOut(object sender, ElapsedEventArgs args) | ||
1612 | { | ||
1613 | m_log.InfoFormat("[CAPS]: Removing URL and handler for timed out mesh upload"); | ||
1614 | httpListener.RemoveStreamHandler("POST", uploaderPath); | ||
1615 | } | ||
1616 | |||
1012 | ///Left this in and commented in case there are unforseen issues | 1617 | ///Left this in and commented in case there are unforseen issues |
1013 | //private void SaveAssetToFile(string filename, byte[] data) | 1618 | //private void SaveAssetToFile(string filename, byte[] data) |
1014 | //{ | 1619 | //{ |