aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorBlueWall2012-01-20 23:50:37 -0500
committerBlueWall2012-01-20 23:50:37 -0500
commitb6f3de5028ab9a288f60b020a0dffda079dc550d (patch)
tree57505b2486d98bfd379a9ce0ada9c32f0ddedf6c /OpenSim/Region/OptionalModules/World
parentAdd "image queues clear <first-name> <last-name>" console command (diff)
downloadopensim-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/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs5
1 files changed, 5 insertions, 0 deletions
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;
32using OpenMetaverse.Packets; 32using OpenMetaverse.Packets;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Region.CoreModules.World.Estate;
35 36
36namespace OpenSim.Region.OptionalModules.World.NPC 37namespace 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 }