aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-03-02 04:43:36 +0000
committerMelanie2010-03-02 04:46:13 +0000
commitbef311dfb9692ffefcafa5752e6da4d0823c8773 (patch)
tree56efb8190b32ad9b80eef9b15990ef44920d338e /OpenSim
parentChanged the query in GetFriends in SQLite to match the one in MySql. (diff)
parentFix a few compiler warnings. (diff)
downloadopensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.zip
opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.gz
opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.bz2
opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.xz
Merge branch 'master' into presence-refactor
This is the big one. master is now presence-refactor (pre 0.7). A new branch 0.6.9-post-fixes and leading tag 0.6.9 has been created. The Presence-refactor branch remains for experimental work.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/MySQLGenericTableHandler.cs4
-rw-r--r--OpenSim/Data/MySQL/MySQLXInventoryData.cs3
-rw-r--r--OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs2
3 files changed, 0 insertions, 9 deletions
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index 6ad59f6..b170dde 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -39,10 +39,6 @@ namespace OpenSim.Data.MySQL
39{ 39{
40 public class MySQLGenericTableHandler<T> : MySqlFramework where T: class, new() 40 public class MySQLGenericTableHandler<T> : MySqlFramework where T: class, new()
41 { 41 {
42 private static readonly ILog m_log =
43 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44
45
46 protected Dictionary<string, FieldInfo> m_Fields = 42 protected Dictionary<string, FieldInfo> m_Fields =
47 new Dictionary<string, FieldInfo>(); 43 new Dictionary<string, FieldInfo>();
48 44
diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
index b5866cb..307a4c7 100644
--- a/OpenSim/Data/MySQL/MySQLXInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
@@ -41,9 +41,6 @@ namespace OpenSim.Data.MySQL
41 /// </summary> 41 /// </summary>
42 public class MySQLXInventoryData : IXInventoryData 42 public class MySQLXInventoryData : IXInventoryData
43 { 43 {
44 private static readonly ILog m_log = LogManager.GetLogger(
45 MethodBase.GetCurrentMethod().DeclaringType);
46
47 private MySQLGenericTableHandler<XInventoryFolder> m_Folders; 44 private MySQLGenericTableHandler<XInventoryFolder> m_Folders;
48 private MySqlItemHandler m_Items; 45 private MySqlItemHandler m_Items;
49 46
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 3ab1622..f9db859 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -44,8 +44,6 @@ namespace OpenSim.Server.Handlers.Asset
44{ 44{
45 public class XInventoryInConnector : ServiceConnector 45 public class XInventoryInConnector : ServiceConnector
46 { 46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48
49 private IInventoryService m_InventoryService; 47 private IInventoryService m_InventoryService;
50 private string m_ConfigName = "InventoryService"; 48 private string m_ConfigName = "InventoryService";
51 49