diff options
author | Adam Frisby | 2008-03-05 21:47:19 +0000 |
---|---|---|
committer | Adam Frisby | 2008-03-05 21:47:19 +0000 |
commit | 14b37533aaae69979f602e28f9cc0cd60b9585d7 (patch) | |
tree | 96299c3bbf327499e9272428ac3a131a2cda3305 /OpenSim/Region/Environment/Scenes | |
parent | Change SceneObjectPart.LocalID to .LocalId to be case matching (diff) | |
download | opensim-SC-14b37533aaae69979f602e28f9cc0cd60b9585d7.zip opensim-SC-14b37533aaae69979f602e28f9cc0cd60b9585d7.tar.gz opensim-SC-14b37533aaae69979f602e28f9cc0cd60b9585d7.tar.bz2 opensim-SC-14b37533aaae69979f602e28f9cc0cd60b9585d7.tar.xz |
* Removed more compiler warnings, dead code, etc.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index ccdd096..29f1af4 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -129,7 +129,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
129 | private int m_update_backup = 200; | 129 | private int m_update_backup = 200; |
130 | private int m_update_terrain = 50; | 130 | private int m_update_terrain = 50; |
131 | private int m_update_land = 1; | 131 | private int m_update_land = 1; |
132 | private int m_update_avatars = 1; | ||
133 | 132 | ||
134 | private int frameMS = 0; | 133 | private int frameMS = 0; |
135 | private int physicsMS2 = 0; | 134 | private int physicsMS2 = 0; |
@@ -137,7 +136,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
137 | private int otherMS = 0; | 136 | private int otherMS = 0; |
138 | 137 | ||
139 | private bool m_physics_enabled = true; | 138 | private bool m_physics_enabled = true; |
140 | private bool m_physics_collisions_enabled = true; | ||
141 | private bool m_scripts_enabled = true; | 139 | private bool m_scripts_enabled = true; |
142 | 140 | ||
143 | 141 | ||
@@ -669,7 +667,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
669 | { | 667 | { |
670 | if (m_update_entities == 1) | 668 | if (m_update_entities == 1) |
671 | { | 669 | { |
672 | m_update_avatars = 5; | ||
673 | m_update_entities = 5; | 670 | m_update_entities = 5; |
674 | m_statsReporter.SetUpdateMS(6000); | 671 | m_statsReporter.SetUpdateMS(6000); |
675 | } | 672 | } |
@@ -678,7 +675,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
678 | { | 675 | { |
679 | if (m_update_entities == 5) | 676 | if (m_update_entities == 5) |
680 | { | 677 | { |
681 | m_update_avatars = 1; | ||
682 | m_update_entities = 1; | 678 | m_update_entities = 1; |
683 | m_statsReporter.SetUpdateMS(3000); | 679 | m_statsReporter.SetUpdateMS(3000); |
684 | } | 680 | } |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index f4acce5..fc13ebb 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -82,8 +82,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
82 | private bool m_newCoarseLocations = true; | 82 | private bool m_newCoarseLocations = true; |
83 | private bool m_gotAllObjectsInScene = false; | 83 | private bool m_gotAllObjectsInScene = false; |
84 | 84 | ||
85 | private bool m_lastPhysicsStoppedStatus = false; | ||
86 | |||
87 | private LLVector3 m_lastVelocity = LLVector3.Zero; | 85 | private LLVector3 m_lastVelocity = LLVector3.Zero; |
88 | 86 | ||
89 | // Default AV Height | 87 | // Default AV Height |