ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Excelsior!

Browse Source
This commit is contained in:
Adam Frisby
2007-07-14 22:35:47 +00:00
parent a04f968f8c
commit 2ccb8f7118
5 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Application/OpenSimMain.cs
View File

@@ -229,9 +229,16 @@ namespace OpenSim
UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword);
if (masterAvatar != null)
{
m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]");
LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager);
}
else
{
m_log.Notice("Parcels - No master avatar found, using null.");
LocalWorld.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero;
LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager);
}
LocalWorld.StartTimer();
}

2
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@@ -265,6 +265,8 @@ namespace OpenSim.Region.Communications.OGS1
agentData.lastname = (string)requestData["lastname"];
agentData.AgentID = new LLUUID((string)requestData["agent_id"]);
agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
agentData.CapsPath = (string)requestData["caps_path"];
if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
{
agentData.child = true;