diff options
author | MW | 2007-06-22 18:28:49 +0000 |
---|---|---|
committer | MW | 2007-06-22 18:28:49 +0000 |
commit | a9dde515ba7d35b6069a3b2cd8b66bb72b007801 (patch) | |
tree | 5c219b4f52c2a58d0ac507b90556afc2a6848f94 /Common/OpenSim.Servers/LoginServer.cs | |
parent | * Porting console fix from Trunk to Sugilite (diff) | |
download | opensim-SC_OLD-a9dde515ba7d35b6069a3b2cd8b66bb72b007801.zip opensim-SC_OLD-a9dde515ba7d35b6069a3b2cd8b66bb72b007801.tar.gz opensim-SC_OLD-a9dde515ba7d35b6069a3b2cd8b66bb72b007801.tar.bz2 opensim-SC_OLD-a9dde515ba7d35b6069a3b2cd8b66bb72b007801.tar.xz |
SandBox mode login now shares a base class with the grid mode user server.
To allow people to login without creating accounts first in sandbox mode anytime a login request is received without a matching account already being in the database, a new account will be made. (also in sandbox mode, passwords aren't currently used).
Diffstat (limited to '')
-rw-r--r-- | Common/OpenSim.Servers/LoginServer.cs | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/Common/OpenSim.Servers/LoginServer.cs b/Common/OpenSim.Servers/LoginServer.cs index 1243147..e5373dd 100644 --- a/Common/OpenSim.Servers/LoginServer.cs +++ b/Common/OpenSim.Servers/LoginServer.cs | |||
@@ -148,36 +148,14 @@ namespace OpenSim.UserServer | |||
148 | 148 | ||
149 | NumClients++; | 149 | NumClients++; |
150 | 150 | ||
151 | // Create a agent and session LLUUID | ||
152 | // Agent = GetAgentId(first, last); | ||
153 | // int SessionRand = Util.RandomClass.Next(1, 999); | ||
154 | // Session = new LLUUID("aaaabbbb-0200-" + SessionRand.ToString("0000") + "-8664-58f53e442797"); | ||
155 | // LLUUID secureSess = LLUUID.Random(); | ||
156 | |||
157 | loginResponse.SimPort = m_simPort.ToString(); | 151 | loginResponse.SimPort = m_simPort.ToString(); |
158 | loginResponse.SimAddress = m_simAddr.ToString(); | 152 | loginResponse.SimAddress = m_simAddr.ToString(); |
159 | // loginResponse.AgentID = Agent.ToStringHyphenated(); | 153 | |
160 | // loginResponse.SessionID = Session.ToStringHyphenated(); | ||
161 | // loginResponse.SecureSessionID = secureSess.ToStringHyphenated(); | ||
162 | loginResponse.CircuitCode = (Int32)(Util.RandomClass.Next()); | 154 | loginResponse.CircuitCode = (Int32)(Util.RandomClass.Next()); |
163 | XmlRpcResponse response = loginResponse.ToXmlRpcResponse(); | 155 | XmlRpcResponse response = loginResponse.ToXmlRpcResponse(); |
164 | Hashtable responseData = (Hashtable)response.Value; | 156 | Hashtable responseData = (Hashtable)response.Value; |
165 | 157 | ||
166 | //inventory | 158 | |
167 | /* ArrayList InventoryList = (ArrayList)responseData["inventory-skeleton"]; | ||
168 | Hashtable Inventory1 = (Hashtable)InventoryList[0]; | ||
169 | Hashtable Inventory2 = (Hashtable)InventoryList[1]; | ||
170 | LLUUID BaseFolderID = LLUUID.Random(); | ||
171 | LLUUID InventoryFolderID = LLUUID.Random(); | ||
172 | Inventory2["name"] = "Textures"; | ||
173 | Inventory2["folder_id"] = BaseFolderID.ToStringHyphenated(); | ||
174 | Inventory2["type_default"] = 0; | ||
175 | Inventory1["folder_id"] = InventoryFolderID.ToStringHyphenated(); | ||
176 | |||
177 | ArrayList InventoryRoot = (ArrayList)responseData["inventory-root"]; | ||
178 | Hashtable Inventoryroot = (Hashtable)InventoryRoot[0]; | ||
179 | Inventoryroot["folder_id"] = InventoryFolderID.ToStringHyphenated(); | ||
180 | */ | ||
181 | CustomiseLoginResponse(responseData, first, last); | 159 | CustomiseLoginResponse(responseData, first, last); |
182 | 160 | ||
183 | Login _login = new Login(); | 161 | Login _login = new Login(); |
@@ -191,11 +169,6 @@ namespace OpenSim.UserServer | |||
191 | _login.BaseFolder = loginResponse.BaseFolderID; | 169 | _login.BaseFolder = loginResponse.BaseFolderID; |
192 | _login.InventoryFolder = loginResponse.InventoryFolderID; | 170 | _login.InventoryFolder = loginResponse.InventoryFolderID; |
193 | 171 | ||
194 | //working on local computer if so lets add to the gridserver's list of sessions? | ||
195 | /* if (m_gridServer.GetName() == "Local") | ||
196 | { | ||
197 | ((LocalGridBase)m_gridServer).AddNewSession(_login); | ||
198 | }*/ | ||
199 | ulong reghand = Helpers.UIntsToLong((regionX * 256), (regionY * 256)); | 172 | ulong reghand = Helpers.UIntsToLong((regionX * 256), (regionY * 256)); |
200 | AddSession(reghand,_login); | 173 | AddSession(reghand,_login); |
201 | 174 | ||