OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

0.1-prestable
MW 2007-04-11 09:29:06 +00:00
parent 950389a263
commit 435d61661b
2 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim.Framework/UserProfileManager.cs
View File

@ -90,8 +90,10 @@ namespace OpenSim.Framework.User
LLUUID AgentID = TheUser.UUID; LLUUID AgentID = TheUser.UUID;
TheUser.InitSessionData(); TheUser.InitSessionData();
SimProfile SimInfo = new SimProfile();
SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey); //for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method)
//SimProfile SimInfo = new SimProfile();
//SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
Hashtable GlobalT = new Hashtable(); Hashtable GlobalT = new Hashtable();
@ -146,7 +148,7 @@ namespace OpenSim.Framework.User
InitialOutfit.Add(InitialOutfitHash); InitialOutfit.Add(InitialOutfitHash);
uint circode = (uint)(Util.RandomClass.Next()); uint circode = (uint)(Util.RandomClass.Next());
TheUser.AddSimCircuit(circode, SimInfo.UUID); //TheUser.AddSimCircuit(circode, SimInfo.UUID);
responseData["last_name"] = TheUser.lastname; responseData["last_name"] = TheUser.lastname;
responseData["ui-config"] = ui_config; responseData["ui-config"] = ui_config;

5
OpenSim.RegionServer/RegionInfo.cs
View File

@ -41,6 +41,8 @@ namespace OpenSim
public void SaveToGrid() public void SaveToGrid()
{ {
//we really want to keep any server connection code out of here and out of the code code
// and put it in the server connection classes (those inheriting from IGridServer etc)
string reqtext; string reqtext;
reqtext = "<authkey>" + this.GridSendKey + "</authkey>"; reqtext = "<authkey>" + this.GridSendKey + "</authkey>";
reqtext += "<sim>"; reqtext += "<sim>";
@ -197,7 +199,10 @@ namespace OpenSim
} }
this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256)); this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
if (!this.isSandbox)
{
this.SaveToGrid(); this.SaveToGrid();
}
configData.Commit(); configData.Commit();
} }
catch (Exception e) catch (Exception e)