From 2afdfc4d29ed0dbaf50d345d518411a54dc5dd00 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 23 Dec 2008 18:01:05 +0000
Subject: * Remove IGesturesModules since it won't be very helpful without a
client message anyway
---
.../Environment/Interfaces/IGesturesModule.cs | 50 ----------------------
.../Modules/Avatar/Gestures/GesturesModule.cs | 4 +-
.../Region/Environment/Scenes/SceneObjectPart.cs | 2 -
3 files changed, 1 insertion(+), 55 deletions(-)
delete mode 100644 OpenSim/Region/Environment/Interfaces/IGesturesModule.cs
(limited to 'OpenSim/Region')
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 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Region.Environment.Interfaces
-{
- public interface IGesturesModule
- {
- /// <summary>
- /// Active a gesture
- /// </summary>
- /// <param name="client"></param>
- /// <param name="assetId"></param>
- /// <param name="gestureId"></param>
- void ActivateGesture(IClientAPI client, UUID assetId, UUID gestureId);
-
- /// <summary>
- /// Deactivate a gesture
- /// </summary>
- /// <param name="client"></param>
- /// <param name="gestureId"></param>
- void DeactivateGesture(IClientAPI client, UUID gestureId);
- }
-}
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;
namespace OpenSim.Region.Environment.Modules.Avatar.Gestures
{
- public class GesturesModule : IRegionModule, IGesturesModule
+ public class GesturesModule : IRegionModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -48,8 +48,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Gestures
m_scene = scene;
m_scene.EventManager.OnNewClient += OnNewClient;
-
- m_scene.RegisterModuleInterface<IGesturesModule>(this);
}
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) {
Vector3 position = AbsolutePosition; // region local
ulong regionHandle = m_parentGroup.Scene.RegionInfo.RegionHandle;
- //byte flags = 0;
-
if (!UUID.TryParse(sound, out soundID))
{
// search sound file from inventory
--
cgit v1.1