aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-20 06:31:03 +0000
committerTeravus Ovares2007-12-20 06:31:03 +0000
commit8aae9094128069b83fbf11cb77503e29fd381b25 (patch)
tree96515c224150272c435c6b004d0950fcd4f07509 /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
parentAdded patch from Johan. First attempt to solve the LibSL.Packet GC problem. W... (diff)
downloadopensim-SC-8aae9094128069b83fbf11cb77503e29fd381b25.zip
opensim-SC-8aae9094128069b83fbf11cb77503e29fd381b25.tar.gz
opensim-SC-8aae9094128069b83fbf11cb77503e29fd381b25.tar.bz2
opensim-SC-8aae9094128069b83fbf11cb77503e29fd381b25.tar.xz
* Added a configuration parameter on the Grid Server to disallow forceful banlists.
* Added a way for Grid based configuration parameters to (generally used in overriding functionality) to get to the regions on Registration.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index c72e344..b184af2 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Region.Environment.Scenes
52 public event PrimCrossing OnPrimCrossingIntoRegion; 52 public event PrimCrossing OnPrimCrossingIntoRegion;
53 public event RegionUp OnRegionUp; 53 public event RegionUp OnRegionUp;
54 public event ChildAgentUpdate OnChildAgentUpdate; 54 public event ChildAgentUpdate OnChildAgentUpdate;
55
55 56
56 public KillObjectDelegate KillObject; 57 public KillObjectDelegate KillObject;
57 public string _debugRegionName = ""; 58 public string _debugRegionName = "";
@@ -101,6 +102,7 @@ namespace OpenSim.Region.Environment.Scenes
101 { 102 {
102 if (regionCommsHost != null) 103 if (regionCommsHost != null)
103 { 104 {
105
104 regionCommsHost.OnChildAgentUpdate -= ChildAgentUpdate; 106 regionCommsHost.OnChildAgentUpdate -= ChildAgentUpdate;
105 regionCommsHost.OnRegionUp -= newRegionUp; 107 regionCommsHost.OnRegionUp -= newRegionUp;
106 regionCommsHost.OnExpectUser -= NewUserConnection; 108 regionCommsHost.OnExpectUser -= NewUserConnection;
@@ -168,6 +170,7 @@ namespace OpenSim.Region.Environment.Scenes
168 OnCloseAgentConnection(regionHandle, agentID); 170 OnCloseAgentConnection(regionHandle, agentID);
169 } 171 }
170 } 172 }
173
171 #endregion 174 #endregion
172 175
173 #region Inform Client of Neighbours 176 #region Inform Client of Neighbours
@@ -466,5 +469,11 @@ namespace OpenSim.Region.Environment.Scenes
466 presence.RemoveNeighbourRegion(regionHandle); 469 presence.RemoveNeighbourRegion(regionHandle);
467 } 470 }
468 } 471 }
472
473 public Dictionary<string, string> GetGridSettings()
474 {
475 return m_commsProvider.GridService.GetGridSettings();
476 }
477
469 } 478 }
470} 479}