diff options
Various small changes (some likely to be removed again soon)
Diffstat (limited to '')
4 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 568639f..a9ded3f 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -554,6 +554,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
554 | } | 554 | } |
555 | } | 555 | } |
556 | 556 | ||
557 | public void StartAnimation(IClientAPI client, LLUUID animID, int seq) | ||
558 | { | ||
559 | List<ScenePresence> avatars = this.RequestAvatarList(); | ||
560 | for (int i = 0; i < avatars.Count; i++) | ||
561 | { | ||
562 | avatars[i].ControllingClient.SendAnimation(animID, seq, client.AgentId); | ||
563 | } | ||
564 | } | ||
565 | |||
557 | public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) | 566 | public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) |
558 | { | 567 | { |
559 | this.EventManager.TriggerObjectGrab(localID, offsetPos, remoteClient); | 568 | this.EventManager.TriggerObjectGrab(localID, offsetPos, remoteClient); |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index ba9569e..92f26ef 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -90,7 +90,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
90 | //API method Delegates | 90 | //API method Delegates |
91 | 91 | ||
92 | // this most likely shouldn't be handled as a API method like this, but doing it for testing purposes | 92 | // this most likely shouldn't be handled as a API method like this, but doing it for testing purposes |
93 | public ModuleAPIMethod<bool, string, byte[]>AddXferFile = null; | 93 | public ModuleAPIMethod2<bool, string, byte[]>AddXferFile = null; |
94 | 94 | ||
95 | #region Properties | 95 | #region Properties |
96 | 96 | ||
@@ -196,7 +196,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
196 | 196 | ||
197 | private void SetMethodDelegates() | 197 | private void SetMethodDelegates() |
198 | { | 198 | { |
199 | AddXferFile = (ModuleAPIMethod<bool, string, byte[]>)this.RequestAPIMethod("API_AddXferFile"); | 199 | AddXferFile = (ModuleAPIMethod2<bool, string, byte[]>)this.RequestAPIMethod("API_AddXferFile"); |
200 | } | 200 | } |
201 | 201 | ||
202 | #region Script Handling Methods | 202 | #region Script Handling Methods |
@@ -267,7 +267,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
267 | 267 | ||
268 | //backup scene data | 268 | //backup scene data |
269 | storageCount++; | 269 | storageCount++; |
270 | if (storageCount > 600) //set to how often you want to backup | 270 | if (storageCount > 1200) //set to how often you want to backup |
271 | { | 271 | { |
272 | Backup(); | 272 | Backup(); |
273 | storageCount = 0; | 273 | storageCount = 0; |
@@ -692,6 +692,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
692 | 692 | ||
693 | protected virtual void SubscribeToClientEvents(IClientAPI client) | 693 | protected virtual void SubscribeToClientEvents(IClientAPI client) |
694 | { | 694 | { |
695 | // client.OnStartAnim += StartAnimation; | ||
695 | client.OnRegionHandShakeReply += SendLayerData; | 696 | client.OnRegionHandShakeReply += SendLayerData; |
696 | //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims); | 697 | //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims); |
697 | client.OnModifyTerrain += ModifyTerrain; | 698 | client.OnModifyTerrain += ModifyTerrain; |
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index 3a2fab2..3740e1b 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs | |||
@@ -35,6 +35,7 @@ using OpenSim.Framework.Types; | |||
35 | using OpenSim.Framework.Communications.Caches; | 35 | using OpenSim.Framework.Communications.Caches; |
36 | using OpenSim.Region.Terrain; | 36 | using OpenSim.Region.Terrain; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Region.Environment.Interfaces; | ||
38 | 39 | ||
39 | namespace OpenSim.Region.Environment.Scenes | 40 | namespace OpenSim.Region.Environment.Scenes |
40 | { | 41 | { |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 0eeea89..e094ac6 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -157,7 +157,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
157 | this.m_lastname = ControllingClient.LastName; | 157 | this.m_lastname = ControllingClient.LastName; |
158 | m_localId = m_scene.NextLocalId; | 158 | m_localId = m_scene.NextLocalId; |
159 | AbsolutePosition = ControllingClient.StartPos; | 159 | AbsolutePosition = ControllingClient.StartPos; |
160 | 160 | ||
161 | visualParams = new byte[218]; | 161 | visualParams = new byte[218]; |
162 | for (int i = 0; i < 218; i++) | 162 | for (int i = 0; i < 218; i++) |
163 | { | 163 | { |