diff options
Diffstat (limited to 'OpenSim/Region/Communications/Local')
4 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index f5a5e83..2960a62 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs | |||
@@ -25,18 +25,20 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
28 | using System.Collections; | 29 | using System.Collections; |
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | ||
30 | using libsecondlife; | 32 | using libsecondlife; |
33 | using log4net; | ||
31 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
32 | using OpenSim.Framework.Communications; | 35 | using OpenSim.Framework.Communications; |
33 | using OpenSim.Framework.Console; | ||
34 | 36 | ||
35 | namespace OpenSim.Region.Communications.Local | 37 | namespace OpenSim.Region.Communications.Local |
36 | { | 38 | { |
37 | public class LocalBackEndServices : IGridServices, IInterRegionCommunications | 39 | public class LocalBackEndServices : IGridServices, IInterRegionCommunications |
38 | { | 40 | { |
39 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
40 | 42 | ||
41 | protected Dictionary<ulong, RegionInfo> m_regions = new Dictionary<ulong, RegionInfo>(); | 43 | protected Dictionary<ulong, RegionInfo> m_regions = new Dictionary<ulong, RegionInfo>(); |
42 | 44 | ||
@@ -47,7 +49,7 @@ namespace OpenSim.Region.Communications.Local | |||
47 | 49 | ||
48 | private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>(); | 50 | private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>(); |
49 | 51 | ||
50 | public string _gdebugRegionName = System.String.Empty; | 52 | public string _gdebugRegionName = String.Empty; |
51 | 53 | ||
52 | bool m_bAvailable=true; | 54 | bool m_bAvailable=true; |
53 | 55 | ||
@@ -67,7 +69,7 @@ namespace OpenSim.Region.Communications.Local | |||
67 | set { _gdebugRegionName = value; } | 69 | set { _gdebugRegionName = value; } |
68 | } | 70 | } |
69 | 71 | ||
70 | public string _rdebugRegionName = System.String.Empty; | 72 | public string _rdebugRegionName = String.Empty; |
71 | 73 | ||
72 | public string rdebugRegionName | 74 | public string rdebugRegionName |
73 | { | 75 | { |
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index dafd637..a567eeb 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs | |||
@@ -26,7 +26,9 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | ||
29 | using libsecondlife; | 30 | using libsecondlife; |
31 | using log4net; | ||
30 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
31 | using OpenSim.Framework.Communications; | 33 | using OpenSim.Framework.Communications; |
32 | using OpenSim.Framework.Communications.Cache; | 34 | using OpenSim.Framework.Communications.Cache; |
@@ -39,8 +41,8 @@ namespace OpenSim.Region.Communications.Local | |||
39 | /// </summary> | 41 | /// </summary> |
40 | public class LocalInventoryService : InventoryServiceBase | 42 | public class LocalInventoryService : InventoryServiceBase |
41 | { | 43 | { |
42 | private static readonly log4net.ILog m_log | 44 | private static readonly ILog m_log |
43 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 45 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 46 | ||
45 | public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) | 47 | public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) |
46 | { | 48 | { |
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 79bf9e5..c4823f4 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
@@ -28,14 +28,11 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | ||
31 | using libsecondlife; | 32 | using libsecondlife; |
32 | 33 | using log4net; | |
33 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Communications.Cache; | ||
35 | using OpenSim.Framework.Console; | ||
36 | using OpenSim.Framework.Statistics; | ||
37 | using OpenSim.Framework.UserManagement; | 35 | using OpenSim.Framework.UserManagement; |
38 | using InventoryFolder=OpenSim.Framework.InventoryFolder; | ||
39 | 36 | ||
40 | namespace OpenSim.Region.Communications.Local | 37 | namespace OpenSim.Region.Communications.Local |
41 | { | 38 | { |
@@ -43,8 +40,8 @@ namespace OpenSim.Region.Communications.Local | |||
43 | 40 | ||
44 | public class LocalLoginService : LoginService | 41 | public class LocalLoginService : LoginService |
45 | { | 42 | { |
46 | private static readonly log4net.ILog m_log | 43 | private static readonly ILog m_log |
47 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 44 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 45 | ||
49 | private CommunicationsLocal m_Parent; | 46 | private CommunicationsLocal m_Parent; |
50 | 47 | ||
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index c543762..29de8fd 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs | |||
@@ -29,7 +29,6 @@ using System; | |||
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Framework.Communications; | 31 | using OpenSim.Framework.Communications; |
32 | using OpenSim.Framework.Statistics; | ||
33 | using OpenSim.Framework.UserManagement; | 32 | using OpenSim.Framework.UserManagement; |
34 | 33 | ||
35 | namespace OpenSim.Region.Communications.Local | 34 | namespace OpenSim.Region.Communications.Local |