From a9dde515ba7d35b6069a3b2cd8b66bb72b007801 Mon Sep 17 00:00:00 2001
From: MW
Date: Fri, 22 Jun 2007 18:28:49 +0000
Subject: SandBox mode login now shares a base class with the grid mode user
 server. To allow people to login without creating accounts first in sandbox
 mode anytime a login request is received without a matching account already
 being in the database, a new account will be made. (also in sandbox mode,
 passwords aren't currently used).

---
 .../OpenSim.Framework/Types/NetworkServersInfo.cs  | 35 ++++++++++++++++++++--
 Common/OpenSim.Framework/Types/PrimData.cs         |  1 -
 2 files changed, 33 insertions(+), 3 deletions(-)

(limited to 'Common/OpenSim.Framework')

diff --git a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs b/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
index 0cf0ea6..709b7dd 100644
--- a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
+++ b/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
@@ -45,16 +45,47 @@ namespace OpenSim.Framework.Types
         public string UserRecvKey = "";
         public bool isSandbox;
 
+        public uint DefaultHomeLocX = 0;
+        public uint DefaultHomeLocY = 0;
+
         public void InitConfig(bool sandboxMode, IGenericConfig configData)
         {
             this.isSandbox = sandboxMode;
 
             try
             {
+                string attri = "";
+                // default home location X
+                attri = "";
+                attri = configData.GetAttribute("DefaultLocationX");
+                if (attri == "")
+                {
+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location X", "1000");
+                    configData.SetAttribute("DefaultLocationX", location);
+                    this.DefaultHomeLocX = (uint)Convert.ToUInt32(location);
+                }
+                else
+                {
+                    this.DefaultHomeLocX = (uint)Convert.ToUInt32(attri);
+                }
+
+                // default home location Y
+                attri = "";
+                attri = configData.GetAttribute("DefaultLocationY");
+                if (attri == "")
+                {
+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location Y", "1000");
+                    configData.SetAttribute("DefaultLocationY", location);
+                    this.DefaultHomeLocY = (uint)Convert.ToUInt32(location);
+                }
+                else
+                {
+                    this.DefaultHomeLocY = (uint)Convert.ToUInt32(attri);
+                }
+
                 if (!isSandbox)
                 {
-                    string attri = "";
-                    //Grid Server URL
+                    //Grid Server 
                     attri = "";
                     attri = configData.GetAttribute("GridServerURL");
                     if (attri == "")
diff --git a/Common/OpenSim.Framework/Types/PrimData.cs b/Common/OpenSim.Framework/Types/PrimData.cs
index 836b8fb..56d41b3 100644
--- a/Common/OpenSim.Framework/Types/PrimData.cs
+++ b/Common/OpenSim.Framework/Types/PrimData.cs
@@ -60,7 +60,6 @@ namespace OpenSim.Framework.Types
         public sbyte PathTwistBegin;
         public byte[] Texture;
 
-
         public Int32 CreationDate;
         public uint OwnerMask = FULL_MASK_PERMISSIONS;
         public uint NextOwnerMask = FULL_MASK_PERMISSIONS;
-- 
cgit v1.1