diff options
author | MW | 2007-06-22 18:28:49 +0000 |
---|---|---|
committer | MW | 2007-06-22 18:28:49 +0000 |
commit | a9dde515ba7d35b6069a3b2cd8b66bb72b007801 (patch) | |
tree | 5c219b4f52c2a58d0ac507b90556afc2a6848f94 /Common/OpenSim.Framework/Types | |
parent | * Porting console fix from Trunk to Sugilite (diff) | |
download | opensim-SC_OLD-a9dde515ba7d35b6069a3b2cd8b66bb72b007801.zip opensim-SC_OLD-a9dde515ba7d35b6069a3b2cd8b66bb72b007801.tar.gz opensim-SC_OLD-a9dde515ba7d35b6069a3b2cd8b66bb72b007801.tar.bz2 opensim-SC_OLD-a9dde515ba7d35b6069a3b2cd8b66bb72b007801.tar.xz |
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).
Diffstat (limited to 'Common/OpenSim.Framework/Types')
-rw-r--r-- | Common/OpenSim.Framework/Types/NetworkServersInfo.cs | 35 | ||||
-rw-r--r-- | Common/OpenSim.Framework/Types/PrimData.cs | 1 |
2 files changed, 33 insertions, 3 deletions
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 | |||
45 | public string UserRecvKey = ""; | 45 | public string UserRecvKey = ""; |
46 | public bool isSandbox; | 46 | public bool isSandbox; |
47 | 47 | ||
48 | public uint DefaultHomeLocX = 0; | ||
49 | public uint DefaultHomeLocY = 0; | ||
50 | |||
48 | public void InitConfig(bool sandboxMode, IGenericConfig configData) | 51 | public void InitConfig(bool sandboxMode, IGenericConfig configData) |
49 | { | 52 | { |
50 | this.isSandbox = sandboxMode; | 53 | this.isSandbox = sandboxMode; |
51 | 54 | ||
52 | try | 55 | try |
53 | { | 56 | { |
57 | string attri = ""; | ||
58 | // default home location X | ||
59 | attri = ""; | ||
60 | attri = configData.GetAttribute("DefaultLocationX"); | ||
61 | if (attri == "") | ||
62 | { | ||
63 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location X", "1000"); | ||
64 | configData.SetAttribute("DefaultLocationX", location); | ||
65 | this.DefaultHomeLocX = (uint)Convert.ToUInt32(location); | ||
66 | } | ||
67 | else | ||
68 | { | ||
69 | this.DefaultHomeLocX = (uint)Convert.ToUInt32(attri); | ||
70 | } | ||
71 | |||
72 | // default home location Y | ||
73 | attri = ""; | ||
74 | attri = configData.GetAttribute("DefaultLocationY"); | ||
75 | if (attri == "") | ||
76 | { | ||
77 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location Y", "1000"); | ||
78 | configData.SetAttribute("DefaultLocationY", location); | ||
79 | this.DefaultHomeLocY = (uint)Convert.ToUInt32(location); | ||
80 | } | ||
81 | else | ||
82 | { | ||
83 | this.DefaultHomeLocY = (uint)Convert.ToUInt32(attri); | ||
84 | } | ||
85 | |||
54 | if (!isSandbox) | 86 | if (!isSandbox) |
55 | { | 87 | { |
56 | string attri = ""; | 88 | //Grid Server |
57 | //Grid Server URL | ||
58 | attri = ""; | 89 | attri = ""; |
59 | attri = configData.GetAttribute("GridServerURL"); | 90 | attri = configData.GetAttribute("GridServerURL"); |
60 | if (attri == "") | 91 | 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 | |||
60 | public sbyte PathTwistBegin; | 60 | public sbyte PathTwistBegin; |
61 | public byte[] Texture; | 61 | public byte[] Texture; |
62 | 62 | ||
63 | |||
64 | public Int32 CreationDate; | 63 | public Int32 CreationDate; |
65 | public uint OwnerMask = FULL_MASK_PERMISSIONS; | 64 | public uint OwnerMask = FULL_MASK_PERMISSIONS; |
66 | public uint NextOwnerMask = FULL_MASK_PERMISSIONS; | 65 | public uint NextOwnerMask = FULL_MASK_PERMISSIONS; |