diff options
Diffstat (limited to 'OpenSim/Region/Environment/EstateManager.cs')
-rw-r--r-- | OpenSim/Region/Environment/EstateManager.cs | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs index edc86e5..860bd93 100644 --- a/OpenSim/Region/Environment/EstateManager.cs +++ b/OpenSim/Region/Environment/EstateManager.cs | |||
@@ -41,6 +41,8 @@ namespace OpenSim.Region.Environment | |||
41 | /// </summary> | 41 | /// </summary> |
42 | public class EstateManager | 42 | public class EstateManager |
43 | { | 43 | { |
44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
45 | |||
44 | private Scene m_scene; | 46 | private Scene m_scene; |
45 | private RegionInfo m_regInfo; | 47 | private RegionInfo m_regInfo; |
46 | 48 | ||
@@ -156,7 +158,7 @@ namespace OpenSim.Region.Environment | |||
156 | { | 158 | { |
157 | case "getinfo": | 159 | case "getinfo": |
158 | 160 | ||
159 | //MainLog.Instance.Verbose("ESTATE","CLIENT--->" + packet.ToString()); | 161 | //m_log.Info("[ESTATE]: CLIENT--->" + packet.ToString()); |
160 | sendRegionInfoPacketToAll(); | 162 | sendRegionInfoPacketToAll(); |
161 | if (m_scene.PermissionsMngr.GenericEstatePermission(remote_client.AgentId)) | 163 | if (m_scene.PermissionsMngr.GenericEstatePermission(remote_client.AgentId)) |
162 | { | 164 | { |
@@ -223,7 +225,7 @@ namespace OpenSim.Region.Environment | |||
223 | } | 225 | } |
224 | break; | 226 | break; |
225 | default: | 227 | default: |
226 | MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString()); | 228 | m_log.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString()); |
227 | break; | 229 | break; |
228 | } | 230 | } |
229 | } | 231 | } |
@@ -283,7 +285,7 @@ namespace OpenSim.Region.Environment | |||
283 | returnblock[8].Parameter = Helpers.StringToField("1"); | 285 | returnblock[8].Parameter = Helpers.StringToField("1"); |
284 | 286 | ||
285 | packet.ParamList = returnblock; | 287 | packet.ParamList = returnblock; |
286 | //MainLog.Instance.Verbose("ESTATE", "SIM--->" + packet.ToString()); | 288 | //m_log.Info("[ESTATE]: SIM--->" + packet.ToString()); |
287 | remote_client.OutPacket(packet, ThrottleOutPacketType.Task); | 289 | remote_client.OutPacket(packet, ThrottleOutPacketType.Task); |
288 | 290 | ||
289 | sendEstateManagerList(remote_client, packet); | 291 | sendEstateManagerList(remote_client, packet); |
@@ -322,7 +324,7 @@ namespace OpenSim.Region.Environment | |||
322 | returnblock[j].Parameter = EstateManagers[i].GetBytes(); j++; | 324 | returnblock[j].Parameter = EstateManagers[i].GetBytes(); j++; |
323 | } | 325 | } |
324 | packet.ParamList = returnblock; | 326 | packet.ParamList = returnblock; |
325 | //MainLog.Instance.Verbose("ESTATE", "SIM--->" + packet.ToString()); | 327 | //m_log.Info("[ESTATE]: SIM--->" + packet.ToString()); |
326 | remote_client.OutPacket(packet, ThrottleOutPacketType.Task); | 328 | remote_client.OutPacket(packet, ThrottleOutPacketType.Task); |
327 | } | 329 | } |
328 | 330 | ||
@@ -364,10 +366,10 @@ namespace OpenSim.Region.Environment | |||
364 | 366 | ||
365 | default: | 367 | default: |
366 | 368 | ||
367 | MainLog.Instance.Error("EstateOwnerMessage: Unknown EstateAccessType requested in estateAccessDelta\n" + packet.ToString()); | 369 | m_log.Error("EstateOwnerMessage: Unknown EstateAccessType requested in estateAccessDelta\n" + packet.ToString()); |
368 | break; | 370 | break; |
369 | } | 371 | } |
370 | //MainLog.Instance.Error("EstateOwnerMessage: estateAccessDelta\n" + packet.ToString()); | 372 | //m_log.Error("EstateOwnerMessage: estateAccessDelta\n" + packet.ToString()); |
371 | 373 | ||
372 | 374 | ||
373 | } | 375 | } |
@@ -375,7 +377,7 @@ namespace OpenSim.Region.Environment | |||
375 | { | 377 | { |
376 | if (packet.ParamList.Length != 9) | 378 | if (packet.ParamList.Length != 9) |
377 | { | 379 | { |
378 | MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length"); | 380 | m_log.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length"); |
379 | } | 381 | } |
380 | else | 382 | else |
381 | { | 383 | { |
@@ -438,7 +440,7 @@ namespace OpenSim.Region.Environment | |||
438 | { | 440 | { |
439 | if (packet.ParamList.Length != 9) | 441 | if (packet.ParamList.Length != 9) |
440 | { | 442 | { |
441 | MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length"); | 443 | m_log.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length"); |
442 | } | 444 | } |
443 | else | 445 | else |
444 | { | 446 | { |
@@ -463,7 +465,7 @@ namespace OpenSim.Region.Environment | |||
463 | } | 465 | } |
464 | catch (Exception ex) | 466 | catch (Exception ex) |
465 | { | 467 | { |
466 | MainLog.Instance.Error("EstateManager: Exception while setting terrain settings: \n" + packet.ToString() + "\n" + ex.ToString()); | 468 | m_log.Error("EstateManager: Exception while setting terrain settings: \n" + packet.ToString() + "\n" + ex.ToString()); |
467 | } | 469 | } |
468 | } | 470 | } |
469 | } | 471 | } |