diff options
author | BlueWall | 2012-01-20 23:50:37 -0500 |
---|---|---|
committer | BlueWall | 2012-01-20 23:50:37 -0500 |
commit | b6f3de5028ab9a288f60b020a0dffda079dc550d (patch) | |
tree | 57505b2486d98bfd379a9ce0ada9c32f0ddedf6c /OpenSim/Region/OptionalModules | |
parent | Add "image queues clear <first-name> <last-name>" console command (diff) | |
download | opensim-SC_OLD-b6f3de5028ab9a288f60b020a0dffda079dc550d.zip opensim-SC_OLD-b6f3de5028ab9a288f60b020a0dffda079dc550d.tar.gz opensim-SC_OLD-b6f3de5028ab9a288f60b020a0dffda079dc550d.tar.bz2 opensim-SC_OLD-b6f3de5028ab9a288f60b020a0dffda079dc550d.tar.xz |
Telehub Support:
Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 32de85f..bbf3729 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -658,6 +658,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
658 | public event ModifyTerrain OnModifyTerrain; | 658 | public event ModifyTerrain OnModifyTerrain; |
659 | public event BakeTerrain OnBakeTerrain; | 659 | public event BakeTerrain OnBakeTerrain; |
660 | public event EstateChangeInfo OnEstateChangeInfo; | 660 | public event EstateChangeInfo OnEstateChangeInfo; |
661 | public event EstateManageTelehub OnEstateManageTelehub; | ||
661 | public event SetAppearance OnSetAppearance; | 662 | public event SetAppearance OnSetAppearance; |
662 | public event AvatarNowWearing OnAvatarNowWearing; | 663 | public event AvatarNowWearing OnAvatarNowWearing; |
663 | public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; | 664 | public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; |
@@ -1530,6 +1531,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1530 | 1531 | ||
1531 | } | 1532 | } |
1532 | 1533 | ||
1534 | public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint) | ||
1535 | { | ||
1536 | |||
1537 | } | ||
1538 | |||
1533 | public void SendMapItemReply(mapItemReply[] replies, uint mapitemtype, uint flags) | 1539 | public void SendMapItemReply(mapItemReply[] replies, uint mapitemtype, uint flags) |
1534 | { | 1540 | { |
1535 | 1541 | ||
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 5f4f937..6a6c4c3 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -32,6 +32,7 @@ using OpenMetaverse; | |||
32 | using OpenMetaverse.Packets; | 32 | using OpenMetaverse.Packets; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | using OpenSim.Region.CoreModules.World.Estate; | ||
35 | 36 | ||
36 | namespace OpenSim.Region.OptionalModules.World.NPC | 37 | namespace OpenSim.Region.OptionalModules.World.NPC |
37 | { | 38 | { |
@@ -334,6 +335,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
334 | public event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest; | 335 | public event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest; |
335 | public event EstateTeleportAllUsersHomeRequest OnEstateTeleportAllUsersHomeRequest; | 336 | public event EstateTeleportAllUsersHomeRequest OnEstateTeleportAllUsersHomeRequest; |
336 | public event EstateChangeInfo OnEstateChangeInfo; | 337 | public event EstateChangeInfo OnEstateChangeInfo; |
338 | public event EstateManageTelehub OnEstateManageTelehub; | ||
337 | public event ScriptReset OnScriptReset; | 339 | public event ScriptReset OnScriptReset; |
338 | public event GetScriptRunning OnGetScriptRunning; | 340 | public event GetScriptRunning OnGetScriptRunning; |
339 | public event SetScriptRunning OnSetScriptRunning; | 341 | public event SetScriptRunning OnSetScriptRunning; |
@@ -923,6 +925,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
923 | public void SendEstateCovenantInformation(UUID covenant) | 925 | public void SendEstateCovenantInformation(UUID covenant) |
924 | { | 926 | { |
925 | } | 927 | } |
928 | public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint) | ||
929 | { | ||
930 | } | ||
926 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) | 931 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) |
927 | { | 932 | { |
928 | } | 933 | } |