diff options
| author | Melanie | 2010-03-02 04:43:36 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-02 04:46:13 +0000 |
| commit | bef311dfb9692ffefcafa5752e6da4d0823c8773 (patch) | |
| tree | 56efb8190b32ad9b80eef9b15990ef44920d338e /OpenSim/Server | |
| parent | Changed the query in GetFriends in SQLite to match the one in MySql. (diff) | |
| parent | Fix a few compiler warnings. (diff) | |
| download | opensim-SC-bef311dfb9692ffefcafa5752e6da4d0823c8773.zip opensim-SC-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.gz opensim-SC-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.bz2 opensim-SC-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/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | 2 |
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 | ||