diff options
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 5 |
2 files changed, 12 insertions, 0 deletions
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 | |||
14 | { | 14 | { |
15 | private const uint FULL_MASK_PERMISSIONS = 2147483647; | 15 | private const uint FULL_MASK_PERMISSIONS = 2147483647; |
16 | 16 | ||
17 | private uint m_flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128; | ||
17 | private ulong m_regionHandle; | 18 | private ulong m_regionHandle; |
18 | 19 | ||
19 | public string SitName = ""; | 20 | public string SitName = ""; |
@@ -127,6 +128,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
127 | this.m_Shape = shape; | 128 | this.m_Shape = shape; |
128 | 129 | ||
129 | this.OffsetPosition = position; | 130 | this.OffsetPosition = position; |
131 | |||
132 | //temporary code just so the m_flags field doesn't give a compiler warning | ||
133 | if (m_flags == 1) | ||
134 | { | ||
135 | |||
136 | } | ||
130 | } | 137 | } |
131 | #endregion | 138 | #endregion |
132 | 139 | ||
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 | |||
66 | protected RegionInfo m_regionInfo; | 66 | protected RegionInfo m_regionInfo; |
67 | protected ulong crossingFromRegion = 0; | 67 | protected ulong crossingFromRegion = 0; |
68 | 68 | ||
69 | private IScenePresenceBody m_body; | ||
70 | |||
69 | private Vector3[] Dir_Vectors = new Vector3[6]; | 71 | private Vector3[] Dir_Vectors = new Vector3[6]; |
70 | private enum Dir_ControlFlags | 72 | private enum Dir_ControlFlags |
71 | { | 73 | { |
@@ -169,6 +171,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
169 | Dir_Vectors[3] = new Vector3(0, -1, 0); //RIGHT | 171 | Dir_Vectors[3] = new Vector3(0, -1, 0); //RIGHT |
170 | Dir_Vectors[4] = new Vector3(0, 0, 1); //UP | 172 | Dir_Vectors[4] = new Vector3(0, 0, 1); //UP |
171 | Dir_Vectors[5] = new Vector3(0, 0, -1); //DOWN | 173 | Dir_Vectors[5] = new Vector3(0, 0, -1); //DOWN |
174 | |||
175 | //tempoary until we move some code into the body classes | ||
176 | this.m_body = new ChildAgent(); | ||
172 | 177 | ||
173 | } | 178 | } |
174 | #endregion | 179 | #endregion |