diff options
author | lbsa71 | 2007-10-05 13:54:16 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-05 13:54:16 +0000 |
commit | d4a4aafaf15360c0f5db22145a60bae87e6bb9c6 (patch) | |
tree | 72915aa8a9f3777a52fe8677c764a192d448e492 /OpenSim/Framework/Communications | |
parent | * minor refactoring (diff) | |
download | opensim-SC-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.zip opensim-SC-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.gz opensim-SC-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.bz2 opensim-SC-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.xz |
* So, ok, maybe renaming serialized fields on a friday wasn't the smartest of things. Reverting 2056.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 572 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 32 |
3 files changed, 304 insertions, 304 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index 010d5ce..5af07f7 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -162,8 +162,8 @@ namespace OpenSim.Framework.Communications | |||
162 | if (profileData != null) | 162 | if (profileData != null) |
163 | { | 163 | { |
164 | LLUUID profileId = profileData.UUID; | 164 | LLUUID profileId = profileData.UUID; |
165 | string firstname = profileData.Firstname; | 165 | string firstname = profileData.username; |
166 | string lastname = profileData.Lastname; | 166 | string lastname = profileData.surname; |
167 | 167 | ||
168 | remote_client.SendNameReply(profileId, firstname, lastname); | 168 | remote_client.SendNameReply(profileId, firstname, lastname); |
169 | } | 169 | } |
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 31c9363..06abb69 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -1,287 +1,287 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections; | 2 | using System.Collections; |
3 | using System.Collections.Generic; | 3 | using System.Collections.Generic; |
4 | using System.Reflection; | 4 | using System.Reflection; |
5 | using System.Security.Cryptography; | 5 | using System.Security.Cryptography; |
6 | using libsecondlife; | 6 | using libsecondlife; |
7 | using Nwc.XmlRpc; | 7 | using Nwc.XmlRpc; |
8 | using OpenSim.Framework.Console; | 8 | using OpenSim.Framework.Console; |
9 | using OpenSim.Framework.Interfaces; | 9 | using OpenSim.Framework.Interfaces; |
10 | using OpenSim.Framework.Inventory; | 10 | using OpenSim.Framework.Inventory; |
11 | using OpenSim.Framework.Types; | 11 | using OpenSim.Framework.Types; |
12 | using OpenSim.Framework.Utilities; | 12 | using OpenSim.Framework.Utilities; |
13 | 13 | ||
14 | using OpenSim.Framework.Configuration; | 14 | using OpenSim.Framework.Configuration; |
15 | using InventoryFolder = OpenSim.Framework.Inventory.InventoryFolder; | 15 | using InventoryFolder = OpenSim.Framework.Inventory.InventoryFolder; |
16 | 16 | ||
17 | namespace OpenSim.Framework.UserManagement | 17 | namespace OpenSim.Framework.UserManagement |
18 | { | 18 | { |
19 | public class LoginService | 19 | public class LoginService |
20 | { | 20 | { |
21 | protected string m_welcomeMessage = "Welcome to OpenSim"; | 21 | protected string m_welcomeMessage = "Welcome to OpenSim"; |
22 | protected UserManagerBase m_userManager = null; | 22 | protected UserManagerBase m_userManager = null; |
23 | 23 | ||
24 | public LoginService(UserManagerBase userManager, string welcomeMess) | 24 | public LoginService(UserManagerBase userManager, string welcomeMess) |
25 | { | 25 | { |
26 | m_userManager = userManager; | 26 | m_userManager = userManager; |
27 | if (welcomeMess != "") | 27 | if (welcomeMess != "") |
28 | { | 28 | { |
29 | m_welcomeMessage = welcomeMess; | 29 | m_welcomeMessage = welcomeMess; |
30 | } | 30 | } |
31 | } | 31 | } |
32 | 32 | ||
33 | /// <summary> | 33 | /// <summary> |
34 | /// Main user login function | 34 | /// Main user login function |
35 | /// </summary> | 35 | /// </summary> |
36 | /// <param name="request">The XMLRPC request</param> | 36 | /// <param name="request">The XMLRPC request</param> |
37 | /// <returns>The response to send</returns> | 37 | /// <returns>The response to send</returns> |
38 | public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) | 38 | public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) |
39 | { | 39 | { |
40 | 40 | ||
41 | System.Console.WriteLine("Attempting login now..."); | 41 | System.Console.WriteLine("Attempting login now..."); |
42 | XmlRpcResponse response = new XmlRpcResponse(); | 42 | XmlRpcResponse response = new XmlRpcResponse(); |
43 | Hashtable requestData = (Hashtable)request.Params[0]; | 43 | Hashtable requestData = (Hashtable)request.Params[0]; |
44 | 44 | ||
45 | bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd")); | 45 | bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd")); |
46 | bool GoodLogin = false; | 46 | bool GoodLogin = false; |
47 | 47 | ||
48 | UserProfileData userProfile; | 48 | UserProfileData userProfile; |
49 | LoginResponse logResponse = new LoginResponse(); | 49 | LoginResponse logResponse = new LoginResponse(); |
50 | 50 | ||
51 | if (GoodXML) | 51 | if (GoodXML) |
52 | { | 52 | { |
53 | string firstname = (string)requestData["first"]; | 53 | string firstname = (string)requestData["first"]; |
54 | string lastname = (string)requestData["last"]; | 54 | string lastname = (string)requestData["last"]; |
55 | string passwd = (string)requestData["passwd"]; | 55 | string passwd = (string)requestData["passwd"]; |
56 | 56 | ||
57 | userProfile = GetTheUser(firstname, lastname); | 57 | userProfile = GetTheUser(firstname, lastname); |
58 | if (userProfile == null) | 58 | if (userProfile == null) |
59 | return logResponse.CreateLoginFailedResponse(); | 59 | return logResponse.CreateLoginFailedResponse(); |
60 | 60 | ||
61 | GoodLogin = AuthenticateUser(userProfile, passwd); | 61 | GoodLogin = AuthenticateUser(userProfile, passwd); |
62 | } | 62 | } |
63 | else | 63 | else |
64 | { | 64 | { |
65 | return logResponse.CreateGridErrorResponse(); | 65 | return logResponse.CreateGridErrorResponse(); |
66 | } | 66 | } |
67 | 67 | ||
68 | if (!GoodLogin) | 68 | if (!GoodLogin) |
69 | { | 69 | { |
70 | return logResponse.CreateLoginFailedResponse(); | 70 | return logResponse.CreateLoginFailedResponse(); |
71 | } | 71 | } |
72 | else | 72 | else |
73 | { | 73 | { |
74 | // If we already have a session... | 74 | // If we already have a session... |
75 | if (userProfile.CurrentAgent != null && userProfile.CurrentAgent.agentOnline) | 75 | if (userProfile.currentAgent != null && userProfile.currentAgent.agentOnline) |
76 | { | 76 | { |
77 | // Reject the login | 77 | // Reject the login |
78 | return logResponse.CreateAlreadyLoggedInResponse(); | 78 | return logResponse.CreateAlreadyLoggedInResponse(); |
79 | } | 79 | } |
80 | // Otherwise... | 80 | // Otherwise... |
81 | // Create a new agent session | 81 | // Create a new agent session |
82 | CreateAgent(userProfile, request); | 82 | CreateAgent(userProfile, request); |
83 | 83 | ||
84 | try | 84 | try |
85 | { | 85 | { |
86 | LLUUID agentID = userProfile.UUID; | 86 | LLUUID agentID = userProfile.UUID; |
87 | 87 | ||
88 | // Inventory Library Section | 88 | // Inventory Library Section |
89 | InventoryData inventData = this.CreateInventoryData(agentID); | 89 | InventoryData inventData = this.CreateInventoryData(agentID); |
90 | ArrayList AgentInventoryArray = inventData.InventoryArray; | 90 | ArrayList AgentInventoryArray = inventData.InventoryArray; |
91 | 91 | ||
92 | Hashtable InventoryRootHash = new Hashtable(); | 92 | Hashtable InventoryRootHash = new Hashtable(); |
93 | InventoryRootHash["folder_id"] = inventData.RootFolderID.ToStringHyphenated(); | 93 | InventoryRootHash["folder_id"] = inventData.RootFolderID.ToStringHyphenated(); |
94 | ArrayList InventoryRoot = new ArrayList(); | 94 | ArrayList InventoryRoot = new ArrayList(); |
95 | InventoryRoot.Add(InventoryRootHash); | 95 | InventoryRoot.Add(InventoryRootHash); |
96 | userProfile.RootInventoryFolderId = inventData.RootFolderID; | 96 | userProfile.rootInventoryFolderID = inventData.RootFolderID; |
97 | 97 | ||
98 | // Circuit Code | 98 | // Circuit Code |
99 | uint circode = (uint)(Util.RandomClass.Next()); | 99 | uint circode = (uint)(Util.RandomClass.Next()); |
100 | 100 | ||
101 | logResponse.Lastname = userProfile.Lastname; | 101 | logResponse.Lastname = userProfile.surname; |
102 | logResponse.Firstname = userProfile.Firstname; | 102 | logResponse.Firstname = userProfile.username; |
103 | logResponse.AgentID = agentID.ToStringHyphenated(); | 103 | logResponse.AgentID = agentID.ToStringHyphenated(); |
104 | logResponse.SessionID = userProfile.CurrentAgent.sessionID.ToStringHyphenated(); | 104 | logResponse.SessionID = userProfile.currentAgent.sessionID.ToStringHyphenated(); |
105 | logResponse.SecureSessionID = userProfile.CurrentAgent.secureSessionID.ToStringHyphenated(); | 105 | logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToStringHyphenated(); |
106 | logResponse.InventoryRoot = InventoryRoot; | 106 | logResponse.InventoryRoot = InventoryRoot; |
107 | logResponse.InventorySkeleton = AgentInventoryArray; | 107 | logResponse.InventorySkeleton = AgentInventoryArray; |
108 | logResponse.InventoryLibrary = this.GetInventoryLibrary(); | 108 | logResponse.InventoryLibrary = this.GetInventoryLibrary(); |
109 | logResponse.InventoryLibraryOwner = this.GetLibraryOwner(); | 109 | logResponse.InventoryLibraryOwner = this.GetLibraryOwner(); |
110 | logResponse.CircuitCode = (Int32)circode; | 110 | logResponse.CircuitCode = (Int32)circode; |
111 | //logResponse.RegionX = 0; //overwritten | 111 | //logResponse.RegionX = 0; //overwritten |
112 | //logResponse.RegionY = 0; //overwritten | 112 | //logResponse.RegionY = 0; //overwritten |
113 | logResponse.Home = "!!null temporary value {home}!!"; // Overwritten | 113 | logResponse.Home = "!!null temporary value {home}!!"; // Overwritten |
114 | //logResponse.LookAt = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n"; | 114 | //logResponse.LookAt = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n"; |
115 | //logResponse.SimAddress = "127.0.0.1"; //overwritten | 115 | //logResponse.SimAddress = "127.0.0.1"; //overwritten |
116 | //logResponse.SimPort = 0; //overwritten | 116 | //logResponse.SimPort = 0; //overwritten |
117 | logResponse.Message = this.GetMessage(); | 117 | logResponse.Message = this.GetMessage(); |
118 | 118 | ||
119 | try | 119 | try |
120 | { | 120 | { |
121 | this.CustomiseResponse(logResponse, userProfile); | 121 | this.CustomiseResponse(logResponse, userProfile); |
122 | } | 122 | } |
123 | catch (Exception e) | 123 | catch (Exception e) |
124 | { | 124 | { |
125 | System.Console.WriteLine(e.ToString()); | 125 | System.Console.WriteLine(e.ToString()); |
126 | return logResponse.CreateDeadRegionResponse(); | 126 | return logResponse.CreateDeadRegionResponse(); |
127 | //return logResponse.ToXmlRpcResponse(); | 127 | //return logResponse.ToXmlRpcResponse(); |
128 | } | 128 | } |
129 | CommitAgent(ref userProfile); | 129 | CommitAgent(ref userProfile); |
130 | return logResponse.ToXmlRpcResponse(); | 130 | return logResponse.ToXmlRpcResponse(); |
131 | 131 | ||
132 | } | 132 | } |
133 | 133 | ||
134 | catch (Exception E) | 134 | catch (Exception E) |
135 | { | 135 | { |
136 | System.Console.WriteLine(E.ToString()); | 136 | System.Console.WriteLine(E.ToString()); |
137 | } | 137 | } |
138 | //} | 138 | //} |
139 | } | 139 | } |
140 | return response; | 140 | return response; |
141 | 141 | ||
142 | } | 142 | } |
143 | 143 | ||
144 | /// <summary> | 144 | /// <summary> |
145 | /// Customises the login response and fills in missing values. | 145 | /// Customises the login response and fills in missing values. |
146 | /// </summary> | 146 | /// </summary> |
147 | /// <param name="response">The existing response</param> | 147 | /// <param name="response">The existing response</param> |
148 | /// <param name="theUser">The user profile</param> | 148 | /// <param name="theUser">The user profile</param> |
149 | public virtual void CustomiseResponse(LoginResponse response, UserProfileData theUser) | 149 | public virtual void CustomiseResponse(LoginResponse response, UserProfileData theUser) |
150 | { | 150 | { |
151 | } | 151 | } |
152 | 152 | ||
153 | /// <summary> | 153 | /// <summary> |
154 | /// Saves a target agent to the database | 154 | /// Saves a target agent to the database |
155 | /// </summary> | 155 | /// </summary> |
156 | /// <param name="profile">The users profile</param> | 156 | /// <param name="profile">The users profile</param> |
157 | /// <returns>Successful?</returns> | 157 | /// <returns>Successful?</returns> |
158 | public bool CommitAgent(ref UserProfileData profile) | 158 | public bool CommitAgent(ref UserProfileData profile) |
159 | { | 159 | { |
160 | // Saves the agent to database | 160 | // Saves the agent to database |
161 | return true; | 161 | return true; |
162 | } | 162 | } |
163 | 163 | ||
164 | 164 | ||
165 | /// <summary> | 165 | /// <summary> |
166 | /// Checks a user against it's password hash | 166 | /// Checks a user against it's password hash |
167 | /// </summary> | 167 | /// </summary> |
168 | /// <param name="profile">The users profile</param> | 168 | /// <param name="profile">The users profile</param> |
169 | /// <param name="password">The supplied password</param> | 169 | /// <param name="password">The supplied password</param> |
170 | /// <returns>Authenticated?</returns> | 170 | /// <returns>Authenticated?</returns> |
171 | public virtual bool AuthenticateUser(UserProfileData profile, string password) | 171 | public virtual bool AuthenticateUser(UserProfileData profile, string password) |
172 | { | 172 | { |
173 | 173 | ||
174 | MainLog.Instance.Verbose( | 174 | MainLog.Instance.Verbose( |
175 | "Authenticating " + profile.Firstname + " " + profile.Lastname); | 175 | "Authenticating " + profile.username + " " + profile.surname); |
176 | 176 | ||
177 | password = password.Remove(0, 3); //remove $1$ | 177 | password = password.Remove(0, 3); //remove $1$ |
178 | 178 | ||
179 | string s = Util.Md5Hash(password + ":" + profile.PasswordSalt); | 179 | string s = Util.Md5Hash(password + ":" + profile.passwordSalt); |
180 | 180 | ||
181 | return profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase); | 181 | return profile.passwordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase); |
182 | } | 182 | } |
183 | 183 | ||
184 | /// <summary> | 184 | /// <summary> |
185 | /// | 185 | /// |
186 | /// </summary> | 186 | /// </summary> |
187 | /// <param name="profile"></param> | 187 | /// <param name="profile"></param> |
188 | /// <param name="request"></param> | 188 | /// <param name="request"></param> |
189 | public void CreateAgent(UserProfileData profile, XmlRpcRequest request) | 189 | public void CreateAgent(UserProfileData profile, XmlRpcRequest request) |
190 | { | 190 | { |
191 | this.m_userManager.CreateAgent(profile, request); | 191 | this.m_userManager.CreateAgent(profile, request); |
192 | } | 192 | } |
193 | 193 | ||
194 | /// <summary> | 194 | /// <summary> |
195 | /// | 195 | /// |
196 | /// </summary> | 196 | /// </summary> |
197 | /// <param name="firstname"></param> | 197 | /// <param name="firstname"></param> |
198 | /// <param name="lastname"></param> | 198 | /// <param name="lastname"></param> |
199 | /// <returns></returns> | 199 | /// <returns></returns> |
200 | public virtual UserProfileData GetTheUser(string firstname, string lastname) | 200 | public virtual UserProfileData GetTheUser(string firstname, string lastname) |
201 | { | 201 | { |
202 | return this.m_userManager.GetUserProfile(firstname, lastname); | 202 | return this.m_userManager.GetUserProfile(firstname, lastname); |
203 | } | 203 | } |
204 | 204 | ||
205 | /// <summary> | 205 | /// <summary> |
206 | /// | 206 | /// |
207 | /// </summary> | 207 | /// </summary> |
208 | /// <returns></returns> | 208 | /// <returns></returns> |
209 | public virtual string GetMessage() | 209 | public virtual string GetMessage() |
210 | { | 210 | { |
211 | return m_welcomeMessage; | 211 | return m_welcomeMessage; |
212 | } | 212 | } |
213 | 213 | ||
214 | /// <summary> | 214 | /// <summary> |
215 | /// | 215 | /// |
216 | /// </summary> | 216 | /// </summary> |
217 | /// <returns></returns> | 217 | /// <returns></returns> |
218 | protected virtual ArrayList GetInventoryLibrary() | 218 | protected virtual ArrayList GetInventoryLibrary() |
219 | { | 219 | { |
220 | //return new ArrayList(); | 220 | //return new ArrayList(); |
221 | Hashtable TempHash = new Hashtable(); | 221 | Hashtable TempHash = new Hashtable(); |
222 | TempHash["name"] = "OpenSim Library"; | 222 | TempHash["name"] = "OpenSim Library"; |
223 | TempHash["parent_id"] = LLUUID.Zero.ToStringHyphenated(); | 223 | TempHash["parent_id"] = LLUUID.Zero.ToStringHyphenated(); |
224 | TempHash["version"] = 1; | 224 | TempHash["version"] = 1; |
225 | TempHash["type_default"] = -1; | 225 | TempHash["type_default"] = -1; |
226 | TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba000"; | 226 | TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba000"; |
227 | ArrayList temp = new ArrayList(); | 227 | ArrayList temp = new ArrayList(); |
228 | temp.Add(TempHash); | 228 | temp.Add(TempHash); |
229 | 229 | ||
230 | TempHash = new Hashtable(); | 230 | TempHash = new Hashtable(); |
231 | TempHash["name"] = "Texture Library"; | 231 | TempHash["name"] = "Texture Library"; |
232 | TempHash["parent_id"] = "00000112-000f-0000-0000-000100bba000"; | 232 | TempHash["parent_id"] = "00000112-000f-0000-0000-000100bba000"; |
233 | TempHash["version"] = 1; | 233 | TempHash["version"] = 1; |
234 | TempHash["type_default"] = -1; | 234 | TempHash["type_default"] = -1; |
235 | TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba001"; | 235 | TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba001"; |
236 | temp.Add(TempHash); | 236 | temp.Add(TempHash); |
237 | return temp; | 237 | return temp; |
238 | } | 238 | } |
239 | 239 | ||
240 | /// <summary> | 240 | /// <summary> |
241 | /// | 241 | /// |
242 | /// </summary> | 242 | /// </summary> |
243 | /// <returns></returns> | 243 | /// <returns></returns> |
244 | protected virtual ArrayList GetLibraryOwner() | 244 | protected virtual ArrayList GetLibraryOwner() |
245 | { | 245 | { |
246 | //for now create random inventory library owner | 246 | //for now create random inventory library owner |
247 | Hashtable TempHash = new Hashtable(); | 247 | Hashtable TempHash = new Hashtable(); |
248 | TempHash["agent_id"] = "11111111-1111-0000-0000-000100bba000"; | 248 | TempHash["agent_id"] = "11111111-1111-0000-0000-000100bba000"; |
249 | ArrayList inventoryLibOwner = new ArrayList(); | 249 | ArrayList inventoryLibOwner = new ArrayList(); |
250 | inventoryLibOwner.Add(TempHash); | 250 | inventoryLibOwner.Add(TempHash); |
251 | return inventoryLibOwner; | 251 | return inventoryLibOwner; |
252 | } | 252 | } |
253 | 253 | ||
254 | protected virtual InventoryData CreateInventoryData(LLUUID userID) | 254 | protected virtual InventoryData CreateInventoryData(LLUUID userID) |
255 | { | 255 | { |
256 | AgentInventory userInventory = new AgentInventory(); | 256 | AgentInventory userInventory = new AgentInventory(); |
257 | userInventory.CreateRootFolder(userID, false); | 257 | userInventory.CreateRootFolder(userID, false); |
258 | 258 | ||
259 | ArrayList AgentInventoryArray = new ArrayList(); | 259 | ArrayList AgentInventoryArray = new ArrayList(); |
260 | Hashtable TempHash; | 260 | Hashtable TempHash; |
261 | foreach (InventoryFolder InvFolder in userInventory.InventoryFolders.Values) | 261 | foreach (InventoryFolder InvFolder in userInventory.InventoryFolders.Values) |
262 | { | 262 | { |
263 | TempHash = new Hashtable(); | 263 | TempHash = new Hashtable(); |
264 | TempHash["name"] = InvFolder.FolderName; | 264 | TempHash["name"] = InvFolder.FolderName; |
265 | TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated(); | 265 | TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated(); |
266 | TempHash["version"] = (Int32)InvFolder.Version; | 266 | TempHash["version"] = (Int32)InvFolder.Version; |
267 | TempHash["type_default"] = (Int32)InvFolder.DefaultType; | 267 | TempHash["type_default"] = (Int32)InvFolder.DefaultType; |
268 | TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated(); | 268 | TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated(); |
269 | AgentInventoryArray.Add(TempHash); | 269 | AgentInventoryArray.Add(TempHash); |
270 | } | 270 | } |
271 | 271 | ||
272 | return new InventoryData(AgentInventoryArray, userInventory.InventoryRoot.FolderID); | 272 | return new InventoryData(AgentInventoryArray, userInventory.InventoryRoot.FolderID); |
273 | } | 273 | } |
274 | 274 | ||
275 | public class InventoryData | 275 | public class InventoryData |
276 | { | 276 | { |
277 | public ArrayList InventoryArray = null; | 277 | public ArrayList InventoryArray = null; |
278 | public LLUUID RootFolderID = LLUUID.Zero; | 278 | public LLUUID RootFolderID = LLUUID.Zero; |
279 | 279 | ||
280 | public InventoryData(ArrayList invList, LLUUID rootID) | 280 | public InventoryData(ArrayList invList, LLUUID rootID) |
281 | { | 281 | { |
282 | InventoryArray = invList; | 282 | InventoryArray = invList; |
283 | RootFolderID = rootID; | 283 | RootFolderID = rootID; |
284 | } | 284 | } |
285 | } | 285 | } |
286 | } | 286 | } |
287 | } | 287 | } |
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index d04101c..56ed959 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.UserManagement | |||
96 | try | 96 | try |
97 | { | 97 | { |
98 | UserProfileData profile = plugin.Value.GetUserByUUID(uuid); | 98 | UserProfileData profile = plugin.Value.GetUserByUUID(uuid); |
99 | profile.CurrentAgent = getUserAgent(profile.UUID); | 99 | profile.currentAgent = getUserAgent(profile.UUID); |
100 | return profile; | 100 | return profile; |
101 | } | 101 | } |
102 | catch (Exception e) | 102 | catch (Exception e) |
@@ -121,7 +121,7 @@ namespace OpenSim.Framework.UserManagement | |||
121 | try | 121 | try |
122 | { | 122 | { |
123 | UserProfileData profile = plugin.Value.GetUserByName(name); | 123 | UserProfileData profile = plugin.Value.GetUserByName(name); |
124 | profile.CurrentAgent = getUserAgent(profile.UUID); | 124 | profile.currentAgent = getUserAgent(profile.UUID); |
125 | return profile; | 125 | return profile; |
126 | } | 126 | } |
127 | catch (Exception e) | 127 | catch (Exception e) |
@@ -148,7 +148,7 @@ namespace OpenSim.Framework.UserManagement | |||
148 | { | 148 | { |
149 | UserProfileData profile = plugin.Value.GetUserByName(fname,lname); | 149 | UserProfileData profile = plugin.Value.GetUserByName(fname,lname); |
150 | 150 | ||
151 | profile.CurrentAgent = getUserAgent(profile.UUID); | 151 | profile.currentAgent = getUserAgent(profile.UUID); |
152 | 152 | ||
153 | return profile; | 153 | return profile; |
154 | } | 154 | } |
@@ -233,7 +233,7 @@ namespace OpenSim.Framework.UserManagement | |||
233 | public void clearUserAgent(LLUUID agentID) | 233 | public void clearUserAgent(LLUUID agentID) |
234 | { | 234 | { |
235 | UserProfileData profile = GetUserProfile(agentID); | 235 | UserProfileData profile = GetUserProfile(agentID); |
236 | profile.CurrentAgent = null; | 236 | profile.currentAgent = null; |
237 | setUserProfile(profile); | 237 | setUserProfile(profile); |
238 | } | 238 | } |
239 | 239 | ||
@@ -292,8 +292,8 @@ namespace OpenSim.Framework.UserManagement | |||
292 | agent.UUID = profile.UUID; | 292 | agent.UUID = profile.UUID; |
293 | 293 | ||
294 | // Current position (from Home) | 294 | // Current position (from Home) |
295 | agent.currentHandle = profile.HomeRegion; | 295 | agent.currentHandle = profile.homeRegion; |
296 | agent.currentPos = profile.HomeLocation; | 296 | agent.currentPos = profile.homeLocation; |
297 | 297 | ||
298 | // If user specified additional start, use that | 298 | // If user specified additional start, use that |
299 | if (requestData.ContainsKey("start")) | 299 | if (requestData.ContainsKey("start")) |
@@ -326,7 +326,7 @@ namespace OpenSim.Framework.UserManagement | |||
326 | agent.regionID = new LLUUID(); // Fill in later | 326 | agent.regionID = new LLUUID(); // Fill in later |
327 | agent.currentRegion = new LLUUID(); // Fill in later | 327 | agent.currentRegion = new LLUUID(); // Fill in later |
328 | 328 | ||
329 | profile.CurrentAgent = agent; | 329 | profile.currentAgent = agent; |
330 | } | 330 | } |
331 | 331 | ||
332 | /// <summary> | 332 | /// <summary> |
@@ -349,16 +349,16 @@ namespace OpenSim.Framework.UserManagement | |||
349 | public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) | 349 | public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) |
350 | { | 350 | { |
351 | UserProfileData user = new UserProfileData(); | 351 | UserProfileData user = new UserProfileData(); |
352 | user.HomeLocation = new LLVector3(128, 128, 100); | 352 | user.homeLocation = new LLVector3(128, 128, 100); |
353 | user.UUID = LLUUID.Random(); | 353 | user.UUID = LLUUID.Random(); |
354 | user.Firstname = firstName; | 354 | user.username = firstName; |
355 | user.Lastname = lastName; | 355 | user.surname = lastName; |
356 | user.PasswordHash = pass; | 356 | user.passwordHash = pass; |
357 | user.PasswordSalt = ""; | 357 | user.passwordSalt = ""; |
358 | user.Created = Util.UnixTimeSinceEpoch(); | 358 | user.created = Util.UnixTimeSinceEpoch(); |
359 | user.HomeLookAt = new LLVector3(100, 100, 100); | 359 | user.homeLookAt = new LLVector3(100, 100, 100); |
360 | user.HomeRegionX = regX; | 360 | user.homeRegionX = regX; |
361 | user.HomeRegionY = regY; | 361 | user.homeRegionY = regY; |
362 | 362 | ||
363 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 363 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
364 | { | 364 | { |