8 files changed, 14 insertions, 15 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
index 324d3b3..74eecd8 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
@@ -209,9 +209,9 @@ namespace OpenSim.Data.MSSQL
                     {
                        cmd.ExecuteNonQuery();
                     }
-                    catch (Exception Ex)
+                    catch (Exception e)
                     {
-                        _Log.Debug("[ESTATE DB]: Error inserting regionID and EstateID in estate_map");
+                        _Log.DebugFormat("[ESTATE DB]: Error inserting regionID and EstateID in estate_map: {0}", e);
                     }
                 }
 
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index e26b03d..6164dab 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -548,7 +548,6 @@ namespace OpenSim.Data.MSSQL
                     while (readerLandData.Read())
                     {
                         LandData data = buildLandData(readerLandData);
-
                     }
                 }
             }
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
index b34f9b3..9e39088 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
             //Scale size of particles to distance objects are apart (for better visibility)
             LLVector3 FromPos = From.GetWorldPosition();
             LLVector3 ToPos = From.GetWorldPosition();
-            LLUUID toUUID = To.UUID;
+//            LLUUID toUUID = To.UUID;
             float distance = (float) (Math.Sqrt(Math.Pow(FromPos.X-ToPos.X, 2) + 
                                                 Math.Pow(FromPos.X-ToPos.Y, 2) + 
                                                 Math.Pow(FromPos.X-ToPos.Z, 2)
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
index c5c1600..6ccb646 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
 
         #region Fields
 
-        bool init = false;
+        //bool init = false;
         int m_channel = -1;
 
         /// <value>
@@ -122,9 +122,9 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
         #region Private Methods
 
         //------------------------------------------------ EVENTS ----------------------------------------------------//
-        private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, LLUUID regionID)
-        {
-        }
+//        private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, LLUUID regionID)
+//        {
+//        }
 
         /// <summary>
         /// Searches in all scenes for a SceneObjectGroup that contains a part with a specific localID. If found, the object is returned. Else null is returned.
@@ -384,7 +384,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
         {
             m_log.Debug("[CONTENT MANAGEMENT] Registering channel with chat services.");
             client.OnChatFromViewer += SimChatSent;     
-            init = true;
+            //init = true;
 
             OnNewClient(client);
 
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
index ff4e678..92ae0d7 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
@@ -193,10 +193,10 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
             System.Collections.ArrayList xmllist = null;
             SceneObjectGroup temp = null;
             System.Collections.Hashtable deleteListUUIDs = new Hashtable();
-            Dictionary<LLUUID, EntityBase> SearchList = new Dictionary<LLUUID,EntityBase>();
+//            Dictionary<LLUUID, EntityBase> SearchList = new Dictionary<LLUUID,EntityBase>();
             Dictionary<LLUUID, EntityBase> ReplacementList = new Dictionary<LLUUID,EntityBase>();
             int revision = m_database.GetMostRecentRevision(scene.RegionInfo.RegionID);
-            EntityBase[] searchArray;
+//            EntityBase[] searchArray;
 
             xmllist = m_database.GetRegionObjectXMLList(scene.RegionInfo.RegionID, revision);
             if (xmllist == null)
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
index 1fa4ffc..8e0dd33 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
@@ -57,8 +57,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
     {
         #region Static Fields
 
-        static float TimeToDiff = 0;
-        static float TimeToCreateEntities = 0;
+//        static float TimeToDiff = 0;
+//        static float TimeToCreateEntities = 0;
 
         #endregion Static Fields
 
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs
index 58f6eea..38938c6 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
         #region Static Fields
 
         static float TimeToDiff = 0;
-        private static readonly ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         #endregion Static Fields
 
diff --git a/OpenSim/Region/Environment/Scenes/EntityList.cs b/OpenSim/Region/Environment/Scenes/EntityList.cs
index a03b36c..ff8def2 100644
--- a/OpenSim/Region/Environment/Scenes/EntityList.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityList.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Scenes
                 ScenePresence sp = (ScenePresence)m_pres_by_uuid[uuid];
                 return sp;
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return null;
             }