aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRobert Adams2013-01-17 14:51:52 -0800
committerRobert Adams2013-01-17 14:51:52 -0800
commita6afd2f706c6a99668faa0af8c75c5836c1e79d9 (patch)
treec0265f0e526a8aed9b05006cbc2b3e6dcb4afdaf /OpenSim
parentBulletSim: Add one function that all actors who act on the physical (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-a6afd2f706c6a99668faa0af8c75c5836c1e79d9.zip
opensim-SC_OLD-a6afd2f706c6a99668faa0af8c75c5836c1e79d9.tar.gz
opensim-SC_OLD-a6afd2f706c6a99668faa0af8c75c5836c1e79d9.tar.bz2
opensim-SC_OLD-a6afd2f706c6a99668faa0af8c75c5836c1e79d9.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/ThrottleOutPacketType.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs17
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs4
4 files changed, 6 insertions, 21 deletions
diff --git a/OpenSim/Framework/ThrottleOutPacketType.cs b/OpenSim/Framework/ThrottleOutPacketType.cs
index d56231a..ca4b126 100644
--- a/OpenSim/Framework/ThrottleOutPacketType.cs
+++ b/OpenSim/Framework/ThrottleOutPacketType.cs
@@ -47,9 +47,6 @@ namespace OpenSim.Framework
47 Texture = 5, 47 Texture = 5,
48 /// <summary>Non-texture assets</summary> 48 /// <summary>Non-texture assets</summary>
49 Asset = 6, 49 Asset = 6,
50 /// <summary>Avatar and primitive data</summary>
51 /// <remarks>This is a sub-category of Task</remarks>
52 State = 7,
53 } 50 }
54 51
55 [Flags] 52 [Flags]
@@ -61,6 +58,5 @@ namespace OpenSim.Framework
61 Task = 1 << 3, 58 Task = 1 << 3,
62 Texture = 1 << 4, 59 Texture = 1 << 4,
63 Asset = 1 << 5, 60 Asset = 1 << 5,
64 State = 1 << 6,
65 } 61 }
66} 62}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 967fa44..0ccd69a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1588,7 +1588,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1588 1588
1589 if (localIDs.Count == 1 && m_scene.GetScenePresence(localIDs[0]) != null) 1589 if (localIDs.Count == 1 && m_scene.GetScenePresence(localIDs[0]) != null)
1590 { 1590 {
1591 OutPacket(kill, ThrottleOutPacketType.State); 1591 OutPacket(kill, ThrottleOutPacketType.Task);
1592 } 1592 }
1593 else 1593 else
1594 { 1594 {
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 8963756..621e0fd 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -278,7 +278,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
278 public string GetStats() 278 public string GetStats()
279 { 279 {
280 return string.Format( 280 return string.Format(
281 "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7} {12,7}", 281 "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}",
282 Util.EnvironmentTickCountSubtract(TickLastPacketReceived), 282 Util.EnvironmentTickCountSubtract(TickLastPacketReceived),
283 PacketsReceived, 283 PacketsReceived,
284 PacketsSent, 284 PacketsSent,
@@ -290,8 +290,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
290 m_packetOutboxes[(int)ThrottleOutPacketType.Cloud].Count, 290 m_packetOutboxes[(int)ThrottleOutPacketType.Cloud].Count,
291 m_packetOutboxes[(int)ThrottleOutPacketType.Task].Count, 291 m_packetOutboxes[(int)ThrottleOutPacketType.Task].Count,
292 m_packetOutboxes[(int)ThrottleOutPacketType.Texture].Count, 292 m_packetOutboxes[(int)ThrottleOutPacketType.Texture].Count,
293 m_packetOutboxes[(int)ThrottleOutPacketType.Asset].Count, 293 m_packetOutboxes[(int)ThrottleOutPacketType.Asset].Count);
294 m_packetOutboxes[(int)ThrottleOutPacketType.State].Count);
295 } 294 }
296 295
297 public void SendPacketStats() 296 public void SendPacketStats()
@@ -337,8 +336,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
337 int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4; 336 int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
338 int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4; 337 int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
339 int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 338 int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
340 // State is a subcategory of task that we allocate a percentage to
341 int state = 0;
342 339
343 // Make sure none of the throttles are set below our packet MTU, 340 // Make sure none of the throttles are set below our packet MTU,
344 // otherwise a throttle could become permanently clogged 341 // otherwise a throttle could become permanently clogged
@@ -375,9 +372,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
375 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Task]; 372 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Task];
376 bucket.RequestedDripRate = task; 373 bucket.RequestedDripRate = task;
377 374
378 bucket = m_throttleCategories[(int)ThrottleOutPacketType.State];
379 bucket.RequestedDripRate = state;
380
381 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Texture]; 375 bucket = m_throttleCategories[(int)ThrottleOutPacketType.Texture];
382 bucket.RequestedDripRate = texture; 376 bucket.RequestedDripRate = texture;
383 377
@@ -678,9 +672,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
678 Texture = 5, 672 Texture = 5,
679 /// <summary>Non-texture assets</summary> 673 /// <summary>Non-texture assets</summary>
680 Asset = 6, 674 Asset = 6,
681 /// <summary>Avatar and primitive data</summary>
682 /// <remarks>This is a sub-category of Task</remarks>
683 State = 7,
684 */ 675 */
685 676
686 switch (category) 677 switch (category)
@@ -697,11 +688,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
697 return ThrottleOutPacketTypeFlags.Texture; 688 return ThrottleOutPacketTypeFlags.Texture;
698 case ThrottleOutPacketType.Asset: 689 case ThrottleOutPacketType.Asset:
699 return ThrottleOutPacketTypeFlags.Asset; 690 return ThrottleOutPacketTypeFlags.Asset;
700 case ThrottleOutPacketType.State:
701 return ThrottleOutPacketTypeFlags.State;
702 default: 691 default:
703 return 0; 692 return 0;
704 } 693 }
705 } 694 }
706 } 695 }
707} \ No newline at end of file 696}
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 41ca13b..b188741 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -212,11 +212,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
212 protected override GridRegion GetFinalDestination(GridRegion region) 212 protected override GridRegion GetFinalDestination(GridRegion region)
213 { 213 {
214 int flags = Scene.GridService.GetRegionFlags(Scene.RegionInfo.ScopeID, region.RegionID); 214 int flags = Scene.GridService.GetRegionFlags(Scene.RegionInfo.ScopeID, region.RegionID);
215 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: region {0} flags: {1}", region.RegionID, flags); 215 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: region {0} flags: {1}", region.RegionName, flags);
216 216
217 if ((flags & (int)OpenSim.Framework.RegionFlags.Hyperlink) != 0) 217 if ((flags & (int)OpenSim.Framework.RegionFlags.Hyperlink) != 0)
218 { 218 {
219 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region {0} is hyperlink", region.RegionID); 219 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region is hyperlink");
220 GridRegion real_destination = m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID); 220 GridRegion real_destination = m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID);
221 if (real_destination != null) 221 if (real_destination != null)
222 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: GetFinalDestination serveruri -> {0}", real_destination.ServerURI); 222 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: GetFinalDestination serveruri -> {0}", real_destination.ServerURI);