aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs923
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs671
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs12
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs29
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs223
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs16
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs296
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs9
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs200
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs3
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs1206
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs65
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs219
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs4
14 files changed, 2784 insertions, 1092 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
28using System; 28using System;
29using System.Timers;
29using System.Collections; 30using System.Collections;
30using System.Collections.Generic; 31using System.Collections.Generic;
31using System.IO; 32using System.IO;
@@ -53,14 +54,16 @@ using OSDMap = OpenMetaverse.StructuredData.OSDMap;
53namespace OpenSim.Region.ClientStack.Linden 54namespace 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
5using System;
6using System.IO;
7using System.Collections;
8using System.Collections.Generic;
9using System.Text;
10
11using OpenMetaverse;
12using OpenMetaverse.StructuredData;
13
14using OpenSim.Framework;
15using OpenSim.Region.Framework;
16using OpenSim.Region.Framework.Scenes;
17using OpenSim.Framework.Capabilities;
18
19using ComponentAce.Compression.Libs.zlib;
20
21using OSDArray = OpenMetaverse.StructuredData.OSDArray;
22using OSDMap = OpenMetaverse.StructuredData.OSDMap;
23
24namespace 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 4d2c0f2..986a665 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 13415f8..24a0190 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -27,18 +27,13 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Specialized; 30using System.Collections.Generic;
31using System.Drawing;
32using System.Drawing.Imaging;
33using System.Reflection; 31using System.Reflection;
34using System.IO; 32using System.Threading;
35using System.Web;
36using log4net; 33using log4net;
37using Nini.Config; 34using Nini.Config;
38using Mono.Addins; 35using Mono.Addins;
39using OpenMetaverse; 36using OpenMetaverse;
40using OpenMetaverse.StructuredData;
41using OpenMetaverse.Imaging;
42using OpenSim.Framework; 37using OpenSim.Framework;
43using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
44using OpenSim.Framework.Servers.HttpServer; 39using OpenSim.Framework.Servers.HttpServer;
@@ -47,6 +42,7 @@ using OpenSim.Region.Framework.Scenes;
47using OpenSim.Services.Interfaces; 42using OpenSim.Services.Interfaces;
48using Caps = OpenSim.Framework.Capabilities.Caps; 43using Caps = OpenSim.Framework.Capabilities.Caps;
49using OpenSim.Capabilities.Handlers; 44using OpenSim.Capabilities.Handlers;
45using OpenSim.Framework.Monitoring;
50 46
51namespace OpenSim.Region.ClientStack.Linden 47namespace OpenSim.Region.ClientStack.Linden
52{ 48{
@@ -54,57 +50,70 @@ namespace OpenSim.Region.ClientStack.Linden
54 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GetTextureModule")] 50 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GetTextureModule")]
55 public class GetTextureModule : INonSharedRegionModule 51 public class GetTextureModule : INonSharedRegionModule
56 { 52 {
57// private static readonly ILog m_log = 53
58// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 54 struct aPollRequest
59 55 {
56 public PollServiceTextureEventArgs thepoll;
57 public UUID reqID;
58 public Hashtable request;
59 }
60
61 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
62
60 private Scene m_scene; 63 private Scene m_scene;
61 private IAssetService m_assetService;
62 64
63 private bool m_Enabled = false; 65 private static GetTextureHandler m_getTextureHandler;
66
67 private IAssetService m_assetService = null;
64 68
65 // TODO: Change this to a config option 69 private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>();
66 const string REDIRECT_URL = null; 70 private static Thread[] m_workerThreads = null;
67 71
68 private string m_URL; 72 private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue =
73 new OpenMetaverse.BlockingQueue<aPollRequest>();
69 74
70 #region ISharedRegionModule Members 75 #region ISharedRegionModule Members
71 76
72 public void Initialise(IConfigSource source) 77 public void Initialise(IConfigSource source)
73 { 78 {
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 } 79 }
83 80
84 public void AddRegion(Scene s) 81 public void AddRegion(Scene s)
85 { 82 {
86 if (!m_Enabled)
87 return;
88
89 m_scene = s; 83 m_scene = s;
84 m_assetService = s.AssetService;
90 } 85 }
91 86
92 public void RemoveRegion(Scene s) 87 public void RemoveRegion(Scene s)
93 { 88 {
94 if (!m_Enabled)
95 return;
96
97 m_scene.EventManager.OnRegisterCaps -= RegisterCaps; 89 m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
90 m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps;
98 m_scene = null; 91 m_scene = null;
99 } 92 }
100 93
101 public void RegionLoaded(Scene s) 94 public void RegionLoaded(Scene s)
102 { 95 {
103 if (!m_Enabled) 96 // We'll reuse the same handler for all requests.
104 return; 97 m_getTextureHandler = new GetTextureHandler(m_assetService);
105 98
106 m_assetService = m_scene.RequestModuleInterface<IAssetService>();
107 m_scene.EventManager.OnRegisterCaps += RegisterCaps; 99 m_scene.EventManager.OnRegisterCaps += RegisterCaps;
100 m_scene.EventManager.OnDeregisterCaps += DeregisterCaps;
101
102 if (m_workerThreads == null)
103 {
104 m_workerThreads = new Thread[2];
105
106 for (uint i = 0; i < 2; i++)
107 {
108 m_workerThreads[i] = Watchdog.StartThread(DoTextureRequests,
109 String.Format("TextureWorkerThread{0}", i),
110 ThreadPriority.Normal,
111 false,
112 false,
113 null,
114 int.MaxValue);
115 }
116 }
108 } 117 }
109 118
110 public void PostInitialise() 119 public void PostInitialise()
@@ -122,24 +131,152 @@ namespace OpenSim.Region.ClientStack.Linden
122 131
123 #endregion 132 #endregion
124 133
125 public void RegisterCaps(UUID agentID, Caps caps) 134 ~GetTextureModule()
135 {
136 foreach (Thread t in m_workerThreads)
137 Watchdog.AbortThread(t.ManagedThreadId);
138
139 }
140
141 private class PollServiceTextureEventArgs : PollServiceEventArgs
142 {
143 private List<Hashtable> requests =
144 new List<Hashtable>();
145 private Dictionary<UUID, Hashtable> responses =
146 new Dictionary<UUID, Hashtable>();
147
148 private Scene m_scene;
149
150 public PollServiceTextureEventArgs(UUID pId, Scene scene) :
151 base(null, null, null, null, pId, int.MaxValue)
152 {
153 m_scene = scene;
154
155 HasEvents = (x, y) =>
156 {
157 lock (responses)
158 return responses.ContainsKey(x);
159 };
160 GetEvents = (x, y) =>
161 {
162 lock (responses)
163 {
164 try
165 {
166 return responses[x];
167 }
168 finally
169 {
170 responses.Remove(x);
171 }
172 }
173 };
174
175 Request = (x, y) =>
176 {
177 aPollRequest reqinfo = new aPollRequest();
178 reqinfo.thepoll = this;
179 reqinfo.reqID = x;
180 reqinfo.request = y;
181
182 m_queue.Enqueue(reqinfo);
183 };
184
185 // this should never happen except possible on shutdown
186 NoEvents = (x, y) =>
187 {
188/*
189 lock (requests)
190 {
191 Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString());
192 requests.Remove(request);
193 }
194*/
195 Hashtable response = new Hashtable();
196
197 response["int_response_code"] = 500;
198 response["str_response_string"] = "Script timeout";
199 response["content_type"] = "text/plain";
200 response["keepalive"] = false;
201 response["reusecontext"] = false;
202
203 return response;
204 };
205 }
206
207 public void Process(aPollRequest requestinfo)
208 {
209 Hashtable response;
210
211 UUID requestID = requestinfo.reqID;
212
213 // If the avatar is gone, don't bother to get the texture
214 if (m_scene.GetScenePresence(Id) == null)
215 {
216 response = new Hashtable();
217
218 response["int_response_code"] = 500;
219 response["str_response_string"] = "Script timeout";
220 response["content_type"] = "text/plain";
221 response["keepalive"] = false;
222 response["reusecontext"] = false;
223
224 lock (responses)
225 responses[requestID] = response;
226
227 return;
228 }
229
230 response = m_getTextureHandler.Handle(requestinfo.request);
231 lock (responses)
232 responses[requestID] = response;
233 }
234 }
235
236 private void RegisterCaps(UUID agentID, Caps caps)
126 { 237 {
127 UUID capID = UUID.Random(); 238 string capUrl = "/CAPS/" + UUID.Random() + "/";
239
240 // Register this as a poll service
241 PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene);
242
243 args.Type = PollServiceEventArgs.EventType.Texture;
244 MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
128 245
129 //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); 246 string hostName = m_scene.RegionInfo.ExternalHostName;
130 if (m_URL == "localhost") 247 uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
248 string protocol = "http";
249
250 if (MainServer.Instance.UseSSL)
131 { 251 {
132// m_log.DebugFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); 252 hostName = MainServer.Instance.SSLCommonName;
133 caps.RegisterHandler( 253 port = MainServer.Instance.SSLPort;
134 "GetTexture", 254 protocol = "https";
135 new GetTextureHandler("/CAPS/" + capID + "/", m_assetService, "GetTexture", agentID.ToString()));
136 } 255 }
137 else 256 caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
257
258 m_capsDict[agentID] = capUrl;
259 }
260
261 private void DeregisterCaps(UUID agentID, Caps caps)
262 {
263 string capUrl;
264
265 if (m_capsDict.TryGetValue(agentID, out capUrl))
138 { 266 {
139// m_log.DebugFormat("[GETTEXTURE]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName); 267 MainServer.Instance.RemoveHTTPHandler("", capUrl);
140 caps.RegisterHandler("GetTexture", m_URL); 268 m_capsDict.Remove(agentID);
141 } 269 }
142 } 270 }
143 271
272 private void DoTextureRequests()
273 {
274 while (true)
275 {
276 aPollRequest poolreq = m_queue.Dequeue();
277
278 poolreq.thepoll.Process(poolreq);
279 }
280 }
144 } 281 }
145} 282}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
index 33b1f77..60c1814 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 5529550..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
28using System;
29using System.Collections;
30using System.Collections.Specialized;
31using System.Reflection;
32using System.IO;
33using System.Web;
34using Mono.Addins;
35using log4net;
36using Nini.Config;
37using OpenMetaverse;
38using OpenMetaverse.StructuredData;
39using OpenSim.Framework;
40using OpenSim.Framework.Servers;
41using OpenSim.Framework.Servers.HttpServer;
42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Framework.Scenes;
44using OpenSim.Services.Interfaces;
45using Caps = OpenSim.Framework.Capabilities.Caps;
46using OpenSim.Framework.Capabilities;
47
48namespace OpenSim.Region.ClientStack.Linden
49{
50 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "NewFileAgentInventoryVariablePriceModule")]
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 6890f4a..04cd474 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -27,18 +27,22 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
30using System.Reflection; 31using System.Reflection;
32using System.Threading;
31using log4net; 33using log4net;
32using Nini.Config; 34using Nini.Config;
33using Mono.Addins; 35using Mono.Addins;
34using OpenMetaverse; 36using OpenMetaverse;
35using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Servers;
36using OpenSim.Framework.Servers.HttpServer; 39using OpenSim.Framework.Servers.HttpServer;
37using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
39using OpenSim.Services.Interfaces; 42using OpenSim.Services.Interfaces;
40using Caps = OpenSim.Framework.Capabilities.Caps; 43using Caps = OpenSim.Framework.Capabilities.Caps;
41using OpenSim.Capabilities.Handlers; 44using OpenSim.Capabilities.Handlers;
45using OpenSim.Framework.Monitoring;
42 46
43namespace OpenSim.Region.ClientStack.Linden 47namespace OpenSim.Region.ClientStack.Linden
44{ 48{
@@ -48,67 +52,72 @@ namespace OpenSim.Region.ClientStack.Linden
48 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WebFetchInvDescModule")] 52 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WebFetchInvDescModule")]
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}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index afbe56b..3995620 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -234,6 +234,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
234 m_stopPacket = TexturePacketCount(); 234 m_stopPacket = TexturePacketCount();
235 } 235 }
236 236
237 //Give them at least two packets, to play nice with some broken viewers (SL also behaves this way)
238 if (m_stopPacket == 1 && m_layers[0].End > FIRST_PACKET_SIZE) m_stopPacket++;
239
237 m_currentPacket = StartPacket; 240 m_currentPacket = StartPacket;
238 } 241 }
239 } 242 }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 7382e09..1f6af4a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -99,6 +99,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
99 public event AvatarPickerRequest OnAvatarPickerRequest; 99 public event AvatarPickerRequest OnAvatarPickerRequest;
100 public event StartAnim OnStartAnim; 100 public event StartAnim OnStartAnim;
101 public event StopAnim OnStopAnim; 101 public event StopAnim OnStopAnim;
102 public event ChangeAnim OnChangeAnim;
102 public event Action<IClientAPI> OnRequestAvatarsData; 103 public event Action<IClientAPI> OnRequestAvatarsData;
103 public event LinkObjects OnLinkObjects; 104 public event LinkObjects OnLinkObjects;
104 public event DelinkObjects OnDelinkObjects; 105 public event DelinkObjects OnDelinkObjects;
@@ -126,6 +127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
126 public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; 127 public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
127 public event UpdatePrimFlags OnUpdatePrimFlags; 128 public event UpdatePrimFlags OnUpdatePrimFlags;
128 public event UpdatePrimTexture OnUpdatePrimTexture; 129 public event UpdatePrimTexture OnUpdatePrimTexture;
130 public event ClientChangeObject onClientChangeObject;
129 public event UpdateVector OnUpdatePrimGroupPosition; 131 public event UpdateVector OnUpdatePrimGroupPosition;
130 public event UpdateVector OnUpdatePrimSinglePosition; 132 public event UpdateVector OnUpdatePrimSinglePosition;
131 public event UpdatePrimRotation OnUpdatePrimGroupRotation; 133 public event UpdatePrimRotation OnUpdatePrimGroupRotation;
@@ -159,6 +161,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
159 public event RequestTaskInventory OnRequestTaskInventory; 161 public event RequestTaskInventory OnRequestTaskInventory;
160 public event UpdateInventoryItem OnUpdateInventoryItem; 162 public event UpdateInventoryItem OnUpdateInventoryItem;
161 public event CopyInventoryItem OnCopyInventoryItem; 163 public event CopyInventoryItem OnCopyInventoryItem;
164 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
162 public event MoveInventoryItem OnMoveInventoryItem; 165 public event MoveInventoryItem OnMoveInventoryItem;
163 public event RemoveInventoryItem OnRemoveInventoryItem; 166 public event RemoveInventoryItem OnRemoveInventoryItem;
164 public event RemoveInventoryFolder OnRemoveInventoryFolder; 167 public event RemoveInventoryFolder OnRemoveInventoryFolder;
@@ -257,7 +260,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
257 public event ClassifiedInfoRequest OnClassifiedInfoRequest; 260 public event ClassifiedInfoRequest OnClassifiedInfoRequest;
258 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; 261 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
259 public event ClassifiedDelete OnClassifiedDelete; 262 public event ClassifiedDelete OnClassifiedDelete;
260 public event ClassifiedDelete OnClassifiedGodDelete; 263 public event ClassifiedGodDelete OnClassifiedGodDelete;
261 public event EventNotificationAddRequest OnEventNotificationAddRequest; 264 public event EventNotificationAddRequest OnEventNotificationAddRequest;
262 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 265 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
263 public event EventGodDelete OnEventGodDelete; 266 public event EventGodDelete OnEventGodDelete;
@@ -288,6 +291,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
288 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; 291 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
289 public event SimWideDeletesDelegate OnSimWideDeletes; 292 public event SimWideDeletesDelegate OnSimWideDeletes;
290 public event SendPostcard OnSendPostcard; 293 public event SendPostcard OnSendPostcard;
294 public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
291 public event MuteListEntryUpdate OnUpdateMuteListEntry; 295 public event MuteListEntryUpdate OnUpdateMuteListEntry;
292 public event MuteListEntryRemove OnRemoveMuteListEntry; 296 public event MuteListEntryRemove OnRemoveMuteListEntry;
293 public event GodlikeMessage onGodlikeMessage; 297 public event GodlikeMessage onGodlikeMessage;
@@ -326,6 +330,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
326 private Prioritizer m_prioritizer; 330 private Prioritizer m_prioritizer;
327 private bool m_disableFacelights = false; 331 private bool m_disableFacelights = false;
328 332
333 private const uint MaxTransferBytesPerPacket = 600;
334
335
329 /// <value> 336 /// <value>
330 /// List used in construction of data blocks for an object update packet. This is to stop us having to 337 /// List used in construction of data blocks for an object update packet. This is to stop us having to
331 /// continually recreate it. 338 /// continually recreate it.
@@ -337,14 +344,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
337 /// thread servicing the m_primFullUpdates queue after a kill. If this happens the object persists as an 344 /// thread servicing the m_primFullUpdates queue after a kill. If this happens the object persists as an
338 /// ownerless phantom. 345 /// ownerless phantom.
339 /// 346 ///
340 /// All manipulation of this set has to occur under a lock 347 /// All manipulation of this set has to occur under an m_entityUpdates.SyncRoot lock
341 /// 348 ///
342 /// </value> 349 /// </value>
343 protected HashSet<uint> m_killRecord; 350// protected HashSet<uint> m_killRecord;
344 351
345// protected HashSet<uint> m_attachmentsSent; 352// protected HashSet<uint> m_attachmentsSent;
346 353
347 private int m_moneyBalance; 354 private int m_moneyBalance;
355 private bool m_deliverPackets = true;
348 private int m_animationSequenceNumber = 1; 356 private int m_animationSequenceNumber = 1;
349 private bool m_SendLogoutPacketWhenClosing = true; 357 private bool m_SendLogoutPacketWhenClosing = true;
350 358
@@ -391,6 +399,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
391 get { return m_startpos; } 399 get { return m_startpos; }
392 set { m_startpos = value; } 400 set { m_startpos = value; }
393 } 401 }
402 public bool DeliverPackets
403 {
404 get { return m_deliverPackets; }
405 set {
406 m_deliverPackets = value;
407 m_udpClient.m_deliverPackets = value;
408 }
409 }
394 public UUID AgentId { get { return m_agentId; } } 410 public UUID AgentId { get { return m_agentId; } }
395 public ISceneAgent SceneAgent { get; set; } 411 public ISceneAgent SceneAgent { get; set; }
396 public UUID ActiveGroupId { get { return m_activeGroupID; } } 412 public UUID ActiveGroupId { get { return m_activeGroupID; } }
@@ -468,7 +484,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
468 m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); 484 m_entityUpdates = new PriorityQueue(m_scene.Entities.Count);
469 m_entityProps = new PriorityQueue(m_scene.Entities.Count); 485 m_entityProps = new PriorityQueue(m_scene.Entities.Count);
470 m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>(); 486 m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>();
471 m_killRecord = new HashSet<uint>(); 487// m_killRecord = new HashSet<uint>();
472// m_attachmentsSent = new HashSet<uint>(); 488// m_attachmentsSent = new HashSet<uint>();
473 489
474 m_assetService = m_scene.RequestModuleInterface<IAssetService>(); 490 m_assetService = m_scene.RequestModuleInterface<IAssetService>();
@@ -498,12 +514,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
498 514
499 #region Client Methods 515 #region Client Methods
500 516
517
518 /// <summary>
519 /// Close down the client view
520 /// </summary>
501 public void Close() 521 public void Close()
502 { 522 {
503 Close(false); 523 Close(true, false);
504 } 524 }
505 525
506 public void Close(bool force) 526 public void Close(bool sendStop, bool force)
507 { 527 {
508 // We lock here to prevent race conditions between two threads calling close simultaneously (e.g. 528 // We lock here to prevent race conditions between two threads calling close simultaneously (e.g.
509 // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection. 529 // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection.
@@ -515,7 +535,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
515 return; 535 return;
516 536
517 IsActive = false; 537 IsActive = false;
518 CloseWithoutChecks(); 538 CloseWithoutChecks(sendStop);
519 } 539 }
520 } 540 }
521 541
@@ -528,12 +548,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
528 /// 548 ///
529 /// Callers must lock ClosingSyncLock before calling. 549 /// Callers must lock ClosingSyncLock before calling.
530 /// </remarks> 550 /// </remarks>
531 public void CloseWithoutChecks() 551 public void CloseWithoutChecks(bool sendStop)
532 { 552 {
533 m_log.DebugFormat( 553 m_log.DebugFormat(
534 "[CLIENT]: Close has been called for {0} attached to scene {1}", 554 "[CLIENT]: Close has been called for {0} attached to scene {1}",
535 Name, m_scene.RegionInfo.RegionName); 555 Name, m_scene.RegionInfo.RegionName);
536 556
557 if (sendStop)
558 {
559 // Send the STOP packet
560 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
561 OutPacket(disable, ThrottleOutPacketType.Unknown);
562 }
563
537 // Shutdown the image manager 564 // Shutdown the image manager
538 ImageManager.Close(); 565 ImageManager.Close();
539 566
@@ -791,7 +818,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
791 handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType); 818 handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
792 handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes; 819 handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
793 820
794 OutPacket(handshake, ThrottleOutPacketType.Task); 821// OutPacket(handshake, ThrottleOutPacketType.Task);
822 // use same as MoveAgentIntoRegion (both should be task )
823 OutPacket(handshake, ThrottleOutPacketType.Unknown);
795 } 824 }
796 825
797 public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) 826 public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
@@ -831,7 +860,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
831 reply.ChatData.OwnerID = ownerID; 860 reply.ChatData.OwnerID = ownerID;
832 reply.ChatData.SourceID = fromAgentID; 861 reply.ChatData.SourceID = fromAgentID;
833 862
834 OutPacket(reply, ThrottleOutPacketType.Task); 863 OutPacket(reply, ThrottleOutPacketType.Unknown);
835 } 864 }
836 865
837 /// <summary> 866 /// <summary>
@@ -1117,6 +1146,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1117 public virtual void SendLayerData(float[] map) 1146 public virtual void SendLayerData(float[] map)
1118 { 1147 {
1119 Util.FireAndForget(DoSendLayerData, map); 1148 Util.FireAndForget(DoSendLayerData, map);
1149
1150 // Send it sync, and async. It's not that much data
1151 // and it improves user experience just so much!
1152 DoSendLayerData(map);
1120 } 1153 }
1121 1154
1122 /// <summary> 1155 /// <summary>
@@ -1129,16 +1162,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1129 1162
1130 try 1163 try
1131 { 1164 {
1132 //for (int y = 0; y < 16; y++) 1165 for (int y = 0; y < 16; y++)
1133 //{ 1166 {
1134 // for (int x = 0; x < 16; x++) 1167 for (int x = 0; x < 16; x+=4)
1135 // { 1168 {
1136 // SendLayerData(x, y, map); 1169 SendLayerPacket(x, y, map);
1137 // } 1170 }
1138 //} 1171 }
1139
1140 // Send LayerData in a spiral pattern. Fun!
1141 SendLayerTopRight(map, 0, 0, 15, 15);
1142 } 1172 }
1143 catch (Exception e) 1173 catch (Exception e)
1144 { 1174 {
@@ -1146,51 +1176,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1146 } 1176 }
1147 } 1177 }
1148 1178
1149 private void SendLayerTopRight(float[] map, int x1, int y1, int x2, int y2)
1150 {
1151 // Row
1152 for (int i = x1; i <= x2; i++)
1153 SendLayerData(i, y1, map);
1154
1155 // Column
1156 for (int j = y1 + 1; j <= y2; j++)
1157 SendLayerData(x2, j, map);
1158
1159 if (x2 - x1 > 0)
1160 SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2);
1161 }
1162
1163 void SendLayerBottomLeft(float[] map, int x1, int y1, int x2, int y2)
1164 {
1165 // Row in reverse
1166 for (int i = x2; i >= x1; i--)
1167 SendLayerData(i, y2, map);
1168
1169 // Column in reverse
1170 for (int j = y2 - 1; j >= y1; j--)
1171 SendLayerData(x1, j, map);
1172
1173 if (x2 - x1 > 0)
1174 SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
1175 }
1176
1177 /// <summary> 1179 /// <summary>
1178 /// Sends a set of four patches (x, x+1, ..., x+3) to the client 1180 /// Sends a set of four patches (x, x+1, ..., x+3) to the client
1179 /// </summary> 1181 /// </summary>
1180 /// <param name="map">heightmap</param> 1182 /// <param name="map">heightmap</param>
1181 /// <param name="px">X coordinate for patches 0..12</param> 1183 /// <param name="px">X coordinate for patches 0..12</param>
1182 /// <param name="py">Y coordinate for patches 0..15</param> 1184 /// <param name="py">Y coordinate for patches 0..15</param>
1183 // private void SendLayerPacket(float[] map, int y, int x) 1185 private void SendLayerPacket(int x, int y, float[] map)
1184 // { 1186 {
1185 // int[] patches = new int[4]; 1187 int[] patches = new int[4];
1186 // patches[0] = x + 0 + y * 16; 1188 patches[0] = x + 0 + y * 16;
1187 // patches[1] = x + 1 + y * 16; 1189 patches[1] = x + 1 + y * 16;
1188 // patches[2] = x + 2 + y * 16; 1190 patches[2] = x + 2 + y * 16;
1189 // patches[3] = x + 3 + y * 16; 1191 patches[3] = x + 3 + y * 16;
1190 1192
1191 // Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches); 1193 float[] heightmap = (map.Length == 65536) ?
1192 // OutPacket(layerpack, ThrottleOutPacketType.Land); 1194 map :
1193 // } 1195 LLHeightFieldMoronize(map);
1196
1197 try
1198 {
1199 Packet layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1200 OutPacket(layerpack, ThrottleOutPacketType.Land);
1201 }
1202 catch
1203 {
1204 for (int px = x ; px < x + 4 ; px++)
1205 SendLayerData(px, y, map);
1206 }
1207 }
1194 1208
1195 /// <summary> 1209 /// <summary>
1196 /// Sends a specified patch to a client 1210 /// Sends a specified patch to a client
@@ -1210,7 +1224,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1210 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches); 1224 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1211 layerpack.Header.Reliable = true; 1225 layerpack.Header.Reliable = true;
1212 1226
1213 OutPacket(layerpack, ThrottleOutPacketType.Land); 1227 OutPacket(layerpack, ThrottleOutPacketType.Task);
1214 } 1228 }
1215 catch (Exception e) 1229 catch (Exception e)
1216 { 1230 {
@@ -1573,7 +1587,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1573 1587
1574 public void SendKillObject(ulong regionHandle, List<uint> localIDs) 1588 public void SendKillObject(ulong regionHandle, List<uint> localIDs)
1575 { 1589 {
1576// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle); 1590// foreach (uint id in localIDs)
1591// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle);
1577 1592
1578 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); 1593 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
1579 // TODO: don't create new blocks if recycling an old packet 1594 // TODO: don't create new blocks if recycling an old packet
@@ -1595,17 +1610,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1595 // We MUST lock for both manipulating the kill record and sending the packet, in order to avoid a race 1610 // We MUST lock for both manipulating the kill record and sending the packet, in order to avoid a race
1596 // condition where a kill can be processed before an out-of-date update for the same object. 1611 // condition where a kill can be processed before an out-of-date update for the same object.
1597 // ProcessEntityUpdates() also takes the m_killRecord lock. 1612 // ProcessEntityUpdates() also takes the m_killRecord lock.
1598 lock (m_killRecord) 1613// lock (m_killRecord)
1599 { 1614// {
1600 foreach (uint localID in localIDs) 1615// foreach (uint localID in localIDs)
1601 m_killRecord.Add(localID); 1616// m_killRecord.Add(localID);
1602 1617
1603 // The throttle queue used here must match that being used for updates. Otherwise, there is a 1618 // The throttle queue used here must match that being used for updates. Otherwise, there is a
1604 // chance that a kill packet put on a separate queue will be sent to the client before an existing 1619 // chance that a kill packet put on a separate queue will be sent to the client before an existing
1605 // update packet on another queue. Receiving updates after kills results in unowned and undeletable 1620 // update packet on another queue. Receiving updates after kills results in unowned and undeletable
1606 // scene objects in a viewer until that viewer is relogged in. 1621 // scene objects in a viewer until that viewer is relogged in.
1607 OutPacket(kill, ThrottleOutPacketType.Task); 1622 OutPacket(kill, ThrottleOutPacketType.Task);
1608 } 1623// }
1609 } 1624 }
1610 } 1625 }
1611 1626
@@ -2063,9 +2078,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2063 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); 2078 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
2064 } 2079 }
2065 2080
2066 /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
2067 public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId) 2081 public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId)
2068 { 2082 {
2083 SendInventoryItemCreateUpdate(Item, UUID.Zero, callbackId);
2084 }
2085
2086 /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
2087 public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
2088 {
2069 const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All; 2089 const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All;
2070 2090
2071 UpdateCreateInventoryItemPacket InventoryReply 2091 UpdateCreateInventoryItemPacket InventoryReply
@@ -2075,6 +2095,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2075 // TODO: don't create new blocks if recycling an old packet 2095 // TODO: don't create new blocks if recycling an old packet
2076 InventoryReply.AgentData.AgentID = AgentId; 2096 InventoryReply.AgentData.AgentID = AgentId;
2077 InventoryReply.AgentData.SimApproved = true; 2097 InventoryReply.AgentData.SimApproved = true;
2098 InventoryReply.AgentData.TransactionID = transactionID;
2078 InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1]; 2099 InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
2079 InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock(); 2100 InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
2080 InventoryReply.InventoryData[0].ItemID = Item.ID; 2101 InventoryReply.InventoryData[0].ItemID = Item.ID;
@@ -2144,16 +2165,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2144 replytask.InventoryData.TaskID = taskID; 2165 replytask.InventoryData.TaskID = taskID;
2145 replytask.InventoryData.Serial = serial; 2166 replytask.InventoryData.Serial = serial;
2146 replytask.InventoryData.Filename = fileName; 2167 replytask.InventoryData.Filename = fileName;
2147 OutPacket(replytask, ThrottleOutPacketType.Asset); 2168 OutPacket(replytask, ThrottleOutPacketType.Task);
2148 } 2169 }
2149 2170
2150 public void SendXferPacket(ulong xferID, uint packet, byte[] data) 2171 public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
2151 { 2172 {
2173 ThrottleOutPacketType type = ThrottleOutPacketType.Asset;
2174 if (isTaskInventory)
2175 type = ThrottleOutPacketType.Task;
2176
2152 SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket); 2177 SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket);
2153 sendXfer.XferID.ID = xferID; 2178 sendXfer.XferID.ID = xferID;
2154 sendXfer.XferID.Packet = packet; 2179 sendXfer.XferID.Packet = packet;
2155 sendXfer.DataPacket.Data = data; 2180 sendXfer.DataPacket.Data = data;
2156 OutPacket(sendXfer, ThrottleOutPacketType.Asset); 2181 OutPacket(sendXfer, type);
2157 } 2182 }
2158 2183
2159 public void SendAbortXferPacket(ulong xferID) 2184 public void SendAbortXferPacket(ulong xferID)
@@ -2335,6 +2360,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2335 OutPacket(sound, ThrottleOutPacketType.Task); 2360 OutPacket(sound, ThrottleOutPacketType.Task);
2336 } 2361 }
2337 2362
2363 public void SendTransferAbort(TransferRequestPacket transferRequest)
2364 {
2365 TransferAbortPacket abort = (TransferAbortPacket)PacketPool.Instance.GetPacket(PacketType.TransferAbort);
2366 abort.TransferInfo.TransferID = transferRequest.TransferInfo.TransferID;
2367 abort.TransferInfo.ChannelType = transferRequest.TransferInfo.ChannelType;
2368 m_log.Debug("[Assets] Aborting transfer; asset request failed");
2369 OutPacket(abort, ThrottleOutPacketType.Task);
2370 }
2371
2338 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain) 2372 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
2339 { 2373 {
2340 SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger); 2374 SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger);
@@ -2627,6 +2661,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2627 } 2661 }
2628 } 2662 }
2629 2663
2664 public void SendPartPhysicsProprieties(ISceneEntity entity)
2665 {
2666 SceneObjectPart part = (SceneObjectPart)entity;
2667 if (part != null && AgentId != UUID.Zero)
2668 {
2669 try
2670 {
2671 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
2672 if (eq != null)
2673 {
2674 uint localid = part.LocalId;
2675 byte physshapetype = part.PhysicsShapeType;
2676 float density = part.Density;
2677 float friction = part.Friction;
2678 float bounce = part.Bounciness;
2679 float gravmod = part.GravityModifier;
2680
2681 eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId);
2682 }
2683 }
2684 catch (Exception ex)
2685 {
2686 m_log.Error("Unable to send part Physics Proprieties - exception: " + ex.ToString());
2687 }
2688 part.UpdatePhysRequired = false;
2689 }
2690 }
2691
2692
2630 2693
2631 public void SendGroupNameReply(UUID groupLLUID, string GroupName) 2694 public void SendGroupNameReply(UUID groupLLUID, string GroupName)
2632 { 2695 {
@@ -2724,7 +2787,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2724 else 2787 else
2725 { 2788 {
2726 int processedLength = 0; 2789 int processedLength = 0;
2727 int maxChunkSize = Settings.MAX_PACKET_SIZE - 100; 2790// int maxChunkSize = Settings.MAX_PACKET_SIZE - 100;
2791
2792 int maxChunkSize = (int) MaxTransferBytesPerPacket;
2728 int packetNumber = 0; 2793 int packetNumber = 0;
2729 2794
2730 while (processedLength < req.AssetInf.Data.Length) 2795 while (processedLength < req.AssetInf.Data.Length)
@@ -2795,7 +2860,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2795 reply.Data.ParcelID = parcelID; 2860 reply.Data.ParcelID = parcelID;
2796 reply.Data.OwnerID = land.OwnerID; 2861 reply.Data.OwnerID = land.OwnerID;
2797 reply.Data.Name = Utils.StringToBytes(land.Name); 2862 reply.Data.Name = Utils.StringToBytes(land.Name);
2798 reply.Data.Desc = Utils.StringToBytes(land.Description); 2863 if (land != null && land.Description != null && land.Description != String.Empty)
2864 reply.Data.Desc = Utils.StringToBytes(land.Description.Substring(0, land.Description.Length > 254 ? 254: land.Description.Length));
2865 else
2866 reply.Data.Desc = new Byte[0];
2799 reply.Data.ActualArea = land.Area; 2867 reply.Data.ActualArea = land.Area;
2800 reply.Data.BillableArea = land.Area; // TODO: what is this? 2868 reply.Data.BillableArea = land.Area; // TODO: what is this?
2801 2869
@@ -3530,7 +3598,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3530 3598
3531 AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance); 3599 AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance);
3532 // TODO: don't create new blocks if recycling an old packet 3600 // TODO: don't create new blocks if recycling an old packet
3533 avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218]; 3601 avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[visualParams.Length];
3534 avp.ObjectData.TextureEntry = textureEntry; 3602 avp.ObjectData.TextureEntry = textureEntry;
3535 3603
3536 AvatarAppearancePacket.VisualParamBlock avblock = null; 3604 AvatarAppearancePacket.VisualParamBlock avblock = null;
@@ -3660,7 +3728,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3660 /// </summary> 3728 /// </summary>
3661 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) 3729 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
3662 { 3730 {
3663 //double priority = m_prioritizer.GetUpdatePriority(this, entity); 3731 if (entity is SceneObjectPart)
3732 {
3733 SceneObjectPart e = (SceneObjectPart)entity;
3734 SceneObjectGroup g = e.ParentGroup;
3735 if (g.RootPart.Shape.State > 30) // HUD
3736 if (g.OwnerID != AgentId)
3737 return; // Don't send updates for other people's HUDs
3738 }
3739
3664 uint priority = m_prioritizer.GetUpdatePriority(this, entity); 3740 uint priority = m_prioritizer.GetUpdatePriority(this, entity);
3665 3741
3666 lock (m_entityUpdates.SyncRoot) 3742 lock (m_entityUpdates.SyncRoot)
@@ -3727,27 +3803,74 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3727 3803
3728 // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race 3804 // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race
3729 // condition where a kill can be processed before an out-of-date update for the same object. 3805 // condition where a kill can be processed before an out-of-date update for the same object.
3730 lock (m_killRecord) 3806 float avgTimeDilation = 1.0f;
3807 IEntityUpdate iupdate;
3808 Int32 timeinqueue; // this is just debugging code & can be dropped later
3809
3810 while (updatesThisCall < maxUpdates)
3731 { 3811 {
3732 float avgTimeDilation = 1.0f; 3812 lock (m_entityUpdates.SyncRoot)
3733 IEntityUpdate iupdate; 3813 if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue))
3734 Int32 timeinqueue; // this is just debugging code & can be dropped later 3814 break;
3815
3816 EntityUpdate update = (EntityUpdate)iupdate;
3817
3818 avgTimeDilation += update.TimeDilation;
3819 avgTimeDilation *= 0.5f;
3735 3820
3736 while (updatesThisCall < maxUpdates) 3821 if (update.Entity is SceneObjectPart)
3737 { 3822 {
3738 lock (m_entityUpdates.SyncRoot) 3823 SceneObjectPart part = (SceneObjectPart)update.Entity;
3739 if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue))
3740 break;
3741 3824
3742 EntityUpdate update = (EntityUpdate)iupdate; 3825 if (part.ParentGroup.IsDeleted)
3743 3826 continue;
3744 avgTimeDilation += update.TimeDilation;
3745 avgTimeDilation *= 0.5f;
3746 3827
3747 if (update.Entity is SceneObjectPart) 3828 if (part.ParentGroup.IsAttachment)
3829 { // Someone else's HUD, why are we getting these?
3830 if (part.ParentGroup.OwnerID != AgentId &&
3831 part.ParentGroup.RootPart.Shape.State > 30)
3832 continue;
3833 ScenePresence sp;
3834 // Owner is not in the sim, don't update it to
3835 // anyone
3836 if (!m_scene.TryGetScenePresence(part.OwnerID, out sp))
3837 continue;
3838
3839 List<SceneObjectGroup> atts = sp.GetAttachments();
3840 bool found = false;
3841 foreach (SceneObjectGroup att in atts)
3842 {
3843 if (att == part.ParentGroup)
3844 {
3845 found = true;
3846 break;
3847 }
3848 }
3849
3850 // It's an attachment of a valid avatar, but
3851 // doesn't seem to be attached, skip
3852 if (!found)
3853 continue;
3854
3855 // On vehicle crossing, the attachments are received
3856 // while the avatar is still a child. Don't send
3857 // updates here because the LocalId has not yet
3858 // been updated and the viewer will derender the
3859 // attachments until the avatar becomes root.
3860 if (sp.IsChildAgent)
3861 continue;
3862
3863 // If the object is an attachment we don't want it to be in the kill
3864 // record. Else attaching from inworld and subsequently dropping
3865 // it will no longer work.
3866// lock (m_killRecord)
3867// {
3868// m_killRecord.Remove(part.LocalId);
3869// m_killRecord.Remove(part.ParentGroup.RootPart.LocalId);
3870// }
3871 }
3872 else
3748 { 3873 {
3749 SceneObjectPart part = (SceneObjectPart)update.Entity;
3750
3751 // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client 3874 // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client
3752 // will never receive an update after a prim kill. Even then, keeping the kill record may be a good 3875 // will never receive an update after a prim kill. Even then, keeping the kill record may be a good
3753 // safety measure. 3876 // safety measure.
@@ -3758,241 +3881,177 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3758 // 3881 //
3759 // This doesn't appear to apply to child prims - a client will happily ignore these updates 3882 // This doesn't appear to apply to child prims - a client will happily ignore these updates
3760 // after the root prim has been deleted. 3883 // after the root prim has been deleted.
3761 if (m_killRecord.Contains(part.LocalId)) 3884 //
3762 { 3885 // We ignore this for attachments because attaching something from inworld breaks unless we do.
3763 // m_log.WarnFormat( 3886// lock (m_killRecord)
3764 // "[CLIENT]: Preventing update for prim with local id {0} after client for user {1} told it was deleted", 3887// {
3765 // part.LocalId, Name); 3888// if (m_killRecord.Contains(part.LocalId))
3766 continue; 3889// continue;
3767 } 3890// if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId))
3768 3891// continue;
3769 if (part.ParentGroup.IsAttachment && m_disableFacelights) 3892// }
3893 }
3894
3895 if (part.ParentGroup.IsAttachment && m_disableFacelights)
3896 {
3897 if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand &&
3898 part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
3770 { 3899 {
3771 if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand && 3900 part.Shape.LightEntry = false;
3772 part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
3773 {
3774 part.Shape.LightEntry = false;
3775 }
3776 } 3901 }
3777 } 3902 }
3778 3903 }
3779 #region UpdateFlags to packet type conversion 3904
3780 3905 ++updatesThisCall;
3781 PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags; 3906
3782 3907 #region UpdateFlags to packet type conversion
3783 bool canUseCompressed = true; 3908
3784 bool canUseImproved = true; 3909 PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
3785 3910
3786 // Compressed object updates only make sense for LL primitives 3911 bool canUseCompressed = true;
3787 if (!(update.Entity is SceneObjectPart)) 3912 bool canUseImproved = true;
3913
3914 // Compressed object updates only make sense for LL primitives
3915 if (!(update.Entity is SceneObjectPart))
3916 {
3917 canUseCompressed = false;
3918 }
3919
3920 if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
3921 {
3922 canUseCompressed = false;
3923 canUseImproved = false;
3924 }
3925 else
3926 {
3927 if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
3928 updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
3929 updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
3930 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3788 { 3931 {
3789 canUseCompressed = false; 3932 canUseCompressed = false;
3790 } 3933 }
3791 3934
3792 if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate)) 3935 if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
3936 updateFlags.HasFlag(PrimUpdateFlags.ParentID) ||
3937 updateFlags.HasFlag(PrimUpdateFlags.Scale) ||
3938 updateFlags.HasFlag(PrimUpdateFlags.PrimData) ||
3939 updateFlags.HasFlag(PrimUpdateFlags.Text) ||
3940 updateFlags.HasFlag(PrimUpdateFlags.NameValue) ||
3941 updateFlags.HasFlag(PrimUpdateFlags.ExtraData) ||
3942 updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) ||
3943 updateFlags.HasFlag(PrimUpdateFlags.Sound) ||
3944 updateFlags.HasFlag(PrimUpdateFlags.Particles) ||
3945 updateFlags.HasFlag(PrimUpdateFlags.Material) ||
3946 updateFlags.HasFlag(PrimUpdateFlags.ClickAction) ||
3947 updateFlags.HasFlag(PrimUpdateFlags.MediaURL) ||
3948 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3793 { 3949 {
3794 canUseCompressed = false;
3795 canUseImproved = false; 3950 canUseImproved = false;
3796 } 3951 }
3797 else 3952 }
3798 {
3799 if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
3800 updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
3801 updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
3802 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3803 {
3804 canUseCompressed = false;
3805 }
3806
3807 if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
3808 updateFlags.HasFlag(PrimUpdateFlags.ParentID) ||
3809 updateFlags.HasFlag(PrimUpdateFlags.Scale) ||
3810 updateFlags.HasFlag(PrimUpdateFlags.PrimData) ||
3811 updateFlags.HasFlag(PrimUpdateFlags.Text) ||
3812 updateFlags.HasFlag(PrimUpdateFlags.NameValue) ||
3813 updateFlags.HasFlag(PrimUpdateFlags.ExtraData) ||
3814 updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) ||
3815 updateFlags.HasFlag(PrimUpdateFlags.Sound) ||
3816 updateFlags.HasFlag(PrimUpdateFlags.Particles) ||
3817 updateFlags.HasFlag(PrimUpdateFlags.Material) ||
3818 updateFlags.HasFlag(PrimUpdateFlags.ClickAction) ||
3819 updateFlags.HasFlag(PrimUpdateFlags.MediaURL) ||
3820 updateFlags.HasFlag(PrimUpdateFlags.Joint))
3821 {
3822 canUseImproved = false;
3823 }
3824 }
3825
3826 #endregion UpdateFlags to packet type conversion
3827
3828 #region Block Construction
3829
3830 // TODO: Remove this once we can build compressed updates
3831 canUseCompressed = false;
3832 3953
3833 if (!canUseImproved && !canUseCompressed) 3954 #endregion UpdateFlags to packet type conversion
3834 {
3835 ObjectUpdatePacket.ObjectDataBlock updateBlock;
3836 3955
3837 if (update.Entity is ScenePresence) 3956 #region Block Construction
3838 {
3839 updateBlock = CreateAvatarUpdateBlock((ScenePresence)update.Entity);
3840 }
3841 else
3842 {
3843 SceneObjectPart part = (SceneObjectPart)update.Entity;
3844 updateBlock = CreatePrimUpdateBlock(part, AgentId);
3845
3846 // If the part has become a private hud since the update was scheduled then we do not
3847 // want to send it to other avatars.
3848 if (part.ParentGroup.IsAttachment
3849 && part.ParentGroup.HasPrivateAttachmentPoint
3850 && part.ParentGroup.AttachedAvatar != AgentId)
3851 continue;
3852
3853 // If the part has since been deleted, then drop the update. In the case of attachments,
3854 // this is to avoid spurious updates to other viewers since post-processing of attachments
3855 // has to change the IsAttachment flag for various reasons (which will end up in a pass
3856 // of the test above).
3857 //
3858 // Actual deletions (kills) happen in another method.
3859 if (part.ParentGroup.IsDeleted)
3860 continue;
3861 }
3862 3957
3863 objectUpdateBlocks.Value.Add(updateBlock); 3958 // TODO: Remove this once we can build compressed updates
3864 objectUpdates.Value.Add(update); 3959 canUseCompressed = false;
3865 }
3866 else if (!canUseImproved)
3867 {
3868 SceneObjectPart part = (SceneObjectPart)update.Entity;
3869 ObjectUpdateCompressedPacket.ObjectDataBlock compressedBlock
3870 = CreateCompressedUpdateBlock(part, updateFlags);
3871
3872 // If the part has since been deleted, then drop the update. In the case of attachments,
3873 // this is to avoid spurious updates to other viewers since post-processing of attachments
3874 // has to change the IsAttachment flag for various reasons (which will end up in a pass
3875 // of the test above).
3876 //
3877 // Actual deletions (kills) happen in another method.
3878 if (part.ParentGroup.IsDeleted)
3879 continue;
3880 3960
3881 compressedUpdateBlocks.Value.Add(compressedBlock); 3961 if (!canUseImproved && !canUseCompressed)
3882 compressedUpdates.Value.Add(update); 3962 {
3963 if (update.Entity is ScenePresence)
3964 {
3965 objectUpdateBlocks.Value.Add(CreateAvatarUpdateBlock((ScenePresence)update.Entity));
3883 } 3966 }
3884 else 3967 else
3885 { 3968 {
3886 if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId) 3969 objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId));
3887 {
3888 // Self updates go into a special list
3889 terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
3890 terseAgentUpdates.Value.Add(update);
3891 }
3892 else
3893 {
3894 ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseUpdateBlock
3895 = CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures));
3896
3897 // Everything else goes here
3898 if (update.Entity is SceneObjectPart)
3899 {
3900 SceneObjectPart part = (SceneObjectPart)update.Entity;
3901
3902 // If the part has become a private hud since the update was scheduled then we do not
3903 // want to send it to other avatars.
3904 if (part.ParentGroup.IsAttachment
3905 && part.ParentGroup.HasPrivateAttachmentPoint
3906 && part.ParentGroup.AttachedAvatar != AgentId)
3907 continue;
3908
3909 // If the part has since been deleted, then drop the update. In the case of attachments,
3910 // this is to avoid spurious updates to other viewers since post-processing of attachments
3911 // has to change the IsAttachment flag for various reasons (which will end up in a pass
3912 // of the test above).
3913 //
3914 // Actual deletions (kills) happen in another method.
3915 if (part.ParentGroup.IsDeleted)
3916 continue;
3917 }
3918
3919 terseUpdateBlocks.Value.Add(terseUpdateBlock);
3920 terseUpdates.Value.Add(update);
3921 }
3922 } 3970 }
3923
3924 ++updatesThisCall;
3925
3926 #endregion Block Construction
3927 } 3971 }
3928 3972 else if (!canUseImproved)
3929 #region Packet Sending 3973 {
3930 ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f); 3974 compressedUpdateBlocks.Value.Add(CreateCompressedUpdateBlock((SceneObjectPart)update.Entity, updateFlags));
3931 3975 }
3932 if (terseAgentUpdateBlocks.IsValueCreated) 3976 else
3933 { 3977 {
3934 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value; 3978 if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId)
3979 // Self updates go into a special list
3980 terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
3981 else
3982 // Everything else goes here
3983 terseUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
3984 }
3935 3985
3936 ImprovedTerseObjectUpdatePacket packet 3986 #endregion Block Construction
3937 = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate); 3987 }
3938 3988
3939 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; 3989 #region Packet Sending
3940 packet.RegionData.TimeDilation = timeDilation; 3990
3941 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count]; 3991 const float TIME_DILATION = 1.0f;
3992 ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f);
3993
3994 if (terseAgentUpdateBlocks.IsValueCreated)
3995 {
3996 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value;
3942 3997
3943 for (int i = 0; i < blocks.Count; i++) 3998 ImprovedTerseObjectUpdatePacket packet
3944 packet.ObjectData[i] = blocks[i]; 3999 = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
3945 // If any of the packets created from this call go unacknowledged, all of the updates will be resent 4000 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3946 OutPacket(packet, ThrottleOutPacketType.Unknown, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseAgentUpdates.Value, oPacket); }); 4001 packet.RegionData.TimeDilation = timeDilation;
3947 } 4002 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3948 4003
3949 if (objectUpdateBlocks.IsValueCreated) 4004 for (int i = 0; i < blocks.Count; i++)
3950 { 4005 packet.ObjectData[i] = blocks[i];
3951 List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value;
3952
3953 ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
3954 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3955 packet.RegionData.TimeDilation = timeDilation;
3956 packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3957
3958 for (int i = 0; i < blocks.Count; i++)
3959 packet.ObjectData[i] = blocks[i];
3960 // If any of the packets created from this call go unacknowledged, all of the updates will be resent
3961 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(objectUpdates.Value, oPacket); });
3962 }
3963
3964 if (compressedUpdateBlocks.IsValueCreated)
3965 {
3966 List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value;
3967
3968 ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
3969 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3970 packet.RegionData.TimeDilation = timeDilation;
3971 packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count];
3972
3973 for (int i = 0; i < blocks.Count; i++)
3974 packet.ObjectData[i] = blocks[i];
3975 // If any of the packets created from this call go unacknowledged, all of the updates will be resent
3976 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(compressedUpdates.Value, oPacket); });
3977 }
3978 4006
3979 if (terseUpdateBlocks.IsValueCreated) 4007 OutPacket(packet, ThrottleOutPacketType.Unknown, true);
3980 { 4008 }
3981 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
3982
3983 ImprovedTerseObjectUpdatePacket packet
3984 = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
3985 PacketType.ImprovedTerseObjectUpdate);
3986 4009
3987 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle; 4010 if (objectUpdateBlocks.IsValueCreated)
3988 packet.RegionData.TimeDilation = timeDilation; 4011 {
3989 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count]; 4012 List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value;
3990 4013
3991 for (int i = 0; i < blocks.Count; i++) 4014 ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
3992 packet.ObjectData[i] = blocks[i]; 4015 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
3993 // If any of the packets created from this call go unacknowledged, all of the updates will be resent 4016 packet.RegionData.TimeDilation = timeDilation;
3994 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); }); 4017 packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count];
3995 } 4018
4019 for (int i = 0; i < blocks.Count; i++)
4020 packet.ObjectData[i] = blocks[i];
4021
4022 OutPacket(packet, ThrottleOutPacketType.Task, true);
4023 }
4024
4025 if (compressedUpdateBlocks.IsValueCreated)
4026 {
4027 List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value;
4028
4029 ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
4030 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
4031 packet.RegionData.TimeDilation = timeDilation;
4032 packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count];
4033
4034 for (int i = 0; i < blocks.Count; i++)
4035 packet.ObjectData[i] = blocks[i];
4036
4037 OutPacket(packet, ThrottleOutPacketType.Task, true);
4038 }
4039
4040 if (terseUpdateBlocks.IsValueCreated)
4041 {
4042 List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
4043
4044 ImprovedTerseObjectUpdatePacket packet
4045 = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
4046 PacketType.ImprovedTerseObjectUpdate);
4047 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
4048 packet.RegionData.TimeDilation = timeDilation;
4049 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
4050
4051 for (int i = 0; i < blocks.Count; i++)
4052 packet.ObjectData[i] = blocks[i];
4053
4054 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); });
3996 } 4055 }
3997 4056
3998 #endregion Packet Sending 4057 #endregion Packet Sending
@@ -4285,11 +4344,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4285 4344
4286 // Pass in the delegate so that if this packet needs to be resent, we send the current properties 4345 // Pass in the delegate so that if this packet needs to be resent, we send the current properties
4287 // of the object rather than the properties when the packet was created 4346 // of the object rather than the properties when the packet was created
4288 OutPacket(packet, ThrottleOutPacketType.Task, true, 4347 // HACK : Remove intelligent resending until it's fixed in core
4289 delegate(OutgoingPacket oPacket) 4348 //OutPacket(packet, ThrottleOutPacketType.Task, true,
4290 { 4349 // delegate(OutgoingPacket oPacket)
4291 ResendPropertyUpdates(updates, oPacket); 4350 // {
4292 }); 4351 // ResendPropertyUpdates(updates, oPacket);
4352 // });
4353 OutPacket(packet, ThrottleOutPacketType.Task, true);
4293 4354
4294 // pbcnt += blocks.Count; 4355 // pbcnt += blocks.Count;
4295 // ppcnt++; 4356 // ppcnt++;
@@ -4315,11 +4376,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4315 // of the object rather than the properties when the packet was created 4376 // of the object rather than the properties when the packet was created
4316 List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>(); 4377 List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>();
4317 updates.Add(familyUpdates.Value[i]); 4378 updates.Add(familyUpdates.Value[i]);
4318 OutPacket(packet, ThrottleOutPacketType.Task, true, 4379 // HACK : Remove intelligent resending until it's fixed in core
4319 delegate(OutgoingPacket oPacket) 4380 //OutPacket(packet, ThrottleOutPacketType.Task, true,
4320 { 4381 // delegate(OutgoingPacket oPacket)
4321 ResendPropertyUpdates(updates, oPacket); 4382 // {
4322 }); 4383 // ResendPropertyUpdates(updates, oPacket);
4384 // });
4385 OutPacket(packet, ThrottleOutPacketType.Task, true);
4323 4386
4324 // fpcnt++; 4387 // fpcnt++;
4325 // fbcnt++; 4388 // fbcnt++;
@@ -4691,7 +4754,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4691 4754
4692 if (landData.SimwideArea > 0) 4755 if (landData.SimwideArea > 0)
4693 { 4756 {
4694 int simulatorCapacity = (int)(((float)landData.SimwideArea / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus); 4757 int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus / 65536L);
4758 // Never report more than sim total capacity
4759 if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity)
4760 simulatorCapacity = m_scene.RegionInfo.ObjectCapacity;
4695 updateMessage.SimWideMaxPrims = simulatorCapacity; 4761 updateMessage.SimWideMaxPrims = simulatorCapacity;
4696 } 4762 }
4697 else 4763 else
@@ -4820,14 +4886,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4820 4886
4821 if (notifyCount > 0) 4887 if (notifyCount > 0)
4822 { 4888 {
4823 if (notifyCount > 32) 4889// if (notifyCount > 32)
4824 { 4890// {
4825 m_log.InfoFormat( 4891// m_log.InfoFormat(
4826 "[LAND]: More than {0} avatars own prims on this parcel. Only sending back details of first {0}" 4892// "[LAND]: More than {0} avatars own prims on this parcel. Only sending back details of first {0}"
4827 + " - a developer might want to investigate whether this is a hard limit", 32); 4893// + " - a developer might want to investigate whether this is a hard limit", 32);
4828 4894//
4829 notifyCount = 32; 4895// notifyCount = 32;
4830 } 4896// }
4831 4897
4832 ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock 4898 ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock
4833 = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount]; 4899 = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount];
@@ -4882,9 +4948,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4882 { 4948 {
4883 ScenePresence presence = (ScenePresence)entity; 4949 ScenePresence presence = (ScenePresence)entity;
4884 4950
4951 position = presence.OffsetPosition;
4952 rotation = presence.Rotation;
4953
4954 if (presence.ParentID != 0)
4955 {
4956 SceneObjectPart part = m_scene.GetSceneObjectPart(presence.ParentID);
4957 if (part != null && part != part.ParentGroup.RootPart)
4958 {
4959 position = part.OffsetPosition + presence.OffsetPosition * part.RotationOffset;
4960 rotation = part.RotationOffset * presence.Rotation;
4961 }
4962 }
4963
4885 attachPoint = 0; 4964 attachPoint = 0;
4886 collisionPlane = presence.CollisionPlane; 4965 collisionPlane = presence.CollisionPlane;
4887 position = presence.OffsetPosition;
4888 velocity = presence.Velocity; 4966 velocity = presence.Velocity;
4889 acceleration = Vector3.Zero; 4967 acceleration = Vector3.Zero;
4890 4968
@@ -4894,7 +4972,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4894// acceleration = new Vector3(1, 0, 0); 4972// acceleration = new Vector3(1, 0, 0);
4895 4973
4896 angularVelocity = Vector3.Zero; 4974 angularVelocity = Vector3.Zero;
4897 rotation = presence.Rotation;
4898 4975
4899 if (sendTexture) 4976 if (sendTexture)
4900 textureEntry = presence.Appearance.Texture.GetBytes(); 4977 textureEntry = presence.Appearance.Texture.GetBytes();
@@ -5001,13 +5078,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5001 5078
5002 protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data) 5079 protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data)
5003 { 5080 {
5081 Vector3 offsetPosition = data.OffsetPosition;
5082 Quaternion rotation = data.Rotation;
5083 uint parentID = data.ParentID;
5084
5085 if (parentID != 0)
5086 {
5087 SceneObjectPart part = m_scene.GetSceneObjectPart(parentID);
5088 if (part != null && part != part.ParentGroup.RootPart)
5089 {
5090 offsetPosition = part.OffsetPosition + data.OffsetPosition * part.RotationOffset;
5091 rotation = part.RotationOffset * data.Rotation;
5092 parentID = part.ParentGroup.RootPart.LocalId;
5093 }
5094 }
5095
5004 byte[] objectData = new byte[76]; 5096 byte[] objectData = new byte[76];
5005 5097
5006 data.CollisionPlane.ToBytes(objectData, 0); 5098 data.CollisionPlane.ToBytes(objectData, 0);
5007 data.OffsetPosition.ToBytes(objectData, 16); 5099 offsetPosition.ToBytes(objectData, 16);
5008// data.Velocity.ToBytes(objectData, 28); 5100// data.Velocity.ToBytes(objectData, 28);
5009// data.Acceleration.ToBytes(objectData, 40); 5101// data.Acceleration.ToBytes(objectData, 40);
5010 data.Rotation.ToBytes(objectData, 52); 5102 rotation.ToBytes(objectData, 52);
5011 //data.AngularVelocity.ToBytes(objectData, 64); 5103 //data.AngularVelocity.ToBytes(objectData, 64);
5012 5104
5013 ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock(); 5105 ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
@@ -5021,7 +5113,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5021 update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + 5113 update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " +
5022 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); 5114 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle);
5023 update.ObjectData = objectData; 5115 update.ObjectData = objectData;
5024 update.ParentID = data.ParentID; 5116 update.ParentID = parentID;
5025 update.PathCurve = 16; 5117 update.PathCurve = 16;
5026 update.PathScaleX = 100; 5118 update.PathScaleX = 100;
5027 update.PathScaleY = 100; 5119 update.PathScaleY = 100;
@@ -5039,10 +5131,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5039 update.TextureEntry = Utils.EmptyBytes; 5131 update.TextureEntry = Utils.EmptyBytes;
5040// update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes; 5132// update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes;
5041 5133
5134/* all this flags seem related to prims and not avatars. This allow for wrong viewer side move of a avatar in prim edition mode (anv mantis 854)
5042 update.UpdateFlags = (uint)( 5135 update.UpdateFlags = (uint)(
5043 PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner | 5136 PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner |
5044 PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer | 5137 PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer |
5045 PrimFlags.ObjectOwnerModify); 5138 PrimFlags.ObjectOwnerModify);
5139*/
5140 update.UpdateFlags = 0;
5046 5141
5047 return update; 5142 return update;
5048 } 5143 }
@@ -5366,6 +5461,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5366 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false); 5461 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false);
5367 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false); 5462 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false);
5368 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode); 5463 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode);
5464 AddLocalPacketHandler(PacketType.CreateNewOutfitAttachments, HandleCreateNewOutfitAttachments);
5369 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false); 5465 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false);
5370 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents); 5466 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents);
5371 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery); 5467 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery);
@@ -5432,6 +5528,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5432 AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest); 5528 AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest);
5433 AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes); 5529 AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes);
5434 AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard); 5530 AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard);
5531 AddLocalPacketHandler(PacketType.ChangeInventoryItemFlags, HandleChangeInventoryItemFlags);
5435 5532
5436 AddGenericPacketHandler("autopilot", HandleAutopilot); 5533 AddGenericPacketHandler("autopilot", HandleAutopilot);
5437 } 5534 }
@@ -5470,6 +5567,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5470 (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) || 5567 (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) ||
5471 (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) || 5568 (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) ||
5472 (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) || 5569 (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) ||
5570 (x.ControlFlags != 0) ||
5473 (x.Far != m_lastAgentUpdateArgs.Far) || 5571 (x.Far != m_lastAgentUpdateArgs.Far) ||
5474 (x.Flags != m_lastAgentUpdateArgs.Flags) || 5572 (x.Flags != m_lastAgentUpdateArgs.Flags) ||
5475 (x.State != m_lastAgentUpdateArgs.State) || 5573 (x.State != m_lastAgentUpdateArgs.State) ||
@@ -6368,6 +6466,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6368 { 6466 {
6369 handlerCompleteMovementToRegion(sender, true); 6467 handlerCompleteMovementToRegion(sender, true);
6370 } 6468 }
6469 else
6470 m_log.Debug("HandleCompleteAgentMovement NULL handler");
6471
6371 handlerCompleteMovementToRegion = null; 6472 handlerCompleteMovementToRegion = null;
6372 6473
6373 return true; 6474 return true;
@@ -6385,7 +6486,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6385 return true; 6486 return true;
6386 } 6487 }
6387 #endregion 6488 #endregion
6388 6489/*
6389 StartAnim handlerStartAnim = null; 6490 StartAnim handlerStartAnim = null;
6390 StopAnim handlerStopAnim = null; 6491 StopAnim handlerStopAnim = null;
6391 6492
@@ -6409,6 +6510,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6409 } 6510 }
6410 } 6511 }
6411 return true; 6512 return true;
6513*/
6514 ChangeAnim handlerChangeAnim = null;
6515
6516 for (int i = 0; i < AgentAni.AnimationList.Length; i++)
6517 {
6518 handlerChangeAnim = OnChangeAnim;
6519 if (handlerChangeAnim != null)
6520 {
6521 handlerChangeAnim(AgentAni.AnimationList[i].AnimID, AgentAni.AnimationList[i].StartAnim, false);
6522 }
6523 }
6524
6525 handlerChangeAnim = OnChangeAnim;
6526 if (handlerChangeAnim != null)
6527 {
6528 handlerChangeAnim(UUID.Zero, false, true);
6529 }
6530
6531 return true;
6412 } 6532 }
6413 6533
6414 private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack) 6534 private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack)
@@ -7034,10 +7154,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7034 // 46,47,48 are special positions within the packet 7154 // 46,47,48 are special positions within the packet
7035 // This may change so perhaps we need a better way 7155 // This may change so perhaps we need a better way
7036 // of storing this (OMV.FlagUpdatePacket.UsePhysics,etc?) 7156 // of storing this (OMV.FlagUpdatePacket.UsePhysics,etc?)
7037 bool UsePhysics = (data[46] != 0) ? true : false; 7157 /*
7038 bool IsTemporary = (data[47] != 0) ? true : false; 7158 bool UsePhysics = (data[46] != 0) ? true : false;
7039 bool IsPhantom = (data[48] != 0) ? true : false; 7159 bool IsTemporary = (data[47] != 0) ? true : false;
7040 handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, this); 7160 bool IsPhantom = (data[48] != 0) ? true : false;
7161 handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, this);
7162 */
7163 bool UsePhysics = flags.AgentData.UsePhysics;
7164 bool IsPhantom = flags.AgentData.IsPhantom;
7165 bool IsTemporary = flags.AgentData.IsTemporary;
7166 ObjectFlagUpdatePacket.ExtraPhysicsBlock[] blocks = flags.ExtraPhysics;
7167 ExtraPhysicsData physdata = new ExtraPhysicsData();
7168
7169 if (blocks == null || blocks.Length == 0)
7170 {
7171 physdata.PhysShapeType = PhysShapeType.invalid;
7172 }
7173 else
7174 {
7175 ObjectFlagUpdatePacket.ExtraPhysicsBlock phsblock = blocks[0];
7176 physdata.PhysShapeType = (PhysShapeType)phsblock.PhysicsShapeType;
7177 physdata.Bounce = phsblock.Restitution;
7178 physdata.Density = phsblock.Density;
7179 physdata.Friction = phsblock.Friction;
7180 physdata.GravitationModifier = phsblock.GravityMultiplier;
7181 }
7182
7183 handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, physdata, this);
7041 } 7184 }
7042 return true; 7185 return true;
7043 } 7186 }
@@ -8638,16 +8781,61 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8638 8781
8639 #region Parcel related packets 8782 #region Parcel related packets
8640 8783
8784 // acumulate several HandleRegionHandleRequest consecutive overlaping requests
8785 // to be done with minimal resources as possible
8786 // variables temporary here while in test
8787
8788 Queue<UUID> RegionHandleRequests = new Queue<UUID>();
8789 bool RegionHandleRequestsInService = false;
8790
8641 private bool HandleRegionHandleRequest(IClientAPI sender, Packet Pack) 8791 private bool HandleRegionHandleRequest(IClientAPI sender, Packet Pack)
8642 { 8792 {
8643 RegionHandleRequestPacket rhrPack = (RegionHandleRequestPacket)Pack; 8793 UUID currentUUID;
8644 8794
8645 RegionHandleRequest handlerRegionHandleRequest = OnRegionHandleRequest; 8795 RegionHandleRequest handlerRegionHandleRequest = OnRegionHandleRequest;
8646 if (handlerRegionHandleRequest != null) 8796
8797 if (handlerRegionHandleRequest == null)
8798 return true;
8799
8800 RegionHandleRequestPacket rhrPack = (RegionHandleRequestPacket)Pack;
8801
8802 lock (RegionHandleRequests)
8647 { 8803 {
8648 handlerRegionHandleRequest(this, rhrPack.RequestBlock.RegionID); 8804 if (RegionHandleRequestsInService)
8805 {
8806 // we are already busy doing a previus request
8807 // so enqueue it
8808 RegionHandleRequests.Enqueue(rhrPack.RequestBlock.RegionID);
8809 return true;
8810 }
8811
8812 // else do it
8813 currentUUID = rhrPack.RequestBlock.RegionID;
8814 RegionHandleRequestsInService = true;
8649 } 8815 }
8650 return true; 8816
8817 while (true)
8818 {
8819 handlerRegionHandleRequest(this, currentUUID);
8820
8821 lock (RegionHandleRequests)
8822 {
8823 // exit condition, nothing to do or closed
8824 // current code seems to assume we may loose the handler at anytime,
8825 // so keep checking it
8826 handlerRegionHandleRequest = OnRegionHandleRequest;
8827
8828 if (RegionHandleRequests.Count == 0 || !IsActive || handlerRegionHandleRequest == null)
8829 {
8830 RegionHandleRequests.Clear();
8831 RegionHandleRequestsInService = false;
8832 return true;
8833 }
8834 currentUUID = RegionHandleRequests.Dequeue();
8835 }
8836 }
8837
8838 return true; // actually unreached
8651 } 8839 }
8652 8840
8653 private bool HandleParcelInfoRequest(IClientAPI sender, Packet Pack) 8841 private bool HandleParcelInfoRequest(IClientAPI sender, Packet Pack)
@@ -9903,7 +10091,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9903 handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID, 10091 handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID,
9904 Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName), 10092 Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName),
9905 UpdateMuteListEntry.MuteData.MuteType, 10093 UpdateMuteListEntry.MuteData.MuteType,
9906 UpdateMuteListEntry.AgentData.AgentID); 10094 UpdateMuteListEntry.MuteData.MuteFlags);
9907 return true; 10095 return true;
9908 } 10096 }
9909 return false; 10097 return false;
@@ -9918,8 +10106,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9918 { 10106 {
9919 handlerRemoveMuteListEntry(this, 10107 handlerRemoveMuteListEntry(this,
9920 RemoveMuteListEntry.MuteData.MuteID, 10108 RemoveMuteListEntry.MuteData.MuteID,
9921 Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName), 10109 Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName));
9922 RemoveMuteListEntry.AgentData.AgentID);
9923 return true; 10110 return true;
9924 } 10111 }
9925 return false; 10112 return false;
@@ -9963,10 +10150,55 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9963 return false; 10150 return false;
9964 } 10151 }
9965 10152
10153 private bool HandleChangeInventoryItemFlags(IClientAPI client, Packet packet)
10154 {
10155 ChangeInventoryItemFlagsPacket ChangeInventoryItemFlags =
10156 (ChangeInventoryItemFlagsPacket)packet;
10157 ChangeInventoryItemFlags handlerChangeInventoryItemFlags = OnChangeInventoryItemFlags;
10158 if (handlerChangeInventoryItemFlags != null)
10159 {
10160 foreach(ChangeInventoryItemFlagsPacket.InventoryDataBlock b in ChangeInventoryItemFlags.InventoryData)
10161 handlerChangeInventoryItemFlags(this, b.ItemID, b.Flags);
10162 return true;
10163 }
10164 return false;
10165 }
10166
9966 private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack) 10167 private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack)
9967 { 10168 {
9968 return true; 10169 return true;
9969 } 10170 }
10171
10172 private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack)
10173 {
10174 CreateNewOutfitAttachmentsPacket packet = (CreateNewOutfitAttachmentsPacket)Pack;
10175
10176 #region Packet Session and User Check
10177 if (m_checkPackets)
10178 {
10179 if (packet.AgentData.SessionID != SessionId ||
10180 packet.AgentData.AgentID != AgentId)
10181 return true;
10182 }
10183 #endregion
10184 MoveItemsAndLeaveCopy handlerMoveItemsAndLeaveCopy = null;
10185 List<InventoryItemBase> items = new List<InventoryItemBase>();
10186 foreach (CreateNewOutfitAttachmentsPacket.ObjectDataBlock n in packet.ObjectData)
10187 {
10188 InventoryItemBase b = new InventoryItemBase();
10189 b.ID = n.OldItemID;
10190 b.Folder = n.OldFolderID;
10191 items.Add(b);
10192 }
10193
10194 handlerMoveItemsAndLeaveCopy = OnMoveItemsAndLeaveCopy;
10195 if (handlerMoveItemsAndLeaveCopy != null)
10196 {
10197 handlerMoveItemsAndLeaveCopy(this, items, packet.HeaderData.NewFolderID);
10198 }
10199
10200 return true;
10201 }
9970 10202
9971 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack) 10203 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack)
9972 { 10204 {
@@ -10393,6 +10625,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10393 groupProfileReply.GroupData.MaturePublish = d.MaturePublish; 10625 groupProfileReply.GroupData.MaturePublish = d.MaturePublish;
10394 groupProfileReply.GroupData.OwnerRole = d.OwnerRole; 10626 groupProfileReply.GroupData.OwnerRole = d.OwnerRole;
10395 10627
10628 Scene scene = (Scene)m_scene;
10629 if (scene.Permissions.IsGod(sender.AgentId) && (!sender.IsGroupMember(groupProfileRequest.GroupData.GroupID)))
10630 {
10631 ScenePresence p;
10632 if (scene.TryGetScenePresence(sender.AgentId, out p))
10633 {
10634 if (p.GodLevel >= 200)
10635 {
10636 groupProfileReply.GroupData.OpenEnrollment = true;
10637 groupProfileReply.GroupData.MembershipFee = 0;
10638 }
10639 }
10640 }
10641
10396 OutPacket(groupProfileReply, ThrottleOutPacketType.Task); 10642 OutPacket(groupProfileReply, ThrottleOutPacketType.Task);
10397 } 10643 }
10398 return true; 10644 return true;
@@ -10966,11 +11212,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10966 11212
10967 StartLure handlerStartLure = OnStartLure; 11213 StartLure handlerStartLure = OnStartLure;
10968 if (handlerStartLure != null) 11214 if (handlerStartLure != null)
10969 handlerStartLure(startLureRequest.Info.LureType, 11215 {
10970 Utils.BytesToString( 11216 for (int i = 0 ; i < startLureRequest.TargetData.Length ; i++)
10971 startLureRequest.Info.Message), 11217 {
10972 startLureRequest.TargetData[0].TargetID, 11218 handlerStartLure(startLureRequest.Info.LureType,
10973 this); 11219 Utils.BytesToString(
11220 startLureRequest.Info.Message),
11221 startLureRequest.TargetData[i].TargetID,
11222 this);
11223 }
11224 }
10974 return true; 11225 return true;
10975 } 11226 }
10976 private bool HandleTeleportLureRequest(IClientAPI sender, Packet Pack) 11227 private bool HandleTeleportLureRequest(IClientAPI sender, Packet Pack)
@@ -11084,10 +11335,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11084 } 11335 }
11085 #endregion 11336 #endregion
11086 11337
11087 ClassifiedDelete handlerClassifiedGodDelete = OnClassifiedGodDelete; 11338 ClassifiedGodDelete handlerClassifiedGodDelete = OnClassifiedGodDelete;
11088 if (handlerClassifiedGodDelete != null) 11339 if (handlerClassifiedGodDelete != null)
11089 handlerClassifiedGodDelete( 11340 handlerClassifiedGodDelete(
11090 classifiedGodDelete.Data.ClassifiedID, 11341 classifiedGodDelete.Data.ClassifiedID,
11342 classifiedGodDelete.Data.QueryID,
11091 this); 11343 this);
11092 return true; 11344 return true;
11093 } 11345 }
@@ -11453,209 +11705,147 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11453 } 11705 }
11454 else 11706 else
11455 { 11707 {
11456// m_log.DebugFormat( 11708 ClientChangeObject updatehandler = onClientChangeObject;
11457// "[CLIENT]: Processing block {0} type {1} for {2} {3}",
11458// i, block.Type, part.Name, part.LocalId);
11459 11709
11460// // Do this once since fetch parts creates a new array. 11710 if (updatehandler != null)
11461// SceneObjectPart[] parts = part.ParentGroup.Parts; 11711 {
11462// for (int j = 0; j < parts.Length; j++) 11712 ObjectChangeData udata = new ObjectChangeData();
11463// {
11464// part.StoreUndoState();
11465// parts[j].IgnoreUndoUpdate = true;
11466// }
11467 11713
11468 UpdatePrimGroupRotation handlerUpdatePrimGroupRotation; 11714 /*ubit from ll JIRA:
11715 * 0x01 position
11716 * 0x02 rotation
11717 * 0x04 scale
11718
11719 * 0x08 LINK_SET
11720 * 0x10 UNIFORM for scale
11721 */
11469 11722
11470 switch (block.Type) 11723 // translate to internal changes
11471 { 11724 // not all cases .. just the ones older code did
11472 case 1:
11473 Vector3 pos1 = new Vector3(block.Data, 0);
11474 11725
11475 UpdateVector handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11726 switch (block.Type)
11476 if (handlerUpdatePrimSinglePosition != null) 11727 {
11477 { 11728 case 1: //change position sp
11478 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 11729 udata.position = new Vector3(block.Data, 0);
11479 handlerUpdatePrimSinglePosition(localId, pos1, this);
11480 }
11481 break;
11482 11730
11483 case 2: 11731 udata.change = ObjectChangeType.primP;
11484 Quaternion rot1 = new Quaternion(block.Data, 0, true); 11732 updatehandler(localId, udata, this);
11733 break;
11485 11734
11486 UpdatePrimSingleRotation handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; 11735 case 2: // rotation sp
11487 if (handlerUpdatePrimSingleRotation != null) 11736 udata.rotation = new Quaternion(block.Data, 0, true);
11488 {
11489 // m_log.Info("new tab rotation is " + rot1.X + " , " + rot1.Y + " , " + rot1.Z + " , " + rot1.W);
11490 handlerUpdatePrimSingleRotation(localId, rot1, this);
11491 }
11492 break;
11493 11737
11494 case 3: 11738 udata.change = ObjectChangeType.primR;
11495 Vector3 rotPos = new Vector3(block.Data, 0); 11739 updatehandler(localId, udata, this);
11496 Quaternion rot2 = new Quaternion(block.Data, 12, true); 11740 break;
11497 11741
11498 UpdatePrimSingleRotationPosition handlerUpdatePrimSingleRotationPosition = OnUpdatePrimSingleRotationPosition; 11742 case 3: // position plus rotation
11499 if (handlerUpdatePrimSingleRotationPosition != null) 11743 udata.position = new Vector3(block.Data, 0);
11500 { 11744 udata.rotation = new Quaternion(block.Data, 12, true);
11501 // m_log.Debug("new mouse rotation position is " + rotPos.X + " , " + rotPos.Y + " , " + rotPos.Z);
11502 // m_log.Info("new mouse rotation is " + rot2.X + " , " + rot2.Y + " , " + rot2.Z + " , " + rot2.W);
11503 handlerUpdatePrimSingleRotationPosition(localId, rot2, rotPos, this);
11504 }
11505 break;
11506 11745
11507 case 4: 11746 udata.change = ObjectChangeType.primPR;
11508 case 20: 11747 updatehandler(localId, udata, this);
11509 Vector3 scale4 = new Vector3(block.Data, 0); 11748 break;
11510 11749
11511 UpdateVector handlerUpdatePrimScale = OnUpdatePrimScale; 11750 case 4: // scale sp
11512 if (handlerUpdatePrimScale != null) 11751 udata.scale = new Vector3(block.Data, 0);
11513 { 11752 udata.change = ObjectChangeType.primS;
11514 // m_log.Debug("new scale is " + scale4.X + " , " + scale4.Y + " , " + scale4.Z);
11515 handlerUpdatePrimScale(localId, scale4, this);
11516 }
11517 break;
11518 11753
11519 case 5: 11754 updatehandler(localId, udata, this);
11520 Vector3 scale1 = new Vector3(block.Data, 12); 11755 break;
11521 Vector3 pos11 = new Vector3(block.Data, 0);
11522 11756
11523 handlerUpdatePrimScale = OnUpdatePrimScale; 11757 case 0x14: // uniform scale sp
11524 if (handlerUpdatePrimScale != null) 11758 udata.scale = new Vector3(block.Data, 0);
11525 {
11526 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11527 handlerUpdatePrimScale(localId, scale1, this);
11528 11759
11529 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11760 udata.change = ObjectChangeType.primUS;
11530 if (handlerUpdatePrimSinglePosition != null) 11761 updatehandler(localId, udata, this);
11531 { 11762 break;
11532 handlerUpdatePrimSinglePosition(localId, pos11, this);
11533 }
11534 }
11535 break;
11536 11763
11537 case 9: 11764 case 5: // scale and position sp
11538 Vector3 pos2 = new Vector3(block.Data, 0); 11765 udata.position = new Vector3(block.Data, 0);
11766 udata.scale = new Vector3(block.Data, 12);
11539 11767
11540 UpdateVector handlerUpdateVector = OnUpdatePrimGroupPosition; 11768 udata.change = ObjectChangeType.primPS;
11769 updatehandler(localId, udata, this);
11770 break;
11541 11771
11542 if (handlerUpdateVector != null) 11772 case 0x15: //uniform scale and position
11543 { 11773 udata.position = new Vector3(block.Data, 0);
11544 handlerUpdateVector(localId, pos2, this); 11774 udata.scale = new Vector3(block.Data, 12);
11545 }
11546 break;
11547 11775
11548 case 10: 11776 udata.change = ObjectChangeType.primPUS;
11549 Quaternion rot3 = new Quaternion(block.Data, 0, true); 11777 updatehandler(localId, udata, this);
11778 break;
11550 11779
11551 UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation; 11780 // now group related (bit 4)
11552 if (handlerUpdatePrimRotation != null) 11781 case 9: //( 8 + 1 )group position
11553 { 11782 udata.position = new Vector3(block.Data, 0);
11554 // Console.WriteLine("new rotation is " + rot3.X + " , " + rot3.Y + " , " + rot3.Z + " , " + rot3.W);
11555 handlerUpdatePrimRotation(localId, rot3, this);
11556 }
11557 break;
11558 11783
11559 case 11: 11784 udata.change = ObjectChangeType.groupP;
11560 Vector3 pos3 = new Vector3(block.Data, 0); 11785 updatehandler(localId, udata, this);
11561 Quaternion rot4 = new Quaternion(block.Data, 12, true); 11786 break;
11562 11787
11563 handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; 11788 case 0x0A: // (8 + 2) group rotation
11564 if (handlerUpdatePrimGroupRotation != null) 11789 udata.rotation = new Quaternion(block.Data, 0, true);
11565 {
11566 // m_log.Debug("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
11567 // m_log.Debug("new group mouse rotation is " + rot4.X + " , " + rot4.Y + " , " + rot4.Z + " , " + rot4.W);
11568 handlerUpdatePrimGroupRotation(localId, pos3, rot4, this);
11569 }
11570 break;
11571 case 12:
11572 case 28:
11573 Vector3 scale7 = new Vector3(block.Data, 0);
11574 11790
11575 UpdateVector handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; 11791 udata.change = ObjectChangeType.groupR;
11576 if (handlerUpdatePrimGroupScale != null) 11792 updatehandler(localId, udata, this);
11577 { 11793 break;
11578 // m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z);
11579 handlerUpdatePrimGroupScale(localId, scale7, this);
11580 }
11581 break;
11582 11794
11583 case 13: 11795 case 0x0B: //( 8 + 2 + 1) group rotation and position
11584 Vector3 scale2 = new Vector3(block.Data, 12); 11796 udata.position = new Vector3(block.Data, 0);
11585 Vector3 pos4 = new Vector3(block.Data, 0); 11797 udata.rotation = new Quaternion(block.Data, 12, true);
11586 11798
11587 handlerUpdatePrimScale = OnUpdatePrimScale; 11799 udata.change = ObjectChangeType.groupPR;
11588 if (handlerUpdatePrimScale != null) 11800 updatehandler(localId, udata, this);
11589 { 11801 break;
11590 //m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11591 handlerUpdatePrimScale(localId, scale2, this);
11592 11802
11593 // Change the position based on scale (for bug number 246) 11803 case 0x0C: // (8 + 4) group scale
11594 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11804 // only afects root prim and only sent by viewer editor object tab scaling
11595 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 11805 // mouse edition only allows uniform scaling
11596 if (handlerUpdatePrimSinglePosition != null) 11806 // SL MAY CHANGE THIS in viewers
11597 {
11598 handlerUpdatePrimSinglePosition(localId, pos4, this);
11599 }
11600 }
11601 break;
11602 11807
11603 case 29: 11808 udata.scale = new Vector3(block.Data, 0);
11604 Vector3 scale5 = new Vector3(block.Data, 12);
11605 Vector3 pos5 = new Vector3(block.Data, 0);
11606 11809
11607 handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; 11810 udata.change = ObjectChangeType.groupS;
11608 if (handlerUpdatePrimGroupScale != null) 11811 updatehandler(localId, udata, this);
11609 {
11610 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11611 part.StoreUndoState(true);
11612 part.IgnoreUndoUpdate = true;
11613 handlerUpdatePrimGroupScale(localId, scale5, this);
11614 handlerUpdateVector = OnUpdatePrimGroupPosition;
11615 11812
11616 if (handlerUpdateVector != null) 11813 break;
11617 {
11618 handlerUpdateVector(localId, pos5, this);
11619 }
11620 11814
11621 part.IgnoreUndoUpdate = false; 11815 case 0x0D: //(8 + 4 + 1) group scale and position
11622 } 11816 // exception as above
11623 11817
11624 break; 11818 udata.position = new Vector3(block.Data, 0);
11819 udata.scale = new Vector3(block.Data, 12);
11625 11820
11626 case 21: 11821 udata.change = ObjectChangeType.groupPS;
11627 Vector3 scale6 = new Vector3(block.Data, 12); 11822 updatehandler(localId, udata, this);
11628 Vector3 pos6 = new Vector3(block.Data, 0); 11823 break;
11629 11824
11630 handlerUpdatePrimScale = OnUpdatePrimScale; 11825 case 0x1C: // (0x10 + 8 + 4 ) group scale UNIFORM
11631 if (handlerUpdatePrimScale != null) 11826 udata.scale = new Vector3(block.Data, 0);
11632 {
11633 part.StoreUndoState(false);
11634 part.IgnoreUndoUpdate = true;
11635 11827
11636 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); 11828 udata.change = ObjectChangeType.groupUS;
11637 handlerUpdatePrimScale(localId, scale6, this); 11829 updatehandler(localId, udata, this);
11638 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 11830 break;
11639 if (handlerUpdatePrimSinglePosition != null)
11640 {
11641 handlerUpdatePrimSinglePosition(localId, pos6, this);
11642 }
11643 11831
11644 part.IgnoreUndoUpdate = false; 11832 case 0x1D: // (UNIFORM + GROUP + SCALE + POS)
11645 } 11833 udata.position = new Vector3(block.Data, 0);
11646 break; 11834 udata.scale = new Vector3(block.Data, 12);
11647 11835
11648 default: 11836 udata.change = ObjectChangeType.groupPUS;
11649 m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type)); 11837 updatehandler(localId, udata, this);
11650 break; 11838 break;
11839
11840 default:
11841 m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type));
11842 break;
11843 }
11651 } 11844 }
11652 11845
11653// for (int j = 0; j < parts.Length; j++)
11654// parts[j].IgnoreUndoUpdate = false;
11655 } 11846 }
11656 } 11847 }
11657 } 11848 }
11658
11659 return true; 11849 return true;
11660 } 11850 }
11661 11851
@@ -12103,7 +12293,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12103// "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}", 12293// "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}",
12104// requestID, taskID, (SourceType)sourceType, Name); 12294// requestID, taskID, (SourceType)sourceType, Name);
12105 12295
12296
12297 //Note, the bool returned from the below function is useless since it is always false.
12106 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived); 12298 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
12299
12107 } 12300 }
12108 12301
12109 /// <summary> 12302 /// <summary>
@@ -12169,7 +12362,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12169 /// <returns></returns> 12362 /// <returns></returns>
12170 private static int CalculateNumPackets(byte[] data) 12363 private static int CalculateNumPackets(byte[] data)
12171 { 12364 {
12172 const uint m_maxPacketSize = 600; 12365// const uint m_maxPacketSize = 600;
12366 uint m_maxPacketSize = MaxTransferBytesPerPacket;
12173 int numPackets = 1; 12367 int numPackets = 1;
12174 12368
12175 if (data == null) 12369 if (data == null)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 8963756..c472176 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -158,6 +158,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
158 158
159 private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC 159 private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC
160 private int m_maxRTO = 60000; 160 private int m_maxRTO = 60000;
161 public bool m_deliverPackets = true;
161 162
162 /// <summary> 163 /// <summary>
163 /// Default constructor 164 /// Default constructor
@@ -440,6 +441,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
440 if (category >= 0 && category < m_packetOutboxes.Length) 441 if (category >= 0 && category < m_packetOutboxes.Length)
441 { 442 {
442 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category]; 443 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category];
444
445 if (m_deliverPackets == false)
446 {
447 queue.Enqueue(packet);
448 return true;
449 }
450
443 TokenBucket bucket = m_throttleCategories[category]; 451 TokenBucket bucket = m_throttleCategories[category];
444 452
445 // Don't send this packet if there is already a packet waiting in the queue 453 // Don't send this packet if there is already a packet waiting in the queue
@@ -489,7 +497,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
489 /// <returns>True if any packets were sent, otherwise false</returns> 497 /// <returns>True if any packets were sent, otherwise false</returns>
490 public bool DequeueOutgoing() 498 public bool DequeueOutgoing()
491 { 499 {
492 OutgoingPacket packet; 500 if (m_deliverPackets == false) return false;
501
502 OutgoingPacket packet = null;
493 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue; 503 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue;
494 TokenBucket bucket; 504 TokenBucket bucket;
495 bool packetSent = false; 505 bool packetSent = false;
@@ -521,32 +531,49 @@ namespace OpenSim.Region.ClientStack.LindenUDP
521 // No dequeued packet waiting to be sent, try to pull one off 531 // No dequeued packet waiting to be sent, try to pull one off
522 // this queue 532 // this queue
523 queue = m_packetOutboxes[i]; 533 queue = m_packetOutboxes[i];
524 if (queue.Dequeue(out packet)) 534 if (queue != null)
525 { 535 {
526 // A packet was pulled off the queue. See if we have 536 bool success = false;
527 // enough tokens in the bucket to send it out 537 try
528 if (bucket.RemoveTokens(packet.Buffer.DataLength))
529 { 538 {
530 // Send the packet 539 success = queue.Dequeue(out packet);
531 m_udpServer.SendPacketFinal(packet);
532 packetSent = true;
533 } 540 }
534 else 541 catch
535 { 542 {
536 // Save the dequeued packet for the next iteration 543 m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>();
537 m_nextPackets[i] = packet;
538 } 544 }
539 545 if (success)
540 // If the queue is empty after this dequeue, fire the queue 546 {
541 // empty callback now so it has a chance to fill before we 547 // A packet was pulled off the queue. See if we have
542 // get back here 548 // enough tokens in the bucket to send it out
543 if (queue.Count == 0) 549 if (bucket.RemoveTokens(packet.Buffer.DataLength))
550 {
551 // Send the packet
552 m_udpServer.SendPacketFinal(packet);
553 packetSent = true;
554 }
555 else
556 {
557 // Save the dequeued packet for the next iteration
558 m_nextPackets[i] = packet;
559 }
560
561 // If the queue is empty after this dequeue, fire the queue
562 // empty callback now so it has a chance to fill before we
563 // get back here
564 if (queue.Count == 0)
565 emptyCategories |= CategoryToFlag(i);
566 }
567 else
568 {
569 // No packets in this queue. Fire the queue empty callback
570 // if it has not been called recently
544 emptyCategories |= CategoryToFlag(i); 571 emptyCategories |= CategoryToFlag(i);
572 }
545 } 573 }
546 else 574 else
547 { 575 {
548 // No packets in this queue. Fire the queue empty callback 576 m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>();
549 // if it has not been called recently
550 emptyCategories |= CategoryToFlag(i); 577 emptyCategories |= CategoryToFlag(i);
551 } 578 }
552 } 579 }
@@ -704,4 +731,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP
704 } 731 }
705 } 732 }
706 } 733 }
707} \ No newline at end of file 734}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 14cc863..b8951d9 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -113,7 +113,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
113 /// <summary>Handlers for incoming packets</summary> 113 /// <summary>Handlers for incoming packets</summary>
114 //PacketEventDictionary packetEvents = new PacketEventDictionary(); 114 //PacketEventDictionary packetEvents = new PacketEventDictionary();
115 /// <summary>Incoming packets that are awaiting handling</summary> 115 /// <summary>Incoming packets that are awaiting handling</summary>
116 private OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>(); 116 //private OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>();
117
118 private DoubleQueue<IncomingPacket> packetInbox = new DoubleQueue<IncomingPacket>();
117 119
118 /// <summary></summary> 120 /// <summary></summary>
119 //private UDPClientCollection m_clients = new UDPClientCollection(); 121 //private UDPClientCollection m_clients = new UDPClientCollection();
@@ -168,6 +170,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
168 /// <summary>Flag to signal when clients should send pings</summary> 170 /// <summary>Flag to signal when clients should send pings</summary>
169 protected bool m_sendPing; 171 protected bool m_sendPing;
170 172
173 private ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>> m_pendingCache = new ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>>();
171 private Pool<IncomingPacket> m_incomingPacketPool; 174 private Pool<IncomingPacket> m_incomingPacketPool;
172 175
173 private Stat m_incomingPacketPoolStat; 176 private Stat m_incomingPacketPoolStat;
@@ -974,21 +977,46 @@ namespace OpenSim.Region.ClientStack.LindenUDP
974 977
975 #region Packet to Client Mapping 978 #region Packet to Client Mapping
976 979
977 // UseCircuitCode handling 980 // If there is already a client for this endpoint, don't process UseCircuitCode
978 if (packet.Type == PacketType.UseCircuitCode) 981 IClientAPI client = null;
982 if (!m_scene.TryGetClient(endPoint, out client) || !(client is LLClientView))
979 { 983 {
980 // We need to copy the endpoint so that it doesn't get changed when another thread reuses the 984 // UseCircuitCode handling
981 // buffer. 985 if (packet.Type == PacketType.UseCircuitCode)
982 object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet }; 986 {
987 // And if there is a UseCircuitCode pending, also drop it
988 lock (m_pendingCache)
989 {
990 if (m_pendingCache.Contains(endPoint))
991 return;
983 992
984 Util.FireAndForget(HandleUseCircuitCode, array); 993 m_pendingCache.AddOrUpdate(endPoint, new Queue<UDPPacketBuffer>(), 60);
994 }
985 995
986 return; 996 // We need to copy the endpoint so that it doesn't get changed when another thread reuses the
997 // buffer.
998 object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet };
999
1000 Util.FireAndForget(HandleUseCircuitCode, array);
1001
1002 return;
1003 }
1004 }
1005
1006 // If this is a pending connection, enqueue, don't process yet
1007 lock (m_pendingCache)
1008 {
1009 Queue<UDPPacketBuffer> queue;
1010 if (m_pendingCache.TryGetValue(endPoint, out queue))
1011 {
1012 //m_log.DebugFormat("[LLUDPSERVER]: Enqueued a {0} packet into the pending queue", packet.Type);
1013 queue.Enqueue(buffer);
1014 return;
1015 }
987 } 1016 }
988 1017
989 // Determine which agent this packet came from 1018 // Determine which agent this packet came from
990 IClientAPI client; 1019 if (client == null || !(client is LLClientView))
991 if (!m_scene.TryGetClient(endPoint, out client) || !(client is LLClientView))
992 { 1020 {
993 //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); 1021 //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
994 return; 1022 return;
@@ -997,7 +1025,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
997 udpClient = ((LLClientView)client).UDPClient; 1025 udpClient = ((LLClientView)client).UDPClient;
998 1026
999 if (!udpClient.IsConnected) 1027 if (!udpClient.IsConnected)
1028 {
1029// m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName);
1000 return; 1030 return;
1031 }
1001 1032
1002 #endregion Packet to Client Mapping 1033 #endregion Packet to Client Mapping
1003 1034
@@ -1127,7 +1158,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1127 incomingPacket = new IncomingPacket((LLClientView)client, packet); 1158 incomingPacket = new IncomingPacket((LLClientView)client, packet);
1128 } 1159 }
1129 1160
1130 packetInbox.Enqueue(incomingPacket); 1161 if (incomingPacket.Packet.Type == PacketType.AgentUpdate ||
1162 incomingPacket.Packet.Type == PacketType.ChatFromViewer)
1163 packetInbox.EnqueueHigh(incomingPacket);
1164 else
1165 packetInbox.EnqueueLow(incomingPacket);
1131 } 1166 }
1132 1167
1133 #region BinaryStats 1168 #region BinaryStats
@@ -1247,6 +1282,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1247 // We only want to send initial data to new clients, not ones which are being converted from child to root. 1282 // We only want to send initial data to new clients, not ones which are being converted from child to root.
1248 if (client != null) 1283 if (client != null)
1249 client.SceneAgent.SendInitialDataToMe(); 1284 client.SceneAgent.SendInitialDataToMe();
1285
1286 // Now we know we can handle more data
1287 Thread.Sleep(200);
1288
1289 // Obtain the queue and remove it from the cache
1290 Queue<UDPPacketBuffer> queue = null;
1291
1292 lock (m_pendingCache)
1293 {
1294 if (!m_pendingCache.TryGetValue(endPoint, out queue))
1295 {
1296 m_log.DebugFormat("[LLUDPSERVER]: Client created but no pending queue present");
1297 return;
1298 }
1299 m_pendingCache.Remove(endPoint);
1300 }
1301
1302 m_log.DebugFormat("[LLUDPSERVER]: Client created, processing pending queue, {0} entries", queue.Count);
1303
1304 // Reinject queued packets
1305 while(queue.Count > 0)
1306 {
1307 UDPPacketBuffer buf = queue.Dequeue();
1308 PacketReceived(buf);
1309 }
1310 queue = null;
1250 } 1311 }
1251 else 1312 else
1252 { 1313 {
@@ -1254,6 +1315,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1254 m_log.WarnFormat( 1315 m_log.WarnFormat(
1255 "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}", 1316 "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}",
1256 uccp.CircuitCode.ID, m_scene.RegionInfo.RegionName, uccp.CircuitCode.Code, endPoint); 1317 uccp.CircuitCode.ID, m_scene.RegionInfo.RegionName, uccp.CircuitCode.Code, endPoint);
1318 lock (m_pendingCache)
1319 m_pendingCache.Remove(endPoint);
1257 } 1320 }
1258 1321
1259 // m_log.DebugFormat( 1322 // m_log.DebugFormat(
@@ -1372,7 +1435,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1372 if (!client.SceneAgent.IsChildAgent) 1435 if (!client.SceneAgent.IsChildAgent)
1373 client.Kick("Simulator logged you out due to connection timeout"); 1436 client.Kick("Simulator logged you out due to connection timeout");
1374 1437
1375 client.CloseWithoutChecks(); 1438 client.CloseWithoutChecks(true);
1376 } 1439 }
1377 } 1440 }
1378 1441
@@ -1384,6 +1447,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1384 1447
1385 while (IsRunningInbound) 1448 while (IsRunningInbound)
1386 { 1449 {
1450 m_scene.ThreadAlive(1);
1387 try 1451 try
1388 { 1452 {
1389 IncomingPacket incomingPacket = null; 1453 IncomingPacket incomingPacket = null;
@@ -1431,6 +1495,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1431 1495
1432 while (base.IsRunningOutbound) 1496 while (base.IsRunningOutbound)
1433 { 1497 {
1498 m_scene.ThreadAlive(2);
1434 try 1499 try
1435 { 1500 {
1436 m_packetSent = false; 1501 m_packetSent = false;
@@ -1652,8 +1717,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1652 Packet packet = incomingPacket.Packet; 1717 Packet packet = incomingPacket.Packet;
1653 LLClientView client = incomingPacket.Client; 1718 LLClientView client = incomingPacket.Client;
1654 1719
1655 if (client.IsActive) 1720// if (client.IsActive)
1656 { 1721// {
1657 m_currentIncomingClient = client; 1722 m_currentIncomingClient = client;
1658 1723
1659 try 1724 try
@@ -1680,13 +1745,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1680 { 1745 {
1681 m_currentIncomingClient = null; 1746 m_currentIncomingClient = null;
1682 } 1747 }
1683 } 1748// }
1684 else 1749// else
1685 { 1750// {
1686 m_log.DebugFormat( 1751// m_log.DebugFormat(
1687 "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}", 1752// "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}",
1688 packet.Type, client.Name, m_scene.RegionInfo.RegionName); 1753// packet.Type, client.Name, m_scene.RegionInfo.RegionName);
1689 } 1754// }
1690 } 1755 }
1691 1756
1692 protected void LogoutHandler(IClientAPI client) 1757 protected void LogoutHandler(IClientAPI client)
@@ -1696,8 +1761,116 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1696 if (!client.IsLoggingOut) 1761 if (!client.IsLoggingOut)
1697 { 1762 {
1698 client.IsLoggingOut = true; 1763 client.IsLoggingOut = true;
1699 client.Close(); 1764 client.Close(false, false);
1765 }
1766 }
1767 }
1768
1769 internal class DoubleQueue<T> where T:class
1770 {
1771 private Queue<T> m_lowQueue = new Queue<T>();
1772 private Queue<T> m_highQueue = new Queue<T>();
1773
1774 private object m_syncRoot = new object();
1775 private Semaphore m_s = new Semaphore(0, 1);
1776
1777 public DoubleQueue()
1778 {
1779 }
1780
1781 public virtual int Count
1782 {
1783 get { return m_highQueue.Count + m_lowQueue.Count; }
1784 }
1785
1786 public virtual void Enqueue(T data)
1787 {
1788 Enqueue(m_lowQueue, data);
1789 }
1790
1791 public virtual void EnqueueLow(T data)
1792 {
1793 Enqueue(m_lowQueue, data);
1794 }
1795
1796 public virtual void EnqueueHigh(T data)
1797 {
1798 Enqueue(m_highQueue, data);
1799 }
1800
1801 private void Enqueue(Queue<T> q, T data)
1802 {
1803 lock (m_syncRoot)
1804 {
1805 m_lowQueue.Enqueue(data);
1806 m_s.WaitOne(0);
1807 m_s.Release();
1808 }
1809 }
1810
1811 public virtual T Dequeue()
1812 {
1813 return Dequeue(Timeout.Infinite);
1814 }
1815
1816 public virtual T Dequeue(int tmo)
1817 {
1818 return Dequeue(TimeSpan.FromMilliseconds(tmo));
1819 }
1820
1821 public virtual T Dequeue(TimeSpan wait)
1822 {
1823 T res = null;
1824
1825 if (!Dequeue(wait, ref res))
1826 return null;
1827
1828 return res;
1829 }
1830
1831 public bool Dequeue(int timeout, ref T res)
1832 {
1833 return Dequeue(TimeSpan.FromMilliseconds(timeout), ref res);
1834 }
1835
1836 public bool Dequeue(TimeSpan wait, ref T res)
1837 {
1838 if (!m_s.WaitOne(wait))
1839 return false;
1840
1841 lock (m_syncRoot)
1842 {
1843 if (m_highQueue.Count > 0)
1844 res = m_highQueue.Dequeue();
1845 else
1846 res = m_lowQueue.Dequeue();
1847
1848 if (m_highQueue.Count == 0 && m_lowQueue.Count == 0)
1849 return true;
1850
1851 try
1852 {
1853 m_s.Release();
1854 }
1855 catch
1856 {
1857 }
1858
1859 return true;
1860 }
1861 }
1862
1863 public virtual void Clear()
1864 {
1865
1866 lock (m_syncRoot)
1867 {
1868 // Make sure sem count is 0
1869 m_s.WaitOne(0);
1870
1871 m_lowQueue.Clear();
1872 m_highQueue.Clear();
1700 } 1873 }
1701 } 1874 }
1702 } 1875 }
1703} \ No newline at end of file 1876}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index 85cbb06..8bd3461 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -116,10 +116,6 @@ namespace OpenMetaverse
116 const int SIO_UDP_CONNRESET = -1744830452; 116 const int SIO_UDP_CONNRESET = -1744830452;
117 117
118 IPEndPoint ipep = new IPEndPoint(m_localBindAddress, m_udpPort); 118 IPEndPoint ipep = new IPEndPoint(m_localBindAddress, m_udpPort);
119
120 m_log.DebugFormat(
121 "[UDPBASE]: Binding UDP listener using internal IP address config {0}:{1}",
122 ipep.Address, ipep.Port);
123 119
124 m_udpSocket = new Socket( 120 m_udpSocket = new Socket(
125 AddressFamily.InterNetwork, 121 AddressFamily.InterNetwork,