diff options
author | lbsa71 | 2007-10-30 09:05:31 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-30 09:05:31 +0000 |
commit | 67e12b95ea7b68f4904a7484d77ecfd787d16d0c (patch) | |
tree | 20b00d24c8a7617017960432ec044852e3ad5fa9 /OpenSim/Framework/Communications/CommunicationsManager.cs | |
parent | * Deleted .user file (diff) | |
download | opensim-SC_OLD-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.zip opensim-SC_OLD-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.gz opensim-SC_OLD-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.bz2 opensim-SC_OLD-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.xz |
* Optimized usings
* Shortened type references
* Removed redundant 'this' qualifier
Diffstat (limited to 'OpenSim/Framework/Communications/CommunicationsManager.cs')
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index d8d198b..77c7261 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -28,69 +28,77 @@ | |||
28 | using System; | 28 | using System; |
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | using OpenSim.Framework.Communications.Cache; | 30 | using OpenSim.Framework.Communications.Cache; |
31 | using OpenSim.Framework.Console; | ||
31 | using OpenSim.Framework.Interfaces; | 32 | using OpenSim.Framework.Interfaces; |
32 | using OpenSim.Framework.Servers; | 33 | using OpenSim.Framework.Servers; |
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Console; | ||
35 | 34 | ||
36 | namespace OpenSim.Framework.Communications | 35 | namespace OpenSim.Framework.Communications |
37 | { | 36 | { |
38 | public class CommunicationsManager | 37 | public class CommunicationsManager |
39 | { | 38 | { |
40 | protected IUserService m_userService; | 39 | protected IUserService m_userService; |
40 | |||
41 | public IUserService UserService | 41 | public IUserService UserService |
42 | { | 42 | { |
43 | get { return m_userService; } | 43 | get { return m_userService; } |
44 | } | 44 | } |
45 | 45 | ||
46 | protected IGridServices m_gridService; | 46 | protected IGridServices m_gridService; |
47 | |||
47 | public IGridServices GridService | 48 | public IGridServices GridService |
48 | { | 49 | { |
49 | get { return m_gridService; } | 50 | get { return m_gridService; } |
50 | } | 51 | } |
51 | 52 | ||
52 | protected IInventoryServices m_inventoryService; | 53 | protected IInventoryServices m_inventoryService; |
54 | |||
53 | public IInventoryServices InventoryService | 55 | public IInventoryServices InventoryService |
54 | { | 56 | { |
55 | get { return m_inventoryService; } | 57 | get { return m_inventoryService; } |
56 | } | 58 | } |
57 | 59 | ||
58 | protected IInterRegionCommunications m_interRegion; | 60 | protected IInterRegionCommunications m_interRegion; |
61 | |||
59 | public IInterRegionCommunications InterRegion | 62 | public IInterRegionCommunications InterRegion |
60 | { | 63 | { |
61 | get { return m_interRegion; } | 64 | get { return m_interRegion; } |
62 | } | 65 | } |
63 | 66 | ||
64 | protected UserProfileCache m_userProfileCache; | 67 | protected UserProfileCache m_userProfileCache; |
68 | |||
65 | public UserProfileCache UserProfileCache | 69 | public UserProfileCache UserProfileCache |
66 | { | 70 | { |
67 | get { return m_userProfileCache; } | 71 | get { return m_userProfileCache; } |
68 | } | 72 | } |
69 | 73 | ||
70 | protected AssetTransactionManager m_transactionsManager; | 74 | protected AssetTransactionManager m_transactionsManager; |
75 | |||
71 | public AssetTransactionManager TransactionsManager | 76 | public AssetTransactionManager TransactionsManager |
72 | { | 77 | { |
73 | get { return m_transactionsManager; } | 78 | get { return m_transactionsManager; } |
74 | } | 79 | } |
75 | 80 | ||
76 | protected AssetCache m_assetCache; | 81 | protected AssetCache m_assetCache; |
82 | |||
77 | public AssetCache AssetCache | 83 | public AssetCache AssetCache |
78 | { | 84 | { |
79 | get { return m_assetCache; } | 85 | get { return m_assetCache; } |
80 | } | 86 | } |
81 | 87 | ||
82 | protected NetworkServersInfo m_networkServersInfo; | 88 | protected NetworkServersInfo m_networkServersInfo; |
89 | |||
83 | public NetworkServersInfo NetworkServersInfo | 90 | public NetworkServersInfo NetworkServersInfo |
84 | { | 91 | { |
85 | get { return m_networkServersInfo; } | 92 | get { return m_networkServersInfo; } |
86 | } | 93 | } |
87 | 94 | ||
88 | public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, bool dumpAssetsToFile) | 95 | public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, |
96 | bool dumpAssetsToFile) | ||
89 | { | 97 | { |
90 | m_networkServersInfo = serversInfo; | 98 | m_networkServersInfo = serversInfo; |
91 | m_assetCache = assetCache; | 99 | m_assetCache = assetCache; |
92 | m_userProfileCache = new UserProfileCache(this); | 100 | m_userProfileCache = new UserProfileCache(this); |
93 | m_transactionsManager = new AssetTransactionManager(this, dumpAssetsToFile ); | 101 | m_transactionsManager = new AssetTransactionManager(this, dumpAssetsToFile); |
94 | } | 102 | } |
95 | 103 | ||
96 | public void doCreate(string[] cmmdParams) | 104 | public void doCreate(string[] cmmdParams) |
@@ -106,7 +114,6 @@ namespace OpenSim.Framework.Communications | |||
106 | 114 | ||
107 | if (cmmdParams.Length < 2) | 115 | if (cmmdParams.Length < 2) |
108 | { | 116 | { |
109 | |||
110 | firstName = MainLog.Instance.CmdPrompt("First name", "Default"); | 117 | firstName = MainLog.Instance.CmdPrompt("First name", "Default"); |
111 | lastName = MainLog.Instance.CmdPrompt("Last name", "User"); | 118 | lastName = MainLog.Instance.CmdPrompt("Last name", "User"); |
112 | password = MainLog.Instance.PasswdPrompt("Password"); | 119 | password = MainLog.Instance.PasswdPrompt("Password"); |
@@ -120,7 +127,6 @@ namespace OpenSim.Framework.Communications | |||
120 | password = cmmdParams[3]; | 127 | password = cmmdParams[3]; |
121 | regX = Convert.ToUInt32(cmmdParams[4]); | 128 | regX = Convert.ToUInt32(cmmdParams[4]); |
122 | regY = Convert.ToUInt32(cmmdParams[5]); | 129 | regY = Convert.ToUInt32(cmmdParams[5]); |
123 | |||
124 | } | 130 | } |
125 | 131 | ||
126 | AddUser(firstName, lastName, password, regX, regY); | 132 | AddUser(firstName, lastName, password, regX, regY); |
@@ -140,7 +146,7 @@ namespace OpenSim.Framework.Communications | |||
140 | } | 146 | } |
141 | else | 147 | else |
142 | { | 148 | { |
143 | this.m_inventoryService.CreateNewUserInventory(userProf.UUID); | 149 | m_inventoryService.CreateNewUserInventory(userProf.UUID); |
144 | System.Console.WriteLine("Created new inventory set for " + firstName + " " + lastName); | 150 | System.Console.WriteLine("Created new inventory set for " + firstName + " " + lastName); |
145 | return userProf.UUID; | 151 | return userProf.UUID; |
146 | } | 152 | } |