aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorAdam Frisby2007-07-19 01:02:59 +0000
committerAdam Frisby2007-07-19 01:02:59 +0000
commit23a734d0c733d6aec719dfbfb3ee649144f4acd5 (patch)
tree200b2e9f134247a3f7efdeaca24802bc15abf74d /OpenSim/Region
parent* Added TriggerTouchStart function to Interpreted Events API (diff)
downloadopensim-SC_OLD-23a734d0c733d6aec719dfbfb3ee649144f4acd5.zip
opensim-SC_OLD-23a734d0c733d6aec719dfbfb3ee649144f4acd5.tar.gz
opensim-SC_OLD-23a734d0c733d6aec719dfbfb3ee649144f4acd5.tar.bz2
opensim-SC_OLD-23a734d0c733d6aec719dfbfb3ee649144f4acd5.tar.xz
* More cleaning
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Capabilities/Caps.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject.cs16
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs2
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
77 httpListener.AddStreamHandler(new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer )); 77 httpListener.AddStreamHandler(new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer ));
78 httpListener.AddStreamHandler( new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest)); 78 httpListener.AddStreamHandler( new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest));
79 79
80 AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest); 80 AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest);
81 // AddLegacyCapsHandler( httpListener, eventQueue, ProcessEventQueue);
82 // AddLegacyCapsHandler( httpListener, m_requestTexture, RequestTexture);
83 } 81 }
84 82
85 [Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")] 83 [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
51 51
52 public bool isSelected = false; 52 public bool isSelected = false;
53 53
54 public PhysicsScene PhysScene
55 {
56 get
57 {
58 return m_PhysScene;
59 }
60 }
61
62 public PhysicsActor PhysActor
63 {
64 get
65 {
66 return m_PhysActor;
67 }
68 }
69
54 public LLUUID rootUUID 70 public LLUUID rootUUID
55 { 71 {
56 get 72 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
35 35
36 public abstract class PhysicsActor 36 public abstract class PhysicsActor
37 { 37 {
38#pragma warning disable 67
38 public event PositionUpdate OnPositionUpdate; 39 public event PositionUpdate OnPositionUpdate;
39 public event VelocityUpdate OnVelocityUpdate; 40 public event VelocityUpdate OnVelocityUpdate;
40 public event OrientationUpdate OnOrientationUpdate; 41 public event OrientationUpdate OnOrientationUpdate;
42#pragma warning restore 67
41 43
42 public static PhysicsActor Null 44 public static PhysicsActor Null
43 { 45 {