7 files changed, 4 insertions, 14 deletions

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
             int MAX_ITEMS_PER_PACKET = 6;
 
             Encoding enc = Encoding.ASCII;
-            uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All;
             InventoryDescendentsPacket descend;
             int i;
             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
                     // We are looking for alternate ports!
                     //m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next.");
                 }
-                System.Threading.Thread.Sleep(100); // Wait before we retry socket
             }
 
             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
         /// </summary>
         private List<AssetRequest> AssetRequests;
 
-        private Thread m_thread;
-
         public AssetDownloadModule()
         {
             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
     {
         private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
-        private Scene m_scene;
         private object XMLRPCListLock = new object();
         private string m_name = "XMLRPCModule";
         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
         protected Scene m_scene;
 
         // These are here for testing.  They will be taken out
-        private uint PERM_ALL = (uint)2147483647;
+        
+        //private uint PERM_ALL = (uint)2147483647;
         private uint PERM_COPY = (uint)32768;
-        private uint PERM_MODIFY = (uint)16384;
+        //private uint PERM_MODIFY = (uint)16384;
         private uint PERM_MOVE = (uint)524288;
-        private uint PERM_TRANS = (uint)8192;
+        //private uint PERM_TRANS = (uint)8192;
         private uint PERM_LOCKED = (uint)540672;
         // Bypasses the permissions engine (always returns OK)
         // 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
         private int m_update_backup = 200;
         private int m_update_terrain = 50;
         private int m_update_land = 1;
-        private int m_update_avatars = 1;
 
         private int frameMS = 0;
         private int physicsMS2 = 0;
@@ -137,7 +136,6 @@ namespace OpenSim.Region.Environment.Scenes
         private int otherMS = 0;
 
         private bool m_physics_enabled = true;
-        private bool m_physics_collisions_enabled = true;
         private bool m_scripts_enabled = true;
 
 
@@ -669,7 +667,6 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 if (m_update_entities == 1)
                 {
-                    m_update_avatars = 5;
                     m_update_entities = 5;
                     m_statsReporter.SetUpdateMS(6000);
                 }
@@ -678,7 +675,6 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 if (m_update_entities == 5)
                 {
-                    m_update_avatars = 1;
                     m_update_entities = 1;
                     m_statsReporter.SetUpdateMS(3000);
                 }
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
         private bool m_newCoarseLocations = true;
         private bool m_gotAllObjectsInScene = false;
 
-        private bool m_lastPhysicsStoppedStatus = false;
-
         private LLVector3 m_lastVelocity = LLVector3.Zero;
         
         // Default AV Height