aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorDiva Canto2010-03-01 22:23:52 -0800
committerDiva Canto2010-03-01 22:23:52 -0800
commitcb6c371a85d90d4d4dde59d50df15951d9d19e37 (patch)
tree3ab1221f389679c1a7a45efcebb60157c72bbe3f /OpenSim/Server
parentOffline friendship offers now working. (diff)
parentMerge branch 'master' into presence-refactor (diff)
downloadopensim-SC_OLD-cb6c371a85d90d4d4dde59d50df15951d9d19e37.zip
opensim-SC_OLD-cb6c371a85d90d4d4dde59d50df15951d9d19e37.tar.gz
opensim-SC_OLD-cb6c371a85d90d4d4dde59d50df15951d9d19e37.tar.bz2
opensim-SC_OLD-cb6c371a85d90d4d4dde59d50df15951d9d19e37.tar.xz
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs2
1 files changed, 0 insertions, 2 deletions
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