aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorAdam Frisby2007-07-14 22:35:47 +0000
committerAdam Frisby2007-07-14 22:35:47 +0000
commit2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e (patch)
tree0855803d694abaad00b87c3ab7766dd16dff69ee /OpenSim/Region
parent* libterrain now builds again (diff)
downloadopensim-SC_OLD-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.zip
opensim-SC_OLD-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.tar.gz
opensim-SC_OLD-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.tar.bz2
opensim-SC_OLD-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.tar.xz
* Excelsior!
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs7
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs2
2 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 4384906..acf09eb 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -229,9 +229,16 @@ namespace OpenSim
229 UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword); 229 UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword);
230 if (masterAvatar != null) 230 if (masterAvatar != null)
231 { 231 {
232 m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]");
232 LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; 233 LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
233 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager); 234 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager);
234 } 235 }
236 else
237 {
238 m_log.Notice("Parcels - No master avatar found, using null.");
239 LocalWorld.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero;
240 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager);
241 }
235 242
236 LocalWorld.StartTimer(); 243 LocalWorld.StartTimer();
237 } 244 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index d32976f..2a73538 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -265,6 +265,8 @@ namespace OpenSim.Region.Communications.OGS1
265 agentData.lastname = (string)requestData["lastname"]; 265 agentData.lastname = (string)requestData["lastname"];
266 agentData.AgentID = new LLUUID((string)requestData["agent_id"]); 266 agentData.AgentID = new LLUUID((string)requestData["agent_id"]);
267 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); 267 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
268 agentData.CapsPath = (string)requestData["caps_path"];
269
268 if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1")) 270 if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
269 { 271 {
270 agentData.child = true; 272 agentData.child = true;