diff options
author | Melanie | 2012-01-24 01:48:38 +0100 |
---|---|---|
committer | Melanie | 2012-01-24 02:36:35 +0000 |
commit | a4977bbe190fb6c1eb5c45247b9222c719118fd4 (patch) | |
tree | c6e028bc3b06c607ff5372a1808b5922a74801b0 /OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |
parent | Reverse the spawn point distance vector (diff) | |
download | opensim-SC_OLD-a4977bbe190fb6c1eb5c45247b9222c719118fd4.zip opensim-SC_OLD-a4977bbe190fb6c1eb5c45247b9222c719118fd4.tar.gz opensim-SC_OLD-a4977bbe190fb6c1eb5c45247b9222c719118fd4.tar.bz2 opensim-SC_OLD-a4977bbe190fb6c1eb5c45247b9222c719118fd4.tar.xz |
Simplify and streamline telehub editing code. Verify rotations and fix
spwan point positioning on rotated telehubs.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 20f3903..2e1487f 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -608,8 +608,6 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
608 | switch (cmd) | 608 | switch (cmd) |
609 | { | 609 | { |
610 | case "info ui": | 610 | case "info ui": |
611 | // Send info: | ||
612 | SendTelehubInfo(client); | ||
613 | break; | 611 | break; |
614 | 612 | ||
615 | case "connect": | 613 | case "connect": |
@@ -619,32 +617,31 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
619 | return; | 617 | return; |
620 | SceneObjectGroup grp = part.ParentGroup; | 618 | SceneObjectGroup grp = part.ParentGroup; |
621 | 619 | ||
622 | if (m_Telehub.Connect(grp)) | 620 | m_Telehub.Connect(grp); |
623 | SendTelehubInfo(client); | ||
624 | break; | 621 | break; |
625 | 622 | ||
626 | case "delete": | 623 | case "delete": |
627 | // Disconnect Telehub | 624 | // Disconnect Telehub |
628 | if (m_Telehub.Disconnect()) | 625 | m_Telehub.Disconnect(); |
629 | SendTelehubInfo(client); | ||
630 | break; | 626 | break; |
631 | 627 | ||
632 | case "spawnpoint add": | 628 | case "spawnpoint add": |
633 | // Add SpawnPoint to the Telehub | 629 | // Add SpawnPoint to the Telehub |
634 | part = Scene.GetSceneObjectPart((uint)param1); | 630 | part = Scene.GetSceneObjectPart((uint)param1); |
635 | if( m_Telehub.AddSpawnPoint(part.AbsolutePosition)) | 631 | if (part == null) |
636 | SendTelehubInfo(client); | 632 | return; |
633 | m_Telehub.AddSpawnPoint(part.AbsolutePosition); | ||
637 | break; | 634 | break; |
638 | 635 | ||
639 | case "spawnpoint remove": | 636 | case "spawnpoint remove": |
640 | // Remove SpawnPoint from Telehub | 637 | // Remove SpawnPoint from Telehub |
641 | if (m_Telehub.RemoveSpawnPoint((int)param1)) | 638 | m_Telehub.RemoveSpawnPoint((int)param1); |
642 | SendTelehubInfo(client); | ||
643 | break; | 639 | break; |
644 | 640 | ||
645 | default: | 641 | default: |
646 | break; | 642 | break; |
647 | } | 643 | } |
644 | SendTelehubInfo(client); | ||
648 | } | 645 | } |
649 | 646 | ||
650 | private void SendSimulatorBlueBoxMessage( | 647 | private void SendSimulatorBlueBoxMessage( |
@@ -1309,7 +1306,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1309 | 1306 | ||
1310 | foreach (SpawnPoint sp in settings.SpawnPoints()) | 1307 | foreach (SpawnPoint sp in settings.SpawnPoints()) |
1311 | { | 1308 | { |
1312 | spawnPoints.Add(sp.GetLocation(Vector3.Zero, telehub.GroupRotation)); | 1309 | spawnPoints.Add(sp.GetLocation(Vector3.Zero, Quaternion.Identity)); |
1313 | } | 1310 | } |
1314 | 1311 | ||
1315 | client.SendTelehubInfo(settings.TelehubObject, | 1312 | client.SendTelehubInfo(settings.TelehubObject, |