diff options
author | MW | 2007-04-25 13:03:48 +0000 |
---|---|---|
committer | MW | 2007-04-25 13:03:48 +0000 |
commit | f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0 (patch) | |
tree | b9f8f1dac346906f1333aa3fc8da704466eda005 /OpenSim.Framework/UserProfileManager.cs | |
parent | * Added try{}catch{} to RunTerrainCmd (diff) | |
download | opensim-SC-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.zip opensim-SC-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.gz opensim-SC-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.bz2 opensim-SC-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.xz |
Small clean up of files and directories
Diffstat (limited to '')
-rw-r--r-- | OpenSim.Framework/UserProfileManager.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs index 33f2abd..eb8b7cd 100644 --- a/OpenSim.Framework/UserProfileManager.cs +++ b/OpenSim.Framework/UserProfileManager.cs | |||
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.User | |||
106 | 106 | ||
107 | LLUUID AgentID = TheUser.UUID; | 107 | LLUUID AgentID = TheUser.UUID; |
108 | TheUser.InitSessionData(); | 108 | TheUser.InitSessionData(); |
109 | 109 | ||
110 | //for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method) | 110 | //for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method) |
111 | //SimProfile SimInfo = new SimProfile(); | 111 | //SimProfile SimInfo = new SimProfile(); |
112 | //SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey); | 112 | //SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey); |
@@ -140,7 +140,7 @@ namespace OpenSim.Framework.User | |||
140 | 140 | ||
141 | ArrayList AgentInventory = new ArrayList(); | 141 | ArrayList AgentInventory = new ArrayList(); |
142 | Console.WriteLine("adding inventory to response"); | 142 | Console.WriteLine("adding inventory to response"); |
143 | Hashtable TempHash; | 143 | Hashtable TempHash; |
144 | foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values) | 144 | foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values) |
145 | { | 145 | { |
146 | TempHash = new Hashtable(); | 146 | TempHash = new Hashtable(); |
@@ -200,7 +200,7 @@ namespace OpenSim.Framework.User | |||
200 | 200 | ||
201 | this.CustomiseResponse(ref responseData, TheUser); | 201 | this.CustomiseResponse(ref responseData, TheUser); |
202 | response.Value = responseData; | 202 | response.Value = responseData; |
203 | // TheUser.SendDataToSim(SimInfo); | 203 | // TheUser.SendDataToSim(SimInfo); |
204 | return response; | 204 | return response; |
205 | 205 | ||
206 | } | 206 | } |
@@ -211,7 +211,7 @@ namespace OpenSim.Framework.User | |||
211 | //} | 211 | //} |
212 | } | 212 | } |
213 | return response; | 213 | return response; |
214 | 214 | ||
215 | } | 215 | } |
216 | 216 | ||
217 | private static XmlRpcResponse CreateErrorConnectingToGridResponse() | 217 | private static XmlRpcResponse CreateErrorConnectingToGridResponse() |
@@ -258,9 +258,9 @@ namespace OpenSim.Framework.User | |||
258 | SimParams["firstname"] = theUser.firstname; | 258 | SimParams["firstname"] = theUser.firstname; |
259 | SimParams["lastname"] = theUser.lastname; | 259 | SimParams["lastname"] = theUser.lastname; |
260 | SimParams["agent_id"] = theUser.UUID.ToString(); | 260 | SimParams["agent_id"] = theUser.UUID.ToString(); |
261 | SimParams["circuit_code"] = (Int32)circode; | 261 | SimParams["circuit_code"] = (Int32)circode; |
262 | SimParams["startpos_x"] = theUser.homepos.X.ToString(); | 262 | SimParams["startpos_x"] = theUser.homepos.X.ToString(); |
263 | SimParams["startpos_y"] = theUser.homepos.Y.ToString(); | 263 | SimParams["startpos_y"] = theUser.homepos.Y.ToString(); |
264 | SimParams["startpos_z"] = theUser.homepos.Z.ToString(); | 264 | SimParams["startpos_z"] = theUser.homepos.Z.ToString(); |
265 | ArrayList SendParams = new ArrayList(); | 265 | ArrayList SendParams = new ArrayList(); |
266 | SendParams.Add(SimParams); | 266 | SendParams.Add(SimParams); |