diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Grid/InventoryServer | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Grid/InventoryServer')
-rw-r--r-- | OpenSim/Grid/InventoryServer/GridInventoryService.cs | 10 | ||||
-rw-r--r-- | OpenSim/Grid/InventoryServer/InventoryManager.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/InventoryServer/Main.cs | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs index f7c9828..82ba7df 100644 --- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs +++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs | |||
@@ -27,13 +27,11 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Threading; | 30 | using System.Reflection; |
31 | |||
32 | using libsecondlife; | 31 | using libsecondlife; |
33 | 32 | using log4net; | |
34 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications; | 34 | using OpenSim.Framework.Communications; |
36 | using OpenSim.Framework.Console; | ||
37 | 35 | ||
38 | namespace OpenSim.Grid.InventoryServer | 36 | namespace OpenSim.Grid.InventoryServer |
39 | { | 37 | { |
@@ -42,8 +40,8 @@ namespace OpenSim.Grid.InventoryServer | |||
42 | /// </summary> | 40 | /// </summary> |
43 | public class GridInventoryService : InventoryServiceBase | 41 | public class GridInventoryService : InventoryServiceBase |
44 | { | 42 | { |
45 | private static readonly log4net.ILog m_log | 43 | private static readonly ILog m_log |
46 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 44 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 45 | ||
48 | public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) | 46 | public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) |
49 | { | 47 | { |
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs index ed154a8..b3c6891 100644 --- a/OpenSim/Grid/InventoryServer/InventoryManager.cs +++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs | |||
@@ -32,15 +32,15 @@ using System.Text; | |||
32 | using System.Xml; | 32 | using System.Xml; |
33 | using System.Xml.Serialization; | 33 | using System.Xml.Serialization; |
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using log4net; | ||
35 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Console; | ||
37 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
38 | 38 | ||
39 | namespace OpenSim.Grid.InventoryServer | 39 | namespace OpenSim.Grid.InventoryServer |
40 | { | 40 | { |
41 | public class InventoryManager | 41 | public class InventoryManager |
42 | { | 42 | { |
43 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | private IInventoryData _databasePlugin; | 45 | private IInventoryData _databasePlugin; |
46 | 46 | ||
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index 3987334..2454650 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs | |||
@@ -28,7 +28,10 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | ||
31 | using libsecondlife; | 32 | using libsecondlife; |
33 | using log4net; | ||
34 | using log4net.Config; | ||
32 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
34 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
@@ -37,7 +40,7 @@ namespace OpenSim.Grid.InventoryServer | |||
37 | { | 40 | { |
38 | public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback | 41 | public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback |
39 | { | 42 | { |
40 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
41 | 44 | ||
42 | private InventoryManager m_inventoryManager; | 45 | private InventoryManager m_inventoryManager; |
43 | private InventoryConfig m_config; | 46 | private InventoryConfig m_config; |
@@ -48,7 +51,7 @@ namespace OpenSim.Grid.InventoryServer | |||
48 | [STAThread] | 51 | [STAThread] |
49 | public static void Main(string[] args) | 52 | public static void Main(string[] args) |
50 | { | 53 | { |
51 | log4net.Config.XmlConfigurator.Configure(); | 54 | XmlConfigurator.Configure(); |
52 | 55 | ||
53 | OpenInventory_Main theServer = new OpenInventory_Main(); | 56 | OpenInventory_Main theServer = new OpenInventory_Main(); |
54 | theServer.Startup(); | 57 | theServer.Startup(); |