diff options
author | Melanie | 2010-07-31 00:57:50 +0100 |
---|---|---|
committer | Melanie | 2010-07-31 00:57:50 +0100 |
commit | 3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116 (patch) | |
tree | 87bbf9ba4bf4e4e3b31e00d276dda98f1ecd156e /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | Bannination fixes. Objects in nonpublic parcels were muted by default. Gods (diff) | |
parent | Slight improvement on previous commit. (diff) | |
download | opensim-SC-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.zip opensim-SC-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.tar.gz opensim-SC-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.tar.bz2 opensim-SC-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 12c1c20..c0ec5df 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -87,8 +87,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
87 | // protected internal Dictionary<UUID, EntityBase> Entities = new Dictionary<UUID, EntityBase>(); | 87 | // protected internal Dictionary<UUID, EntityBase> Entities = new Dictionary<UUID, EntityBase>(); |
88 | protected internal Dictionary<UUID, ScenePresence> RestorePresences = new Dictionary<UUID, ScenePresence>(); | 88 | protected internal Dictionary<UUID, ScenePresence> RestorePresences = new Dictionary<UUID, ScenePresence>(); |
89 | 89 | ||
90 | protected internal BasicQuadTreeNode QuadTree; | ||
91 | |||
92 | protected RegionInfo m_regInfo; | 90 | protected RegionInfo m_regInfo; |
93 | protected Scene m_parentScene; | 91 | protected Scene m_parentScene; |
94 | protected Dictionary<UUID, SceneObjectGroup> m_updateList = new Dictionary<UUID, SceneObjectGroup>(); | 92 | protected Dictionary<UUID, SceneObjectGroup> m_updateList = new Dictionary<UUID, SceneObjectGroup>(); |
@@ -116,9 +114,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
116 | { | 114 | { |
117 | m_parentScene = parent; | 115 | m_parentScene = parent; |
118 | m_regInfo = regInfo; | 116 | m_regInfo = regInfo; |
119 | QuadTree = new BasicQuadTreeNode(null, "/0/", 0, 0, (short)Constants.RegionSize, (short)Constants.RegionSize); | ||
120 | QuadTree.Subdivide(); | ||
121 | QuadTree.Subdivide(); | ||
122 | } | 117 | } |
123 | 118 | ||
124 | public PhysicsScene PhysicsScene | 119 | public PhysicsScene PhysicsScene |