diff options
author | Tleiades Hax | 2007-10-19 06:10:35 +0000 |
---|---|---|
committer | Tleiades Hax | 2007-10-19 06:10:35 +0000 |
commit | d79a3cc5e175369e5ddb931f87eb86b1155763ad (patch) | |
tree | b699c5c2d24c8a9cc38f9bb556f876a571e1ff15 /OpenSim/Region | |
parent | checking in linux libode.so and config (diff) | |
download | opensim-SC-d79a3cc5e175369e5ddb931f87eb86b1155763ad.zip opensim-SC-d79a3cc5e175369e5ddb931f87eb86b1155763ad.tar.gz opensim-SC-d79a3cc5e175369e5ddb931f87eb86b1155763ad.tar.bz2 opensim-SC-d79a3cc5e175369e5ddb931f87eb86b1155763ad.tar.xz |
r 2113 introduced a leak, this should fix the leak
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index ab8a48a..a3857c6 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1065,6 +1065,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
1065 | 1065 | ||
1066 | delegate void InformClientOfNeighbourDelegate(IClientAPI remoteClient, AgentCircuitData a, ulong regionHandle, IPEndPoint endPoint); | 1066 | delegate void InformClientOfNeighbourDelegate(IClientAPI remoteClient, AgentCircuitData a, ulong regionHandle, IPEndPoint endPoint); |
1067 | 1067 | ||
1068 | private void InformClientOfNeighbourCompleted(IAsyncResult iar) | ||
1069 | { | ||
1070 | InformClientOfNeighbourDelegate icon = (InformClientOfNeighbourDelegate)iar.AsyncState; | ||
1071 | |||
1072 | |||
1073 | icon.EndInvoke(iar); | ||
1074 | } | ||
1075 | |||
1068 | /// <summary> | 1076 | /// <summary> |
1069 | /// Async compnent for informing client of which neighbours exists | 1077 | /// Async compnent for informing client of which neighbours exists |
1070 | /// </summary> | 1078 | /// </summary> |
@@ -1075,7 +1083,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1075 | /// <param name="a"></param> | 1083 | /// <param name="a"></param> |
1076 | /// <param name="regionHandle"></param> | 1084 | /// <param name="regionHandle"></param> |
1077 | /// <param name="endPoint"></param> | 1085 | /// <param name="endPoint"></param> |
1078 | public void InformClientOfNeighbourAsync(IClientAPI remoteClient, AgentCircuitData a, ulong regionHandle, IPEndPoint endPoint) | 1086 | private void InformClientOfNeighbourAsync(IClientAPI remoteClient, AgentCircuitData a, ulong regionHandle, IPEndPoint endPoint) |
1079 | { | 1087 | { |
1080 | bool regionAccepted = commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, a); | 1088 | bool regionAccepted = commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, a); |
1081 | 1089 | ||
@@ -1100,7 +1108,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1100 | agent.child = true; | 1108 | agent.child = true; |
1101 | 1109 | ||
1102 | InformClientOfNeighbourDelegate d = new InformClientOfNeighbourDelegate(InformClientOfNeighbourAsync); | 1110 | InformClientOfNeighbourDelegate d = new InformClientOfNeighbourDelegate(InformClientOfNeighbourAsync); |
1103 | IAsyncResult asyncInform = d.BeginInvoke(remoteClient, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint, null, null); | 1111 | IAsyncResult asyncInform = d.BeginInvoke(remoteClient, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint, |
1112 | new AsyncCallback(InformClientOfNeighbourCompleted), | ||
1113 | null); | ||
1104 | //this.capsHandlers[remoteClient.AgentId].CreateEstablishAgentComms("", System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr) + ":" + neighbours[i].CommsIPListenPort); | 1114 | //this.capsHandlers[remoteClient.AgentId].CreateEstablishAgentComms("", System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr) + ":" + neighbours[i].CommsIPListenPort); |
1105 | } | 1115 | } |
1106 | } | 1116 | } |