aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs12
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 0923010..04228de 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -7,7 +7,6 @@ using OpenSim.Framework;
7using OpenSim.Framework.Console; 7using OpenSim.Framework.Console;
8using OpenSim.Framework.Communications; 8using OpenSim.Framework.Communications;
9 9
10
11namespace OpenSim.Region.Environment.Scenes 10namespace OpenSim.Region.Environment.Scenes
12{ 11{
13 public delegate void KillObjectDelegate(uint localID); 12 public delegate void KillObjectDelegate(uint localID);
@@ -28,16 +27,12 @@ namespace OpenSim.Region.Environment.Scenes
28 public KillObjectDelegate KillObject; 27 public KillObjectDelegate KillObject;
29 public string _debugRegionName = ""; 28 public string _debugRegionName = "";
30 29
31
32 public string debugRegionName 30 public string debugRegionName
33 { 31 {
34 get { return _debugRegionName; } 32 get { return _debugRegionName; }
35 set 33 set
36 { 34 {
37 _debugRegionName = value; 35 _debugRegionName = value;
38
39
40
41 } 36 }
42 } 37 }
43 38
@@ -64,13 +59,10 @@ namespace OpenSim.Region.Environment.Scenes
64 regionCommsHost.OnPrimCrossingIntoRegion += PrimCrossing; 59 regionCommsHost.OnPrimCrossingIntoRegion += PrimCrossing;
65 regionCommsHost.OnCloseAgentConnection += CloseConnection; 60 regionCommsHost.OnCloseAgentConnection += CloseConnection;
66 regionCommsHost.OnRegionUp += newRegionUp; 61 regionCommsHost.OnRegionUp += newRegionUp;
67
68
69 } 62 }
70 else 63 else
71 { 64 {
72 //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: registered with gridservice and got null"); 65 //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: registered with gridservice and got null");
73
74 } 66 }
75 } 67 }
76 68
@@ -360,8 +352,6 @@ namespace OpenSim.Region.Environment.Scenes
360 return m_commsProvider.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position, isFlying); 352 return m_commsProvider.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position, isFlying);
361 } 353 }
362 354
363
364
365 public bool PrimCrossToNeighboringRegion(ulong regionhandle, LLUUID primID, LLVector3 position, bool isPhysical) 355 public bool PrimCrossToNeighboringRegion(ulong regionhandle, LLUUID primID, LLVector3 position, bool isPhysical)
366 { 356 {
367 return m_commsProvider.InterRegion.ExpectPrimCrossing(regionhandle, primID, position, isPhysical); 357 return m_commsProvider.InterRegion.ExpectPrimCrossing(regionhandle, primID, position, isPhysical);
@@ -371,11 +361,9 @@ namespace OpenSim.Region.Environment.Scenes
371 { 361 {
372 foreach (ulong regionHandle in presence.KnownChildRegions) 362 foreach (ulong regionHandle in presence.KnownChildRegions)
373 { 363 {
374
375 m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, presence.ControllingClient.AgentId); 364 m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, presence.ControllingClient.AgentId);
376 presence.RemoveNeighbourRegion(regionHandle); 365 presence.RemoveNeighbourRegion(regionHandle);
377 } 366 }
378 } 367 }
379 } 368 }
380} 369}
381