diff options
author | Justin Clark-Casey (justincc) | 2014-01-24 19:16:59 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-01-24 19:16:59 +0000 |
commit | 87e725cd2474efcdfec3d85794ef2b877c8b78d6 (patch) | |
tree | ffd2f4e5fffecb84e76f07d3fd87d9f29b5fcada /OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |
parent | Change version to 0.7.6.1-rc1 instead (diff) | |
parent | Properly dispose of drawing objects to reduce/stop memory leakage on generati... (diff) | |
download | opensim-SC_OLD-87e725cd2474efcdfec3d85794ef2b877c8b78d6.zip opensim-SC_OLD-87e725cd2474efcdfec3d85794ef2b877c8b78d6.tar.gz opensim-SC_OLD-87e725cd2474efcdfec3d85794ef2b877c8b78d6.tar.bz2 opensim-SC_OLD-87e725cd2474efcdfec3d85794ef2b877c8b78d6.tar.xz |
Merge branch '0.7.6-extended' into 0.7.6-post-fixes
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 8 |
1 files changed, 5 insertions, 3 deletions
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; |