6 files changed, 6 insertions, 13 deletions

diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index 2a2dea3..2e9be7f 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -62,7 +62,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
             if (pos == -1) m_name = id;
             else m_name = id.Substring(pos + 1);
 
-            ExtensionNodeList list = AddinManager.GetExtensionNodes("/OpenSim/RegionModules");
+            //ExtensionNodeList list = AddinManager.GetExtensionNodes("/OpenSim/RegionModules");
             // load all the (new) region-module classes
             foreach (TypeExtensionNode node in AddinManager.GetExtensionNodes("/OpenSim/RegionModules"))
             {
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 9485340..ac069ea 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -61,7 +61,6 @@ namespace OpenSim.Data.SQLite
         private const string AvatarPickerAndSQL = "select * from users where username like :username and surname like :surname";
         private const string AvatarPickerOrSQL = "select * from users where username like :username or surname like :surname";
 
-        private Dictionary<UUID, AvatarAppearance> aplist = new Dictionary<UUID, AvatarAppearance>();
         private DataSet ds;
         private SqliteDataAdapter da;
         private SqliteDataAdapter daf;
@@ -162,7 +161,6 @@ namespace OpenSim.Data.SQLite
                 daa.Dispose();
                 daa = null;
             }
-            aplist = null;
         }
 
         /// <summary>
@@ -659,7 +657,6 @@ namespace OpenSim.Data.SQLite
             AvatarAppearance aa = new AvatarAppearance(user);
             //try {
             aa.Owner = user;
-            //aplist[user] = appearance;
 
             DataTable aap = ds.Tables["avatarappearance"];
             lock (ds)
@@ -726,7 +723,6 @@ namespace OpenSim.Data.SQLite
                 }
             }
 
-           //     aa = aplist[user];
            //     m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
            // } catch (KeyNotFoundException) {
            //     m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString());
@@ -742,7 +738,6 @@ namespace OpenSim.Data.SQLite
         override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
         {
             appearance.Owner = user;
-            //aplist[user] = appearance;
             DataTable aap = ds.Tables["avatarappearance"];
             lock (ds)
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index f0653b4..20d4e47 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -251,7 +251,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);            
             InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName);
             
-            // Currently, creator and ownership both revert to the loader
             Assert.That(foundItem.CreatorId, Is.EqualTo(user2Uuid.ToString()));            
             Assert.That(foundItem.Owner, Is.EqualTo(userUuid));            
             
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 440765a..ce1fe2d 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -39,8 +39,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 {
     public class HGWorldMapModule : WorldMapModule
     {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         #region INonSharedRegionModule Members
 
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 513d169..f7001ef 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private const bool UseProxy = false;
+        private bool UseProxy = false;
 
         // Capability string prefixes
         private static readonly string m_parcelVoiceInfoRequestPath = "0007/";
@@ -598,7 +598,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
 
             string auth_token = (string)requestBody["auth_token"];
             string[] auth_tokenvals = auth_token.Split(':');
-            string username = auth_tokenvals[0];
+            //string username = auth_tokenvals[0];
             int strcount = 0;
             
             string[] ids = new string[strcount];
@@ -667,7 +667,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
             
             Hashtable requestBody = parseRequestBody((string)request["body"]);
 
-            string pwd = (string) requestBody["pwd"];
+            //string pwd = (string) requestBody["pwd"];
             string userid = (string) requestBody["userid"];
 
             string avatarName = string.Empty;
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs
index 27cffd6..23dd52d 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs
@@ -228,7 +228,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         public GroupRecord GetGroupRecord(UUID GroupID, string GroupName)
         {
             Hashtable param = new Hashtable();
-            if ((GroupID != null) && (GroupID != UUID.Zero))
+            if (GroupID != UUID.Zero)
             {
                 param["GroupID"] = GroupID.ToString();
             }