diff options
Diffstat (limited to 'OpenSim/Region/Examples')
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 24 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/RegionModule.cs | 10 |
2 files changed, 26 insertions, 8 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index b074313..c454d1f 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -83,7 +83,8 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
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 GenericCall2 OnRequestWearables; | 85 | public event GenericCall2 OnRequestWearables; |
86 | public event GenericCall2 OnCompleteMovementToRegion; | 86 | public event GenericCall1 OnCompleteMovementToRegion; |
87 | public event UpdateAgent OnPreAgentUpdate; | ||
87 | public event UpdateAgent OnAgentUpdate; | 88 | public event UpdateAgent OnAgentUpdate; |
88 | public event AgentRequestSit OnAgentRequestSit; | 89 | public event AgentRequestSit OnAgentRequestSit; |
89 | public event AgentSit OnAgentSit; | 90 | public event AgentSit OnAgentSit; |
@@ -128,6 +129,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
128 | public event Action<UUID> OnRemoveAvatar; | 129 | public event Action<UUID> OnRemoveAvatar; |
129 | 130 | ||
130 | public event CreateNewInventoryItem OnCreateNewInventoryItem; | 131 | public event CreateNewInventoryItem OnCreateNewInventoryItem; |
132 | public event LinkInventoryItem OnLinkInventoryItem; | ||
131 | public event CreateInventoryFolder OnCreateNewInventoryFolder; | 133 | public event CreateInventoryFolder OnCreateNewInventoryFolder; |
132 | public event UpdateInventoryFolder OnUpdateInventoryFolder; | 134 | public event UpdateInventoryFolder OnUpdateInventoryFolder; |
133 | public event MoveInventoryFolder OnMoveInventoryFolder; | 135 | public event MoveInventoryFolder OnMoveInventoryFolder; |
@@ -353,7 +355,11 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
353 | get { return true; } | 355 | get { return true; } |
354 | set { } | 356 | set { } |
355 | } | 357 | } |
356 | 358 | public bool IsLoggingOut | |
359 | { | ||
360 | get { return false; } | ||
361 | set { } | ||
362 | } | ||
357 | public UUID ActiveGroupId | 363 | public UUID ActiveGroupId |
358 | { | 364 | { |
359 | get { return UUID.Zero; } | 365 | get { return UUID.Zero; } |
@@ -655,7 +661,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
655 | 661 | ||
656 | if (OnCompleteMovementToRegion != null) | 662 | if (OnCompleteMovementToRegion != null) |
657 | { | 663 | { |
658 | OnCompleteMovementToRegion(); | 664 | OnCompleteMovementToRegion(this); |
659 | } | 665 | } |
660 | } | 666 | } |
661 | public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID) | 667 | public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID) |
@@ -819,6 +825,10 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
819 | { | 825 | { |
820 | } | 826 | } |
821 | 827 | ||
828 | public void ProcessPendingPackets() | ||
829 | { | ||
830 | } | ||
831 | |||
822 | public void ProcessInPacket(Packet NewPack) | 832 | public void ProcessInPacket(Packet NewPack) |
823 | { | 833 | { |
824 | } | 834 | } |
@@ -1150,5 +1160,13 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
1150 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) | 1160 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) |
1151 | { | 1161 | { |
1152 | } | 1162 | } |
1163 | |||
1164 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) | ||
1165 | { | ||
1166 | } | ||
1167 | |||
1168 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | ||
1169 | { | ||
1170 | } | ||
1153 | } | 1171 | } |
1154 | } | 1172 | } |
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs index e1d5bdc..6da41db 100644 --- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs +++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs | |||
@@ -88,12 +88,12 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
88 | m_scene.AgentCrossing(m_character.AgentId, Vector3.Zero, false); | 88 | m_scene.AgentCrossing(m_character.AgentId, Vector3.Zero, false); |
89 | } | 89 | } |
90 | 90 | ||
91 | List<ScenePresence> avatars = m_scene.GetAvatars(); | 91 | m_scene.ForEachScenePresence(delegate(ScenePresence sp) |
92 | foreach (ScenePresence avatar in avatars) | ||
93 | { | 92 | { |
94 | avatar.AbsolutePosition = | 93 | if (!sp.IsChildAgent) |
95 | new Vector3((float)Util.RandomClass.Next(100, 200), (float)Util.RandomClass.Next(30, 200), 2); | 94 | sp.AbsolutePosition = |
96 | } | 95 | new Vector3((float)Util.RandomClass.Next(100, 200), (float)Util.RandomClass.Next(30, 200), 2); |
96 | }); | ||
97 | } | 97 | } |
98 | 98 | ||
99 | // private void AddComplexObjects(RegionInfo regionInfo, Vector3 pos) | 99 | // private void AddComplexObjects(RegionInfo regionInfo, Vector3 pos) |