From 2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sat, 14 Jul 2007 22:35:47 +0000
Subject: * Excelsior!

---
 OpenSim/Region/Application/OpenSimMain.cs              | 7 +++++++
 OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 2 ++
 2 files changed, 9 insertions(+)

(limited to 'OpenSim/Region')

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
                 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();
             }
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
             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;
-- 
cgit v1.1