aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Interfaces/IGesturesModule.cs50
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs2
3 files changed, 1 insertions, 55 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IGesturesModule.cs b/OpenSim/Region/Environment/Interfaces/IGesturesModule.cs
deleted file mode 100644
index f117289..0000000
--- a/OpenSim/Region/Environment/Interfaces/IGesturesModule.cs
+++ /dev/null
@@ -1,50 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using OpenMetaverse;
29using OpenSim.Framework;
30
31namespace OpenSim.Region.Environment.Interfaces
32{
33 public interface IGesturesModule
34 {
35 /// <summary>
36 /// Active a gesture
37 /// </summary>
38 /// <param name="client"></param>
39 /// <param name="assetId"></param>
40 /// <param name="gestureId"></param>
41 void ActivateGesture(IClientAPI client, UUID assetId, UUID gestureId);
42
43 /// <summary>
44 /// Deactivate a gesture
45 /// </summary>
46 /// <param name="client"></param>
47 /// <param name="gestureId"></param>
48 void DeactivateGesture(IClientAPI client, UUID gestureId);
49 }
50}
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
index 62b7e35..5ff6202 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
@@ -37,7 +37,7 @@ using System.Reflection;
37 37
38namespace OpenSim.Region.Environment.Modules.Avatar.Gestures 38namespace OpenSim.Region.Environment.Modules.Avatar.Gestures
39{ 39{
40 public class GesturesModule : IRegionModule, IGesturesModule 40 public class GesturesModule : IRegionModule
41 { 41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
@@ -48,8 +48,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Gestures
48 m_scene = scene; 48 m_scene = scene;
49 49
50 m_scene.EventManager.OnNewClient += OnNewClient; 50 m_scene.EventManager.OnNewClient += OnNewClient;
51
52 m_scene.RegisterModuleInterface<IGesturesModule>(this);
53 } 51 }
54 52
55 public void PostInitialise() {} 53 public void PostInitialise() {}
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 6795c0a..591890f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -2344,8 +2344,6 @@ if (m_shape != null) {
2344 Vector3 position = AbsolutePosition; // region local 2344 Vector3 position = AbsolutePosition; // region local
2345 ulong regionHandle = m_parentGroup.Scene.RegionInfo.RegionHandle; 2345 ulong regionHandle = m_parentGroup.Scene.RegionInfo.RegionHandle;
2346 2346
2347 //byte flags = 0;
2348
2349 if (!UUID.TryParse(sound, out soundID)) 2347 if (!UUID.TryParse(sound, out soundID))
2350 { 2348 {
2351 // search sound file from inventory 2349 // search sound file from inventory