diff options
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 4750b46..7aa1ced 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -712,7 +712,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
712 | } | 712 | } |
713 | } | 713 | } |
714 | 714 | ||
715 | public void handleOnEstateManageTelehub(IClientAPI client, UUID invoice, UUID senderID, string cmd, uint param1) | 715 | public void HandleOnEstateManageTelehub(IClientAPI client, UUID invoice, UUID senderID, string cmd, uint param1) |
716 | { | 716 | { |
717 | SceneObjectPart part; | 717 | SceneObjectPart part; |
718 | 718 | ||
@@ -752,7 +752,9 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
752 | default: | 752 | default: |
753 | break; | 753 | break; |
754 | } | 754 | } |
755 | SendTelehubInfo(client); | 755 | |
756 | if (client != null) | ||
757 | SendTelehubInfo(client); | ||
756 | } | 758 | } |
757 | 759 | ||
758 | private void SendSimulatorBlueBoxMessage( | 760 | private void SendSimulatorBlueBoxMessage( |
@@ -1224,7 +1226,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1224 | client.OnEstateRestartSimRequest += handleEstateRestartSimRequest; | 1226 | client.OnEstateRestartSimRequest += handleEstateRestartSimRequest; |
1225 | client.OnEstateChangeCovenantRequest += handleChangeEstateCovenantRequest; | 1227 | client.OnEstateChangeCovenantRequest += handleChangeEstateCovenantRequest; |
1226 | client.OnEstateChangeInfo += handleEstateChangeInfo; | 1228 | client.OnEstateChangeInfo += handleEstateChangeInfo; |
1227 | client.OnEstateManageTelehub += handleOnEstateManageTelehub; | 1229 | client.OnEstateManageTelehub += HandleOnEstateManageTelehub; |
1228 | client.OnUpdateEstateAccessDeltaRequest += handleEstateAccessDeltaRequest; | 1230 | client.OnUpdateEstateAccessDeltaRequest += handleEstateAccessDeltaRequest; |
1229 | client.OnSimulatorBlueBoxMessageRequest += SendSimulatorBlueBoxMessage; | 1231 | client.OnSimulatorBlueBoxMessageRequest += SendSimulatorBlueBoxMessage; |
1230 | client.OnEstateBlueBoxMessageRequest += SendEstateBlueBoxMessage; | 1232 | client.OnEstateBlueBoxMessageRequest += SendEstateBlueBoxMessage; |