diff options
author | gareth | 2007-04-11 08:51:39 +0000 |
---|---|---|
committer | gareth | 2007-04-11 08:51:39 +0000 |
commit | 950389a2633034fa8ff93dfa97dc14db46d40efc (patch) | |
tree | dc3b3b79cf90c40eb06be9bfff5cad7f366b6de5 /OpenSim.Framework/UserProfileManager.cs | |
parent | * nant building again (diff) | |
download | opensim-SC_OLD-950389a2633034fa8ff93dfa97dc14db46d40efc.zip opensim-SC_OLD-950389a2633034fa8ff93dfa97dc14db46d40efc.tar.gz opensim-SC_OLD-950389a2633034fa8ff93dfa97dc14db46d40efc.tar.bz2 opensim-SC_OLD-950389a2633034fa8ff93dfa97dc14db46d40efc.tar.xz |
Added POST handler for /sims/ in the grid server
Removed asset/user config in grid mode in the region server
Added "create user" command in the user server console
Begun buggy code to send sim details to the grid at startup
Drank whole pack of red bull in one night and made stupid jokes in SVN logs and C# comments
Diffstat (limited to '')
-rw-r--r-- | OpenSim.Framework/UserProfileManager.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs index d474834..38ca5df 100644 --- a/OpenSim.Framework/UserProfileManager.cs +++ b/OpenSim.Framework/UserProfileManager.cs | |||
@@ -90,8 +90,8 @@ namespace OpenSim.Framework.User | |||
90 | 90 | ||
91 | LLUUID AgentID = TheUser.UUID; | 91 | LLUUID AgentID = TheUser.UUID; |
92 | TheUser.InitSessionData(); | 92 | TheUser.InitSessionData(); |
93 | // SimProfile SimInfo = new SimProfile(); | 93 | SimProfile SimInfo = new SimProfile(); |
94 | // SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey); | 94 | SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey); |
95 | 95 | ||
96 | 96 | ||
97 | Hashtable GlobalT = new Hashtable(); | 97 | Hashtable GlobalT = new Hashtable(); |
@@ -146,7 +146,7 @@ namespace OpenSim.Framework.User | |||
146 | InitialOutfit.Add(InitialOutfitHash); | 146 | InitialOutfit.Add(InitialOutfitHash); |
147 | 147 | ||
148 | uint circode = (uint)(Util.RandomClass.Next()); | 148 | uint circode = (uint)(Util.RandomClass.Next()); |
149 | //TheUser.AddSimCircuit(circode, SimInfo.UUID); | 149 | TheUser.AddSimCircuit(circode, SimInfo.UUID); |
150 | 150 | ||
151 | responseData["last_name"] = TheUser.lastname; | 151 | responseData["last_name"] = TheUser.lastname; |
152 | responseData["ui-config"] = ui_config; | 152 | responseData["ui-config"] = ui_config; |
@@ -181,7 +181,7 @@ namespace OpenSim.Framework.User | |||
181 | 181 | ||
182 | this.CustomiseResponse(ref responseData, TheUser); | 182 | this.CustomiseResponse(ref responseData, TheUser); |
183 | response.Value = responseData; | 183 | response.Value = responseData; |
184 | //TheUser.SendDataToSim(SimInfo); | 184 | // TheUser.SendDataToSim(SimInfo); |
185 | 185 | ||
186 | 186 | ||
187 | 187 | ||