aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs18
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs8
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs1
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs7
6 files changed, 20 insertions, 23 deletions
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 6fd0191..9a73cc2 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -395,14 +395,14 @@ namespace OpenSim.Data.Tests
395 return i; 395 return i;
396 } 396 }
397 397
398 private InventoryFolderBase NewFolder(UUID id, UUID parent, UUID owner, string name) 398// private InventoryFolderBase NewFolder(UUID id, UUID parent, UUID owner, string name)
399 { 399// {
400 InventoryFolderBase f = new InventoryFolderBase(); 400// InventoryFolderBase f = new InventoryFolderBase();
401 f.ID = id; 401// f.ID = id;
402 f.ParentID = parent; 402// f.ParentID = parent;
403 f.Owner = owner; 403// f.Owner = owner;
404 f.Name = name; 404// f.Name = name;
405 return f; 405// return f;
406 } 406// }
407 } 407 }
408} \ No newline at end of file 408} \ No newline at end of file
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index da0ce79..15bc646 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -594,10 +594,10 @@ namespace OpenSim.Framework.Servers
594 case "application/xml": 594 case "application/xml":
595 default: 595 default:
596 // Point of note.. the DoWeHaveA methods check for an EXACT path 596 // Point of note.. the DoWeHaveA methods check for an EXACT path
597 if (request.RawUrl.Contains("/CAPS/EQG")) 597// if (request.RawUrl.Contains("/CAPS/EQG"))
598 { 598// {
599 int i = 1; 599// int i = 1;
600 } 600// }
601 if (DoWeHaveALLSDHandler(request.RawUrl)) 601 if (DoWeHaveALLSDHandler(request.RawUrl))
602 { 602 {
603 HandleLLSDRequests(request, response); 603 HandleLLSDRequests(request, response);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 1c7bbec..af760ae 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -783,8 +783,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
783 783
784 ClientLoop(); 784 ClientLoop();
785 } 785 }
786 } 786 }
787 //Todo set as Generic Exception again.
788 catch (System.Exception e) 787 catch (System.Exception e)
789 { 788 {
790 if (e is ThreadAbortException) 789 if (e is ThreadAbortException)
@@ -794,7 +793,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
794 StatsManager.SimExtraStats.AddAbnormalClientThreadTermination(); 793 StatsManager.SimExtraStats.AddAbnormalClientThreadTermination();
795 794
796 // Don't let a failure in an individual client thread crash the whole sim. 795 // Don't let a failure in an individual client thread crash the whole sim.
797 m_log.ErrorFormat("[CLIENT]: Client thread for {0} {1} crashed. Logging them out. Exception {2}", Name, AgentId, e); 796 m_log.ErrorFormat(
797 "[CLIENT]: Client thread for {0} {1} crashed. Logging them out. Exception {2}", Name, AgentId, e);
798 798
799 try 799 try
800 { 800 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index a1118cb..78a916d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -762,7 +762,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
762 { 762 {
763 Packet packet = item.Packet; 763 Packet packet = item.Packet;
764 764
765
766 // Assign sequence number here to prevent out of order packets 765 // Assign sequence number here to prevent out of order packets
767 if (packet.Header.Sequence == 0) 766 if (packet.Header.Sequence == 0)
768 { 767 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 81c789a..39ade56 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -413,10 +413,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
413 } 413 }
414 } 414 }
415 415
416
417 private static int ScaleThrottle(int value, int curmax, int newmax) 416 private static int ScaleThrottle(int value, int curmax, int newmax)
418 { 417 {
419 return (value / curmax) * newmax; 418 return (int)((value / (float)curmax) * newmax);
420 } 419 }
421 420
422 public byte[] GetThrottlesPacked(float multiplier) 421 public byte[] GetThrottlesPacked(float multiplier)
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
index 2eb1618..76fb141 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
@@ -268,10 +268,9 @@ namespace OpenSim.Region.Environment.Modules.Framework
268 { 268 {
269 return ProcessQueue(m_dhttpMethod,agentID, caps); 269 return ProcessQueue(m_dhttpMethod,agentID, caps);
270 })); 270 }));
271 271
272 bool boolval = false;
273 // This will persist this beyond the expiry of the caps handlers 272 // This will persist this beyond the expiry of the caps handlers
274 boolval = m_scene.AddHTTPHandler(capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2); 273 m_scene.AddHTTPHandler(capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2);
275 274
276 Random rnd = new Random(System.Environment.TickCount); 275 Random rnd = new Random(System.Environment.TickCount);
277 lock (m_ids) 276 lock (m_ids)
@@ -421,7 +420,7 @@ namespace OpenSim.Region.Environment.Modules.Framework
421 string capuuid = path.Replace("/CAPS/EQG/",""); 420 string capuuid = path.Replace("/CAPS/EQG/","");
422 capuuid = capuuid.Substring(0, capuuid.Length - 1); 421 capuuid = capuuid.Substring(0, capuuid.Length - 1);
423 422
424 UUID AvatarID = UUID.Zero; 423// UUID AvatarID = UUID.Zero;
425 UUID capUUID = UUID.Zero; 424 UUID capUUID = UUID.Zero;
426 if (UUID.TryParse(capuuid, out capUUID)) 425 if (UUID.TryParse(capuuid, out capUUID))
427 { 426 {