aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs5
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs1
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs3
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs6
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs2
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
62 if (pos == -1) m_name = id; 62 if (pos == -1) m_name = id;
63 else m_name = id.Substring(pos + 1); 63 else m_name = id.Substring(pos + 1);
64 64
65 ExtensionNodeList list = AddinManager.GetExtensionNodes("/OpenSim/RegionModules"); 65 //ExtensionNodeList list = AddinManager.GetExtensionNodes("/OpenSim/RegionModules");
66 // load all the (new) region-module classes 66 // load all the (new) region-module classes
67 foreach (TypeExtensionNode node in AddinManager.GetExtensionNodes("/OpenSim/RegionModules")) 67 foreach (TypeExtensionNode node in AddinManager.GetExtensionNodes("/OpenSim/RegionModules"))
68 { 68 {
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
61 private const string AvatarPickerAndSQL = "select * from users where username like :username and surname like :surname"; 61 private const string AvatarPickerAndSQL = "select * from users where username like :username and surname like :surname";
62 private const string AvatarPickerOrSQL = "select * from users where username like :username or surname like :surname"; 62 private const string AvatarPickerOrSQL = "select * from users where username like :username or surname like :surname";
63 63
64 private Dictionary<UUID, AvatarAppearance> aplist = new Dictionary<UUID, AvatarAppearance>();
65 private DataSet ds; 64 private DataSet ds;
66 private SqliteDataAdapter da; 65 private SqliteDataAdapter da;
67 private SqliteDataAdapter daf; 66 private SqliteDataAdapter daf;
@@ -162,7 +161,6 @@ namespace OpenSim.Data.SQLite
162 daa.Dispose(); 161 daa.Dispose();
163 daa = null; 162 daa = null;
164 } 163 }
165 aplist = null;
166 } 164 }
167 165
168 /// <summary> 166 /// <summary>
@@ -659,7 +657,6 @@ namespace OpenSim.Data.SQLite
659 AvatarAppearance aa = new AvatarAppearance(user); 657 AvatarAppearance aa = new AvatarAppearance(user);
660 //try { 658 //try {
661 aa.Owner = user; 659 aa.Owner = user;
662 //aplist[user] = appearance;
663 660
664 DataTable aap = ds.Tables["avatarappearance"]; 661 DataTable aap = ds.Tables["avatarappearance"];
665 lock (ds) 662 lock (ds)
@@ -726,7 +723,6 @@ namespace OpenSim.Data.SQLite
726 } 723 }
727 } 724 }
728 725
729 // aa = aplist[user];
730 // m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString()); 726 // m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
731 // } catch (KeyNotFoundException) { 727 // } catch (KeyNotFoundException) {
732 // m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString()); 728 // m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString());
@@ -742,7 +738,6 @@ namespace OpenSim.Data.SQLite
742 override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance) 738 override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
743 { 739 {
744 appearance.Owner = user; 740 appearance.Owner = user;
745 //aplist[user] = appearance;
746 DataTable aap = ds.Tables["avatarappearance"]; 741 DataTable aap = ds.Tables["avatarappearance"];
747 lock (ds) 742 lock (ds)
748 { 743 {
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
251 = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); 251 = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
252 InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName); 252 InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName);
253 253
254 // Currently, creator and ownership both revert to the loader
255 Assert.That(foundItem.CreatorId, Is.EqualTo(user2Uuid.ToString())); 254 Assert.That(foundItem.CreatorId, Is.EqualTo(user2Uuid.ToString()));
256 Assert.That(foundItem.Owner, Is.EqualTo(userUuid)); 255 Assert.That(foundItem.Owner, Is.EqualTo(userUuid));
257 256
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
39{ 39{
40 public class HGWorldMapModule : WorldMapModule 40 public class HGWorldMapModule : WorldMapModule
41 { 41 {
42 private static readonly ILog m_log = 42 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 43
45 #region INonSharedRegionModule Members 44 #region INonSharedRegionModule Members
46 45
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
59 private static readonly ILog m_log = 59 private static readonly ILog m_log =
60 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 60 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
61 61
62 private const bool UseProxy = false; 62 private bool UseProxy = false;
63 63
64 // Capability string prefixes 64 // Capability string prefixes
65 private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; 65 private static readonly string m_parcelVoiceInfoRequestPath = "0007/";
@@ -598,7 +598,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
598 598
599 string auth_token = (string)requestBody["auth_token"]; 599 string auth_token = (string)requestBody["auth_token"];
600 string[] auth_tokenvals = auth_token.Split(':'); 600 string[] auth_tokenvals = auth_token.Split(':');
601 string username = auth_tokenvals[0]; 601 //string username = auth_tokenvals[0];
602 int strcount = 0; 602 int strcount = 0;
603 603
604 string[] ids = new string[strcount]; 604 string[] ids = new string[strcount];
@@ -667,7 +667,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
667 667
668 Hashtable requestBody = parseRequestBody((string)request["body"]); 668 Hashtable requestBody = parseRequestBody((string)request["body"]);
669 669
670 string pwd = (string) requestBody["pwd"]; 670 //string pwd = (string) requestBody["pwd"];
671 string userid = (string) requestBody["userid"]; 671 string userid = (string) requestBody["userid"];
672 672
673 string avatarName = string.Empty; 673 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
228 public GroupRecord GetGroupRecord(UUID GroupID, string GroupName) 228 public GroupRecord GetGroupRecord(UUID GroupID, string GroupName)
229 { 229 {
230 Hashtable param = new Hashtable(); 230 Hashtable param = new Hashtable();
231 if ((GroupID != null) && (GroupID != UUID.Zero)) 231 if (GroupID != UUID.Zero)
232 { 232 {
233 param["GroupID"] = GroupID.ToString(); 233 param["GroupID"] = GroupID.ToString();
234 } 234 }