diff options
Diffstat (limited to 'OpenSim/Region/Environment')
5 files changed, 4 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs index 74102c2..33e4b9b 100644 --- a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs | |||
@@ -52,8 +52,6 @@ namespace OpenSim.Region.Environment.Modules | |||
52 | /// </summary> | 52 | /// </summary> |
53 | private List<AssetRequest> AssetRequests; | 53 | private List<AssetRequest> AssetRequests; |
54 | 54 | ||
55 | private Thread m_thread; | ||
56 | |||
57 | public AssetDownloadModule() | 55 | public AssetDownloadModule() |
58 | { | 56 | { |
59 | RequestedAssets = new Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>>(); | 57 | RequestedAssets = new Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>>(); |
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs index 6294a49..2a64de9 100644 --- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs +++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs | |||
@@ -77,7 +77,6 @@ namespace OpenSim.Region.Environment.Modules | |||
77 | { | 77 | { |
78 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 78 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
79 | 79 | ||
80 | private Scene m_scene; | ||
81 | private object XMLRPCListLock = new object(); | 80 | private object XMLRPCListLock = new object(); |
82 | private string m_name = "XMLRPCModule"; | 81 | private string m_name = "XMLRPCModule"; |
83 | private int RemoteReplyScriptWait = 300; | 82 | private int RemoteReplyScriptWait = 300; |
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs index ce6415e..171ced1 100644 --- a/OpenSim/Region/Environment/PermissionManager.cs +++ b/OpenSim/Region/Environment/PermissionManager.cs | |||
@@ -37,11 +37,12 @@ namespace OpenSim.Region.Environment | |||
37 | protected Scene m_scene; | 37 | protected Scene m_scene; |
38 | 38 | ||
39 | // These are here for testing. They will be taken out | 39 | // These are here for testing. They will be taken out |
40 | private uint PERM_ALL = (uint)2147483647; | 40 | |
41 | //private uint PERM_ALL = (uint)2147483647; | ||
41 | private uint PERM_COPY = (uint)32768; | 42 | private uint PERM_COPY = (uint)32768; |
42 | private uint PERM_MODIFY = (uint)16384; | 43 | //private uint PERM_MODIFY = (uint)16384; |
43 | private uint PERM_MOVE = (uint)524288; | 44 | private uint PERM_MOVE = (uint)524288; |
44 | private uint PERM_TRANS = (uint)8192; | 45 | //private uint PERM_TRANS = (uint)8192; |
45 | private uint PERM_LOCKED = (uint)540672; | 46 | private uint PERM_LOCKED = (uint)540672; |
46 | // Bypasses the permissions engine (always returns OK) | 47 | // Bypasses the permissions engine (always returns OK) |
47 | // disable in any production environment | 48 | // disable in any production environment |
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 |