aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Types
diff options
context:
space:
mode:
authorSean Dague2007-10-05 15:45:45 +0000
committerSean Dague2007-10-05 15:45:45 +0000
commitc3d8f1f4253f72484100394940e62f2912cbc4ff (patch)
tree8a9f237ed3c1140b4059ec121e0d4ede82eae416 /OpenSim/Region/Environment/Types
parent* So, ok, maybe renaming serialized fields on a friday wasn't the smartest of... (diff)
downloadopensim-SC_OLD-c3d8f1f4253f72484100394940e62f2912cbc4ff.zip
opensim-SC_OLD-c3d8f1f4253f72484100394940e62f2912cbc4ff.tar.gz
opensim-SC_OLD-c3d8f1f4253f72484100394940e62f2912cbc4ff.tar.bz2
opensim-SC_OLD-c3d8f1f4253f72484100394940e62f2912cbc4ff.tar.xz
getting all our line endings consistant again
Diffstat (limited to 'OpenSim/Region/Environment/Types')
-rw-r--r--OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs24
-rw-r--r--OpenSim/Region/Environment/Types/UpdateQueue.cs10
2 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
index 0b815ba..2b8d92e 100644
--- a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
+++ b/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
@@ -1,6 +1,6 @@
1using System.Collections.Generic; 1using System.Collections.Generic;
2using OpenSim.Region.Environment.Scenes; 2using OpenSim.Region.Environment.Scenes;
3 3
4namespace OpenSim.Region.Environment.Types 4namespace OpenSim.Region.Environment.Types
5{ 5{
6 public class BasicQuadTreeNode 6 public class BasicQuadTreeNode
@@ -64,16 +64,16 @@ namespace OpenSim.Region.Environment.Types
64 if (m_childNodes == null) 64 if (m_childNodes == null)
65 { 65 {
66 m_childNodes = new BasicQuadTreeNode[4]; 66 m_childNodes = new BasicQuadTreeNode[4];
67 m_childNodes[0] = 67 m_childNodes[0] =
68 new BasicQuadTreeNode(this, m_leftX, m_leftY, (short) (m_width/2), (short) (m_height/2)); 68 new BasicQuadTreeNode(this, m_leftX, m_leftY, (short) (m_width/2), (short) (m_height/2));
69 m_childNodes[1] = 69 m_childNodes[1] =
70 new BasicQuadTreeNode(this, (short) (m_leftX + (m_width/2)), m_leftY, (short) (m_width/2), 70 new BasicQuadTreeNode(this, (short) (m_leftX + (m_width/2)), m_leftY, (short) (m_width/2),
71 (short) (m_height/2)); 71 (short) (m_height/2));
72 m_childNodes[2] = 72 m_childNodes[2] =
73 new BasicQuadTreeNode(this, m_leftX, (short) (m_leftY + (m_height/2)), (short) (m_width/2), 73 new BasicQuadTreeNode(this, m_leftX, (short) (m_leftY + (m_height/2)), (short) (m_width/2),
74 (short) (m_height/2)); 74 (short) (m_height/2));
75 m_childNodes[3] = 75 m_childNodes[3] =
76 new BasicQuadTreeNode(this, (short) (m_leftX + (m_width/2)), (short) (m_height + (m_height/2)), 76 new BasicQuadTreeNode(this, (short) (m_leftX + (m_width/2)), (short) (m_height + (m_height/2)),
77 (short) (m_width/2), (short) (m_height/2)); 77 (short) (m_width/2), (short) (m_height/2));
78 } 78 }
79 else 79 else
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Environment.Types
132 List<SceneObjectGroup> outBounds = new List<SceneObjectGroup>(); 132 List<SceneObjectGroup> outBounds = new List<SceneObjectGroup>();
133 foreach (SceneObjectGroup group in m_objects) 133 foreach (SceneObjectGroup group in m_objects)
134 { 134 {
135 if (((group.AbsolutePosition.X > m_leftX) && (group.AbsolutePosition.X < (m_leftX + m_width))) && 135 if (((group.AbsolutePosition.X > m_leftX) && (group.AbsolutePosition.X < (m_leftX + m_width))) &&
136 ((group.AbsolutePosition.Y > m_leftY) && (group.AbsolutePosition.Y < (m_leftY + m_height)))) 136 ((group.AbsolutePosition.Y > m_leftY) && (group.AbsolutePosition.Y < (m_leftY + m_height))))
137 { 137 {
138 //still in bounds 138 //still in bounds
@@ -157,7 +157,7 @@ namespace OpenSim.Region.Environment.Types
157 157
158 public void PassUp(SceneObjectGroup group) 158 public void PassUp(SceneObjectGroup group)
159 { 159 {
160 if (((group.AbsolutePosition.X > m_leftX) && (group.AbsolutePosition.X < (m_leftX + m_width))) && 160 if (((group.AbsolutePosition.X > m_leftX) && (group.AbsolutePosition.X < (m_leftX + m_width))) &&
161 ((group.AbsolutePosition.Y > m_leftY) && (group.AbsolutePosition.Y < (m_leftY + m_height)))) 161 ((group.AbsolutePosition.Y > m_leftY) && (group.AbsolutePosition.Y < (m_leftY + m_height))))
162 { 162 {
163 AddObject(group); 163 AddObject(group);
diff --git a/OpenSim/Region/Environment/Types/UpdateQueue.cs b/OpenSim/Region/Environment/Types/UpdateQueue.cs
index 6e26aaf..c1fb161 100644
--- a/OpenSim/Region/Environment/Types/UpdateQueue.cs
+++ b/OpenSim/Region/Environment/Types/UpdateQueue.cs
@@ -1,7 +1,7 @@
1using System.Collections.Generic; 1using System.Collections.Generic;
2using libsecondlife; 2using libsecondlife;
3using OpenSim.Region.Environment.Scenes; 3using OpenSim.Region.Environment.Scenes;
4 4
5namespace OpenSim.Region.Environment.Types 5namespace OpenSim.Region.Environment.Types
6{ 6{
7 public class UpdateQueue 7 public class UpdateQueue
@@ -46,6 +46,6 @@ namespace OpenSim.Region.Environment.Types
46 } 46 }
47 47
48 return part; 48 return part;
49 } 49 }
50 } 50 }
51} \ No newline at end of file 51} \ No newline at end of file