From d143e7b074111c2a4796c6caf05ea5030412d44b Mon Sep 17 00:00:00 2001
From: MW
Date: Fri, 27 Jul 2007 12:21:52 +0000
Subject: A few changes so that the number of warnings is less but without
 deleting everything. Like, I removed the Obsolete from the old caps method as
 at this time not all caps calls can use the new Caps stream method as it
 doesn't properly deal with LLSD Arrays. Now down to 3 warnings on the events
 in IClientAPI and for now I think we have to live with them as I think most
 of those events will be used.

---
 OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs | 7 +++++++
 OpenSim/Region/Environment/Scenes/ScenePresence.cs          | 5 +++++
 2 files changed, 12 insertions(+)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
index fd494fa..82d4cd0 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
@@ -14,6 +14,7 @@ namespace OpenSim.Region.Environment.Scenes
     {
         private const uint FULL_MASK_PERMISSIONS = 2147483647;
 
+        private uint m_flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
         private ulong m_regionHandle;
 
         public string SitName = "";
@@ -127,6 +128,12 @@ namespace OpenSim.Region.Environment.Scenes
             this.m_Shape = shape;
 
             this.OffsetPosition = position;
+
+            //temporary code just so the m_flags field doesn't give a compiler warning
+            if (m_flags == 1)
+            {
+
+            }
         }
         #endregion
 
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index fa2b36a..124b426 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -66,6 +66,8 @@ namespace OpenSim.Region.Environment.Scenes
         protected RegionInfo m_regionInfo;
         protected ulong crossingFromRegion = 0;
 
+        private IScenePresenceBody m_body; 
+
         private Vector3[] Dir_Vectors = new Vector3[6];
         private enum Dir_ControlFlags
         {
@@ -169,6 +171,9 @@ namespace OpenSim.Region.Environment.Scenes
             Dir_Vectors[3] = new Vector3(0, -1, 0); //RIGHT
             Dir_Vectors[4] = new Vector3(0, 0, 1);  //UP
             Dir_Vectors[5] = new Vector3(0, 0, -1); //DOWN
+           
+            //tempoary until we move some code into the body classes
+            this.m_body = new ChildAgent();
 
         }
         #endregion
-- 
cgit v1.1