diff options
author | Justin Clark-Casey (justincc) | 2014-01-20 19:16:19 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-01-20 19:37:50 +0000 |
commit | 27abe040bddc11feb78757467c5e330f4cda840b (patch) | |
tree | cc22d0733110efa84b0cc070ed448e9e70a56215 /OpenSim/Region/CoreModules/World/Estate | |
parent | Actually put IsChildAgent = true inside the lock, otherwise there is still a ... (diff) | |
download | opensim-SC_OLD-27abe040bddc11feb78757467c5e330f4cda840b.zip opensim-SC_OLD-27abe040bddc11feb78757467c5e330f4cda840b.tar.gz opensim-SC_OLD-27abe040bddc11feb78757467c5e330f4cda840b.tar.bz2 opensim-SC_OLD-27abe040bddc11feb78757467c5e330f4cda840b.tar.xz |
Stop exceptions being generated on agent connection if a telehub object has been deleted or has no spawn points.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs index 173b603..1659493 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs | |||
@@ -60,7 +60,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
60 | 60 | ||
61 | public void Initialise() | 61 | public void Initialise() |
62 | { | 62 | { |
63 | m_log.DebugFormat("[ESTATE MODULE]: Setting up estate commands for region {0}", m_module.Scene.RegionInfo.RegionName); | 63 | // m_log.DebugFormat("[ESTATE MODULE]: Setting up estate commands for region {0}", m_module.Scene.RegionInfo.RegionName); |
64 | 64 | ||
65 | m_module.Scene.AddCommand("Regions", m_module, "set terrain texture", | 65 | m_module.Scene.AddCommand("Regions", m_module, "set terrain texture", |
66 | "set terrain texture <number> <uuid> [<x>] [<y>]", | 66 | "set terrain texture <number> <uuid> [<x>] [<y>]", |
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 42db1cf..cf74350 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -702,7 +702,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
702 | } | 702 | } |
703 | } | 703 | } |
704 | 704 | ||
705 | public void handleOnEstateManageTelehub(IClientAPI client, UUID invoice, UUID senderID, string cmd, uint param1) | 705 | public void HandleOnEstateManageTelehub(IClientAPI client, UUID invoice, UUID senderID, string cmd, uint param1) |
706 | { | 706 | { |
707 | SceneObjectPart part; | 707 | SceneObjectPart part; |
708 | 708 | ||
@@ -742,7 +742,9 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
742 | default: | 742 | default: |
743 | break; | 743 | break; |
744 | } | 744 | } |
745 | SendTelehubInfo(client); | 745 | |
746 | if (client != null) | ||
747 | SendTelehubInfo(client); | ||
746 | } | 748 | } |
747 | 749 | ||
748 | private void SendSimulatorBlueBoxMessage( | 750 | private void SendSimulatorBlueBoxMessage( |
@@ -1207,7 +1209,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1207 | client.OnEstateRestartSimRequest += handleEstateRestartSimRequest; | 1209 | client.OnEstateRestartSimRequest += handleEstateRestartSimRequest; |
1208 | client.OnEstateChangeCovenantRequest += handleChangeEstateCovenantRequest; | 1210 | client.OnEstateChangeCovenantRequest += handleChangeEstateCovenantRequest; |
1209 | client.OnEstateChangeInfo += handleEstateChangeInfo; | 1211 | client.OnEstateChangeInfo += handleEstateChangeInfo; |
1210 | client.OnEstateManageTelehub += handleOnEstateManageTelehub; | 1212 | client.OnEstateManageTelehub += HandleOnEstateManageTelehub; |
1211 | client.OnUpdateEstateAccessDeltaRequest += handleEstateAccessDeltaRequest; | 1213 | client.OnUpdateEstateAccessDeltaRequest += handleEstateAccessDeltaRequest; |
1212 | client.OnSimulatorBlueBoxMessageRequest += SendSimulatorBlueBoxMessage; | 1214 | client.OnSimulatorBlueBoxMessageRequest += SendSimulatorBlueBoxMessage; |
1213 | client.OnEstateBlueBoxMessageRequest += SendEstateBlueBoxMessage; | 1215 | client.OnEstateBlueBoxMessageRequest += SendEstateBlueBoxMessage; |