aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2009-02-11 21:07:41 +0000
committerdiva2009-02-11 21:07:41 +0000
commitb6e7e5ed424c4c26c3f86f8decbd2b15a5ab90e1 (patch)
treec7b8ebb8ce301eaacdb37929330252667143eddf
parent* minor: remove some mono compiler warnings (diff)
downloadopensim-SC_OLD-b6e7e5ed424c4c26c3f86f8decbd2b15a5ab90e1.zip
opensim-SC_OLD-b6e7e5ed424c4c26c3f86f8decbd2b15a5ab90e1.tar.gz
opensim-SC_OLD-b6e7e5ed424c4c26c3f86f8decbd2b15a5ab90e1.tar.bz2
opensim-SC_OLD-b6e7e5ed424c4c26c3f86f8decbd2b15a5ab90e1.tar.xz
Enforce estate bans on Teleports.
-rw-r--r--OpenSim/Framework/AgentCircuitManager.cs20
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs6
-rw-r--r--OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs486
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs28
5 files changed, 293 insertions, 253 deletions
diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
index 09333bd..56b40bd 100644
--- a/OpenSim/Framework/AgentCircuitManager.cs
+++ b/OpenSim/Framework/AgentCircuitManager.cs
@@ -81,13 +81,25 @@ namespace OpenSim.Framework
81 /// <param name="agentData"></param> 81 /// <param name="agentData"></param>
82 public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData) 82 public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData)
83 { 83 {
84 if (AgentCircuits.ContainsKey(circuitCode)) 84 lock (AgentCircuits)
85 { 85 {
86 AgentCircuits[circuitCode] = agentData; 86 if (AgentCircuits.ContainsKey(circuitCode))
87 {
88 AgentCircuits[circuitCode] = agentData;
89 }
90 else
91 {
92 AgentCircuits.Add(circuitCode, agentData);
93 }
87 } 94 }
88 else 95 }
96
97 public virtual void RemoveCircuit(uint circuitCode)
98 {
99 lock (AgentCircuits)
89 { 100 {
90 AgentCircuits.Add(circuitCode, agentData); 101 if (AgentCircuits.ContainsKey(circuitCode))
102 AgentCircuits.Remove(circuitCode);
91 } 103 }
92 } 104 }
93 105
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 45915db..98d75ad 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -538,9 +538,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
538 "[CLIENT]: Close has been called with shutdownCircuit = {0} for {1} attached to scene {2}", 538 "[CLIENT]: Close has been called with shutdownCircuit = {0} for {1} attached to scene {2}",
539 shutdownCircuit, Name, m_scene.RegionInfo.RegionName); 539 shutdownCircuit, Name, m_scene.RegionInfo.RegionName);
540 540
541 m_imageManager.Close(); 541 if (m_imageManager != null)
542 m_imageManager.Close();
542 543
543 m_PacketHandler.Flush(); 544 if (m_PacketHandler != null)
545 m_PacketHandler.Flush();
544 546
545 // raise an event on the packet server to Shutdown the circuit 547 // raise an event on the packet server to Shutdown the circuit
546 // Now, if we raise the event then the packet server will call this method itself, so don't try cleanup 548 // Now, if we raise the event then the packet server will call this method itself, so don't try cleanup
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index bdc4490..eb88715 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -443,9 +443,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
443 443
444 m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy); 444 m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy);
445 445
446 m_log.DebugFormat( 446 //m_log.DebugFormat(
447 "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}", 447 // "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}",
448 useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName); 448 // useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName);
449 } 449 }
450 } 450 }
451 451
diff --git a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
index 5c2fc1c..98536ed 100644
--- a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
@@ -1,245 +1,245 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright 7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the 12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products 13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System; 27using System;
28using System.Collections; 28using System.Collections;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Net.Sockets; 31using System.Net.Sockets;
32using System.Reflection; 32using System.Reflection;
33using System.Threading; 33using System.Threading;
34using System.Xml; 34using System.Xml;
35using OpenMetaverse; 35using OpenMetaverse;
36using log4net; 36using log4net;
37using Nini.Config; 37using Nini.Config;
38using Nwc.XmlRpc; 38using Nwc.XmlRpc;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Region.Framework.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Region.Framework.Scenes; 42using OpenSim.Region.Framework.Scenes;
43 43
44namespace OpenSim.Region.CoreModules.Communications.Local 44namespace OpenSim.Region.CoreModules.Communications.Local
45{ 45{
46 public class LocalInterregionComms : IRegionModule, IInterregionCommsOut, IInterregionCommsIn 46 public class LocalInterregionComms : IRegionModule, IInterregionCommsOut, IInterregionCommsIn
47 { 47 {
48 private bool m_enabled = false; 48 private bool m_enabled = false;
49 49
50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51 private List<Scene> m_sceneList = new List<Scene>(); 51 private List<Scene> m_sceneList = new List<Scene>();
52 52
53 #region Events 53 #region Events
54 public event ChildAgentUpdateReceived OnChildAgentUpdate; 54 public event ChildAgentUpdateReceived OnChildAgentUpdate;
55 55
56 #endregion /* Events */ 56 #endregion /* Events */
57 57
58 #region IRegionModule 58 #region IRegionModule
59 59
60 public void Initialise(Scene scene, IConfigSource config) 60 public void Initialise(Scene scene, IConfigSource config)
61 { 61 {
62 if (m_sceneList.Count == 0) 62 if (m_sceneList.Count == 0)
63 { 63 {
64 IConfig startupConfig = config.Configs["Communications"]; 64 IConfig startupConfig = config.Configs["Communications"];
65 65
66 if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms")) 66 if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms"))
67 { 67 {
68 m_log.Debug("[LOCAL COMMS]: Enabling InterregionComms LocalComms module"); 68 m_log.Debug("[LOCAL COMMS]: Enabling InterregionComms LocalComms module");
69 m_enabled = true; 69 m_enabled = true;
70 } 70 }
71 } 71 }
72 72
73 if (!m_enabled) 73 if (!m_enabled)
74 return; 74 return;
75 75
76 Init(scene); 76 Init(scene);
77 } 77 }
78 78
79 public void PostInitialise() 79 public void PostInitialise()
80 { 80 {
81 } 81 }
82 82
83 public void Close() 83 public void Close()
84 { 84 {
85 } 85 }
86 86
87 public string Name 87 public string Name
88 { 88 {
89 get { return "LocalInterregionCommsModule"; } 89 get { return "LocalInterregionCommsModule"; }
90 } 90 }
91 91
92 public bool IsSharedModule 92 public bool IsSharedModule
93 { 93 {
94 get { return true; } 94 get { return true; }
95 } 95 }
96 /// <summary> 96 /// <summary>
97 /// Can be called from other modules. 97 /// Can be called from other modules.
98 /// </summary> 98 /// </summary>
99 /// <param name="scene"></param> 99 /// <param name="scene"></param>
100 public void Init(Scene scene) 100 public void Init(Scene scene)
101 { 101 {
102 if (!m_sceneList.Contains(scene)) 102 if (!m_sceneList.Contains(scene))
103 { 103 {
104 lock (m_sceneList) 104 lock (m_sceneList)
105 { 105 {
106 m_sceneList.Add(scene); 106 m_sceneList.Add(scene);
107 if (m_enabled) 107 if (m_enabled)
108 scene.RegisterModuleInterface<IInterregionCommsOut>(this); 108 scene.RegisterModuleInterface<IInterregionCommsOut>(this);
109 scene.RegisterModuleInterface<IInterregionCommsIn>(this); 109 scene.RegisterModuleInterface<IInterregionCommsIn>(this);
110 } 110 }
111 111
112 } 112 }
113 } 113 }
114 114
115 #endregion /* IRegionModule */ 115 #endregion /* IRegionModule */
116 116
117 #region IInterregionComms 117 #region IInterregionComms
118 118
119 /** 119 /**
120 * Agent-related communications 120 * Agent-related communications
121 */ 121 */
122 122
123 public bool SendCreateChildAgent(ulong regionHandle, AgentCircuitData aCircuit) 123 public bool SendCreateChildAgent(ulong regionHandle, AgentCircuitData aCircuit)
124 { 124 {
125 foreach (Scene s in m_sceneList) 125 foreach (Scene s in m_sceneList)
126 { 126 {
127 if (s.RegionInfo.RegionHandle == regionHandle) 127 if (s.RegionInfo.RegionHandle == regionHandle)
128 { 128 {
129// m_log.DebugFormat("[LOCAL COMMS]: Found region {0} to send SendCreateChildAgent", regionHandle); 129// m_log.DebugFormat("[LOCAL COMMS]: Found region {0} to send SendCreateChildAgent", regionHandle);
130 s.NewUserConnection(aCircuit); 130 s.NewUserConnection(aCircuit);
131 return true; 131 return true;
132 } 132 }
133 } 133 }
134 134
135// m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for SendCreateChildAgent", regionHandle); 135// m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for SendCreateChildAgent", regionHandle);
136 return false; 136 return false;
137 } 137 }
138 138
139 public bool SendChildAgentUpdate(ulong regionHandle, AgentData cAgentData) 139 public bool SendChildAgentUpdate(ulong regionHandle, AgentData cAgentData)
140 { 140 {
141 foreach (Scene s in m_sceneList) 141 foreach (Scene s in m_sceneList)
142 { 142 {
143 if (s.RegionInfo.RegionHandle == regionHandle) 143 if (s.RegionInfo.RegionHandle == regionHandle)
144 { 144 {
145 //m_log.DebugFormat( 145 //m_log.DebugFormat(
146 // "[LOCAL COMMS]: Found region {0} {1} to send ChildAgentUpdate", 146 // "[LOCAL COMMS]: Found region {0} {1} to send ChildAgentUpdate",
147 // s.RegionInfo.RegionName, regionHandle); 147 // s.RegionInfo.RegionName, regionHandle);
148 148
149 s.IncomingChildAgentDataUpdate(cAgentData); 149 s.IncomingChildAgentDataUpdate(cAgentData);
150 return true; 150 return true;
151 } 151 }
152 } 152 }
153 153
154// m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for ChildAgentUpdate", regionHandle); 154// m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for ChildAgentUpdate", regionHandle);
155 return false; 155 return false;
156 } 156 }
157 157
158 public bool SendChildAgentUpdate(ulong regionHandle, AgentPosition cAgentData) 158 public bool SendChildAgentUpdate(ulong regionHandle, AgentPosition cAgentData)
159 { 159 {
160 foreach (Scene s in m_sceneList) 160 foreach (Scene s in m_sceneList)
161 { 161 {
162 if (s.RegionInfo.RegionHandle == regionHandle) 162 if (s.RegionInfo.RegionHandle == regionHandle)
163 { 163 {
164 //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate"); 164 //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate");
165 s.IncomingChildAgentDataUpdate(cAgentData); 165 s.IncomingChildAgentDataUpdate(cAgentData);
166 return true; 166 return true;
167 } 167 }
168 } 168 }
169 //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate"); 169 //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate");
170 return false; 170 return false;
171 } 171 }
172 172
173 public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri) 173 public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri)
174 { 174 {
175 //uint x, y; 175 //uint x, y;
176 //Utils.LongToUInts(regionHandle, out x, out y); 176 //Utils.LongToUInts(regionHandle, out x, out y);
177 //x = x / Constants.RegionSize; 177 //x = x / Constants.RegionSize;
178 //y = y / Constants.RegionSize; 178 //y = y / Constants.RegionSize;
179 //Console.WriteLine("\n >>> Local SendReleaseAgent " + x + "-" + y); 179 //Console.WriteLine("\n >>> Local SendReleaseAgent " + x + "-" + y);
180 foreach (Scene s in m_sceneList) 180 foreach (Scene s in m_sceneList)
181 { 181 {
182 if (s.RegionInfo.RegionHandle == regionHandle) 182 if (s.RegionInfo.RegionHandle == regionHandle)
183 { 183 {
184 //m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent"); 184 //m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent");
185 return s.IncomingReleaseAgent(id); 185 return s.IncomingReleaseAgent(id);
186 } 186 }
187 } 187 }
188 //m_log.Debug("[LOCAL COMMS]: region not found in SendReleaseAgent"); 188 //m_log.Debug("[LOCAL COMMS]: region not found in SendReleaseAgent");
189 return false; 189 return false;
190 } 190 }
191 191
192 public bool SendCloseAgent(ulong regionHandle, UUID id) 192 public bool SendCloseAgent(ulong regionHandle, UUID id)
193 { 193 {
194 //uint x, y; 194 //uint x, y;
195 //Utils.LongToUInts(regionHandle, out x, out y); 195 //Utils.LongToUInts(regionHandle, out x, out y);
196 //x = x / Constants.RegionSize; 196 //x = x / Constants.RegionSize;
197 //y = y / Constants.RegionSize; 197 //y = y / Constants.RegionSize;
198 //Console.WriteLine("\n >>> Local SendCloseAgent " + x + "-" + y); 198 //Console.WriteLine("\n >>> Local SendCloseAgent " + x + "-" + y);
199 foreach (Scene s in m_sceneList) 199 foreach (Scene s in m_sceneList)
200 { 200 {
201 if (s.RegionInfo.RegionHandle == regionHandle) 201 if (s.RegionInfo.RegionHandle == regionHandle)
202 { 202 {
203 //m_log.Debug("[LOCAL COMMS]: Found region to SendCloseAgent"); 203 //m_log.Debug("[LOCAL COMMS]: Found region to SendCloseAgent");
204 return s.IncomingCloseAgent(id); 204 return s.IncomingCloseAgent(id);
205 } 205 }
206 } 206 }
207 //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent"); 207 //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
208 return false; 208 return false;
209 } 209 }
210 210
211 /** 211 /**
212 * Object-related communications 212 * Object-related communications
213 */ 213 */
214 214
215 public bool SendCreateObject(ulong regionHandle, ISceneObject sog) 215 public bool SendCreateObject(ulong regionHandle, ISceneObject sog)
216 { 216 {
217 foreach (Scene s in m_sceneList) 217 foreach (Scene s in m_sceneList)
218 { 218 {
219 if (s.RegionInfo.RegionHandle == regionHandle) 219 if (s.RegionInfo.RegionHandle == regionHandle)
220 { 220 {
221 //m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject"); 221 //m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");
222 ISceneObject sogClone = sog.CloneForNewScene(); 222 ISceneObject sogClone = sog.CloneForNewScene();
223 return s.IncomingCreateObject(sogClone); 223 return s.IncomingCreateObject(sogClone);
224 } 224 }
225 } 225 }
226 return false; 226 return false;
227 } 227 }
228 228
229 #endregion /* IInterregionComms */ 229 #endregion /* IInterregionComms */
230 230
231 #region Misc 231 #region Misc
232 232
233 public UUID GetRegionID(ulong regionhandle) 233 public UUID GetRegionID(ulong regionhandle)
234 { 234 {
235 foreach (Scene s in m_sceneList) 235 foreach (Scene s in m_sceneList)
236 { 236 {
237 if (s.RegionInfo.RegionHandle == regionhandle) 237 if (s.RegionInfo.RegionHandle == regionhandle)
238 return s.RegionInfo.RegionID; 238 return s.RegionInfo.RegionID;
239 } 239 }
240 // ? weird. should not happen 240 // ? weird. should not happen
241 return m_sceneList[0].RegionInfo.RegionID; 241 return m_sceneList[0].RegionInfo.RegionID;
242 } 242 }
243 #endregion 243 #endregion
244 } 244 }
245} 245}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 18245e5..848b497 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2286,6 +2286,32 @@ namespace OpenSim.Region.Framework.Scenes
2286 2286
2287 public override void AddNewClient(IClientAPI client) 2287 public override void AddNewClient(IClientAPI client)
2288 { 2288 {
2289 if (m_regInfo.EstateSettings.IsBanned(client.AgentId))
2290 {
2291 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
2292 client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName);
2293 client.SendAlertMessage("Denied access to region " + RegionInfo.RegionName + ". You have been banned from that region.");
2294 try
2295 {
2296 IEventQueue eq = RequestModuleInterface<IEventQueue>();
2297 if (eq != null)
2298 {
2299 eq.DisableSimulator(RegionInfo.RegionHandle, client.AgentId);
2300 }
2301 else
2302 client.SendShutdownConnectionNotice();
2303
2304 client.Close(false);
2305 CapsModule.RemoveCapsHandler(client.AgentId);
2306 m_authenticateHandler.RemoveCircuit(client.CircuitCode);
2307 }
2308 catch (Exception e)
2309 {
2310 m_log.DebugFormat("[SCENE]: Exception while closing banned client {0} {1}: {2}", client.FirstName, client.LastName, e.Message);
2311 }
2312 }
2313
2314
2289 SubscribeToClientEvents(client); 2315 SubscribeToClientEvents(client);
2290 ScenePresence presence; 2316 ScenePresence presence;
2291 2317
@@ -2803,7 +2829,7 @@ namespace OpenSim.Region.Framework.Scenes
2803 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) 2829 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
2804 { 2830 {
2805 m_log.WarnFormat( 2831 m_log.WarnFormat(
2806 "[CONNECTION BEGIN]: Denied access to: {0} at {1} because the user is on the region banlist", 2832 "[CONNECTION BEGIN]: Incoming user {0} at {1} is on the region banlist",
2807 agent.AgentID, RegionInfo.RegionName); 2833 agent.AgentID, RegionInfo.RegionName);
2808 } 2834 }
2809 2835