aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/PacketPool.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs1
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/AssetDownloadModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/XMLRPCModule.cs1
-rw-r--r--OpenSim/Region/Environment/PermissionManager.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
8 files changed, 6 insertions, 14 deletions
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 2c44ae3..119cd68 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -158,6 +158,7 @@ namespace OpenSim.Framework
158 public void ReturnPacket(Packet packet) { 158 public void ReturnPacket(Packet packet) {
159 return; // packet pool disabled 159 return; // packet pool disabled
160 160
161 /* // Commented out to remove a compiler warning. :)
161 lock(pool) 162 lock(pool)
162 { 163 {
163 PacketType type=packet.Type; 164 PacketType type=packet.Type;
@@ -171,6 +172,7 @@ namespace OpenSim.Framework
171 ((Stack)pool[type]).Push(packet); 172 ((Stack)pool[type]).Push(packet);
172 } 173 }
173 } 174 }
175 */
174 } 176 }
175 } 177 }
176} 178}
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index b5cd6fb..bf56dfa 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -1163,7 +1163,6 @@ namespace OpenSim.Region.ClientStack
1163 int MAX_ITEMS_PER_PACKET = 6; 1163 int MAX_ITEMS_PER_PACKET = 6;
1164 1164
1165 Encoding enc = Encoding.ASCII; 1165 Encoding enc = Encoding.ASCII;
1166 uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All;
1167 InventoryDescendentsPacket descend; 1166 InventoryDescendentsPacket descend;
1168 int i; 1167 int i;
1169 int count; 1168 int count;
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 5501d3f..10a51e5 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -385,7 +385,6 @@ namespace OpenSim.Region.ClientStack
385 // We are looking for alternate ports! 385 // We are looking for alternate ports!
386 //m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next."); 386 //m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next.");
387 } 387 }
388 System.Threading.Thread.Sleep(100); // Wait before we retry socket
389 } 388 }
390 389
391 m_log.Info("[SERVER]: UDP socket bound, getting ready to listen"); 390 m_log.Info("[SERVER]: UDP socket bound, getting ready to listen");
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