diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 0d4df6c..6a02ffe 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
53 | protected EstateManagementCommands m_commands; | 53 | protected EstateManagementCommands m_commands; |
54 | 54 | ||
55 | private EstateTerrainXferHandler TerrainUploader; | 55 | private EstateTerrainXferHandler TerrainUploader; |
56 | private TelehubManager m_Telehub; | 56 | public TelehubManager m_Telehub; |
57 | 57 | ||
58 | public event ChangeDelegate OnRegionInfoChange; | 58 | public event ChangeDelegate OnRegionInfoChange; |
59 | public event ChangeDelegate OnEstateInfoChange; | 59 | public event ChangeDelegate OnEstateInfoChange; |
@@ -600,22 +600,20 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
600 | } | 600 | } |
601 | } | 601 | } |
602 | 602 | ||
603 | private void handleOnEstateManageTelehub (IClientAPI client, UUID invoice, UUID senderID, string cmd, uint param1) | 603 | public void handleOnEstateManageTelehub (IClientAPI client, UUID invoice, UUID senderID, string cmd, uint param1) |
604 | { | 604 | { |
605 | uint ObjectLocalID; | 605 | uint ObjectLocalID; |
606 | SceneObjectPart part; | 606 | SceneObjectPart part; |
607 | // UUID EstateID = Scene.RegionInfo.EstateSettings.EstateID; | ||
608 | TelehubManager.Telehub telehub; | ||
609 | 607 | ||
610 | switch (cmd) | 608 | switch (cmd) |
611 | { | 609 | { |
612 | case "info ui": | 610 | case "info ui": |
613 | // Send info: | 611 | // Send info: |
614 | if (m_Telehub.HasTelehub) | 612 | if (Scene.RegionInfo.EstateSettings.HasTelehub) |
615 | { | 613 | { |
616 | telehub = m_Telehub.TelehubVals(); | 614 | EstateSettings settings = this.Scene.RegionInfo.EstateSettings; |
617 | client.SendTelehubInfo(telehub.ObjectID, telehub.ObjectName, telehub.ObjectPosition, | 615 | client.SendTelehubInfo(settings.TelehubObject, settings.TelehubName, settings.TelehubPos, |
618 | telehub.ObjectRotation, telehub.SpawnPoint); | 616 | settings.TelehubRot, settings.SpawnPoints()); |
619 | } | 617 | } |
620 | else | 618 | else |
621 | { | 619 | { |
@@ -626,32 +624,44 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
626 | case "connect": | 624 | case "connect": |
627 | // Add the Telehub | 625 | // Add the Telehub |
628 | part = Scene.GetSceneObjectPart((uint)param1); | 626 | part = Scene.GetSceneObjectPart((uint)param1); |
629 | telehub = m_Telehub.Connect(part); | 627 | if (m_Telehub.Connect(part)) |
630 | client.SendTelehubInfo(telehub.ObjectID, telehub.ObjectName, telehub.ObjectPosition, | 628 | { |
631 | telehub.ObjectRotation, telehub.SpawnPoint); | 629 | EstateSettings settings = this.Scene.RegionInfo.EstateSettings; |
630 | client.SendTelehubInfo(settings.TelehubObject, settings.TelehubName, settings.TelehubPos, | ||
631 | settings.TelehubRot, settings.SpawnPoints()); | ||
632 | } | ||
632 | break; | 633 | break; |
633 | 634 | ||
634 | case "delete": | 635 | case "delete": |
635 | // Disconnect Telehub | 636 | // Disconnect Telehub |
636 | part = Scene.GetSceneObjectPart((uint)param1); | 637 | part = Scene.GetSceneObjectPart((uint)param1); |
637 | telehub = m_Telehub.DisConnect(part); | 638 | if (m_Telehub.DisConnect(part)) |
638 | client.SendTelehubInfo(telehub.ObjectID, telehub.ObjectName, telehub.ObjectPosition, | 639 | { |
639 | telehub.ObjectRotation, telehub.SpawnPoint); | 640 | EstateSettings settings = this.Scene.RegionInfo.EstateSettings; |
641 | client.SendTelehubInfo(settings.TelehubObject, settings.TelehubName, settings.TelehubPos, | ||
642 | settings.TelehubRot, settings.SpawnPoints()); | ||
643 | } | ||
640 | break; | 644 | break; |
641 | 645 | ||
642 | case "spawnpoint add": | 646 | case "spawnpoint add": |
643 | // Add SpawnPoint to the Telehub | 647 | // Add SpawnPoint to the Telehub |
644 | part = Scene.GetSceneObjectPart((uint)param1); | 648 | part = Scene.GetSceneObjectPart((uint)param1); |
645 | telehub = m_Telehub.AddSpawnPoint(part.AbsolutePosition); | 649 | if( m_Telehub.AddSpawnPoint(part.AbsolutePosition)) |
646 | client.SendTelehubInfo(telehub.ObjectID, telehub.ObjectName, telehub.ObjectPosition, | 650 | { |
647 | telehub.ObjectRotation, telehub.SpawnPoint); | 651 | EstateSettings settings = this.Scene.RegionInfo.EstateSettings; |
652 | client.SendTelehubInfo(settings.TelehubObject, settings.TelehubName, settings.TelehubPos, | ||
653 | settings.TelehubRot, settings.SpawnPoints()); | ||
654 | } | ||
648 | break; | 655 | break; |
649 | 656 | ||
650 | case "spawnpoint remove": | 657 | case "spawnpoint remove": |
651 | // Remove SpawnPoint from Telehub | 658 | // Remove SpawnPoint from Telehub |
652 | telehub = m_Telehub.RemoveSpawnPoint((int)param1); | 659 | if (m_Telehub.RemoveSpawnPoint((int)param1)) |
653 | client.SendTelehubInfo(telehub.ObjectID, telehub.ObjectName, telehub.ObjectPosition, | 660 | { |
654 | telehub.ObjectRotation, telehub.SpawnPoint); | 661 | EstateSettings settings = this.Scene.RegionInfo.EstateSettings; |
662 | client.SendTelehubInfo(settings.TelehubObject, settings.TelehubName, settings.TelehubPos, | ||
663 | settings.TelehubRot, settings.SpawnPoints()); | ||
664 | } | ||
655 | break; | 665 | break; |
656 | 666 | ||
657 | default: | 667 | default: |