diff options
Diffstat (limited to 'OpenSim/Region/Examples/SimpleModule')
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs index e951bef..7a0ce51 100644 --- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | ||
28 | using OpenMetaverse; | 29 | using OpenMetaverse; |
29 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
30 | using OpenSim.Region.Framework.Scenes; | 31 | using OpenSim.Region.Framework.Scenes; |
@@ -110,7 +111,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
110 | { | 111 | { |
111 | m_parts.Remove(part.UUID); | 112 | m_parts.Remove(part.UUID); |
112 | 113 | ||
113 | remoteClient.SendKillObject(m_regionHandle, part.LocalId); | 114 | remoteClient.SendKillObject(m_regionHandle, new List<uint>() { part.LocalId} ); |
114 | remoteClient.AddMoney(1); | 115 | remoteClient.AddMoney(1); |
115 | remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); | 116 | remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); |
116 | } | 117 | } |
@@ -121,7 +122,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
121 | { | 122 | { |
122 | m_parts.Remove(m_rootPart.UUID); | 123 | m_parts.Remove(m_rootPart.UUID); |
123 | m_scene.DeleteSceneObject(this, false); | 124 | m_scene.DeleteSceneObject(this, false); |
124 | remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId); | 125 | remoteClient.SendKillObject(m_regionHandle, new List<uint>() { m_rootPart.LocalId }); |
125 | remoteClient.AddMoney(50); | 126 | remoteClient.AddMoney(50); |
126 | remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); | 127 | remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); |
127 | } | 128 | } |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index f128aa2..09f615f 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
79 | public event DisconnectUser OnDisconnectUser; | 79 | public event DisconnectUser OnDisconnectUser; |
80 | public event RequestAvatarProperties OnRequestAvatarProperties; | 80 | public event RequestAvatarProperties OnRequestAvatarProperties; |
81 | public event SetAlwaysRun OnSetAlwaysRun; | 81 | public event SetAlwaysRun OnSetAlwaysRun; |
82 | 82 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | |
83 | public event DeRezObject OnDeRezObject; | 83 | public event DeRezObject OnDeRezObject; |
84 | public event Action<IClientAPI> OnRegionHandShakeReply; | 84 | public event Action<IClientAPI> OnRegionHandShakeReply; |
85 | public event GenericCall1 OnRequestWearables; | 85 | public event GenericCall1 OnRequestWearables; |
@@ -429,7 +429,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
429 | 429 | ||
430 | } | 430 | } |
431 | 431 | ||
432 | public virtual void SendKillObject(ulong regionHandle, uint localID) | 432 | public virtual void SendKillObject(ulong regionHandle, List<uint> localID) |
433 | { | 433 | { |
434 | } | 434 | } |
435 | 435 | ||
@@ -821,12 +821,21 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
821 | { | 821 | { |
822 | } | 822 | } |
823 | 823 | ||
824 | public void ProcessPendingPackets() | ||
825 | { | ||
826 | } | ||
827 | |||
824 | public void ProcessInPacket(Packet NewPack) | 828 | public void ProcessInPacket(Packet NewPack) |
825 | { | 829 | { |
826 | } | 830 | } |
827 | 831 | ||
828 | public void Close() | 832 | public void Close() |
829 | { | 833 | { |
834 | Close(true); | ||
835 | } | ||
836 | |||
837 | public void Close(bool sendStop) | ||
838 | { | ||
830 | } | 839 | } |
831 | 840 | ||
832 | public void Start() | 841 | public void Start() |