From 23a734d0c733d6aec719dfbfb3ee649144f4acd5 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Thu, 19 Jul 2007 01:02:59 +0000 Subject: * More cleaning --- OpenSim/Region/Capabilities/Caps.cs | 4 +--- OpenSim/Region/Environment/Scenes/SceneObject.cs | 16 ++++++++++++++++ OpenSim/Region/Physics/Manager/PhysicsActor.cs | 2 ++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs index d2ef526..110ba6f 100644 --- a/OpenSim/Region/Capabilities/Caps.cs +++ b/OpenSim/Region/Capabilities/Caps.cs @@ -77,9 +77,7 @@ namespace OpenSim.Region.Capabilities httpListener.AddStreamHandler(new LLSDStreamhandler("POST", capsBase + m_mapLayerPath, this.GetMapLayer )); httpListener.AddStreamHandler( new LLSDStreamhandler("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest)); - AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest); - // AddLegacyCapsHandler( httpListener, eventQueue, ProcessEventQueue); - // AddLegacyCapsHandler( httpListener, m_requestTexture, RequestTexture); + AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest); } [Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")] diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs index 926f1a4..9e8135f 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObject.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs @@ -51,6 +51,22 @@ namespace OpenSim.Region.Environment.Scenes public bool isSelected = false; + public PhysicsScene PhysScene + { + get + { + return m_PhysScene; + } + } + + public PhysicsActor PhysActor + { + get + { + return m_PhysActor; + } + } + public LLUUID rootUUID { get diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 2c2c8dd..d0faf02 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs @@ -35,9 +35,11 @@ namespace OpenSim.Physics.Manager public abstract class PhysicsActor { +#pragma warning disable 67 public event PositionUpdate OnPositionUpdate; public event VelocityUpdate OnVelocityUpdate; public event OrientationUpdate OnOrientationUpdate; +#pragma warning restore 67 public static PhysicsActor Null { -- cgit v1.1