diff options
author | mingchen | 2007-06-09 00:47:02 +0000 |
---|---|---|
committer | mingchen | 2007-06-09 00:47:02 +0000 |
commit | 09dac6b558f33c91325bd70ae5689e76cabffd2a (patch) | |
tree | c7086f0f7eaed65bea86e283416c8308ea11742e /Common/OpenSim.Framework | |
parent | * Removed ServiceManager from OGS/Sugilite due to compilation issues. (diff) | |
download | opensim-SC_OLD-09dac6b558f33c91325bd70ae5689e76cabffd2a.zip opensim-SC_OLD-09dac6b558f33c91325bd70ae5689e76cabffd2a.tar.gz opensim-SC_OLD-09dac6b558f33c91325bd70ae5689e76cabffd2a.tar.bz2 opensim-SC_OLD-09dac6b558f33c91325bd70ae5689e76cabffd2a.tar.xz |
*Adding configuration settings for master avatars
*Sandbox mode password is there, but should I store this in config and ask every time?
Diffstat (limited to '')
-rw-r--r-- | Common/OpenSim.Framework/Types/RegionInfo.cs | 44 |
1 files changed, 43 insertions, 1 deletions
diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/Common/OpenSim.Framework/Types/RegionInfo.cs index 6b835cb..47e208e 100644 --- a/Common/OpenSim.Framework/Types/RegionInfo.cs +++ b/Common/OpenSim.Framework/Types/RegionInfo.cs | |||
@@ -22,6 +22,7 @@ namespace OpenSim.Framework.Types | |||
22 | public LLUUID MasterAvatarAssignedUUID = new LLUUID(); | 22 | public LLUUID MasterAvatarAssignedUUID = new LLUUID(); |
23 | public string MasterAvatarFirstName = ""; | 23 | public string MasterAvatarFirstName = ""; |
24 | public string MasterAvatarLastName = ""; | 24 | public string MasterAvatarLastName = ""; |
25 | public string MasterAvatarSandboxPassword = ""; | ||
25 | 26 | ||
26 | public int IPListenPort = 0; | 27 | public int IPListenPort = 0; |
27 | public string IPListenAddr = ""; | 28 | public string IPListenAddr = ""; |
@@ -150,8 +151,49 @@ namespace OpenSim.Framework.Types | |||
150 | this.IPListenAddr = attri; | 151 | this.IPListenAddr = attri; |
151 | } | 152 | } |
152 | } | 153 | } |
154 | attri = ""; | ||
155 | attri = configData.GetAttribute("MasterAvatarFirstName"); | ||
156 | if (attri == "") | ||
157 | { | ||
158 | this.MasterAvatarFirstName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test"); | ||
159 | |||
160 | configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName); | ||
161 | } | ||
162 | else | ||
163 | { | ||
164 | this.MasterAvatarFirstName = attri; | ||
165 | } | ||
166 | |||
167 | attri = ""; | ||
168 | attri = configData.GetAttribute("MasterAvatarLastName"); | ||
169 | if (attri == "") | ||
170 | { | ||
171 | this.MasterAvatarLastName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User"); | ||
172 | |||
173 | configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName); | ||
174 | } | ||
175 | else | ||
176 | { | ||
177 | this.MasterAvatarLastName = attri; | ||
178 | } | ||
179 | |||
180 | if (isSandbox) //Sandbox Mode Specific Settings | ||
181 | { | ||
182 | attri = ""; | ||
183 | attri = configData.GetAttribute("MasterAvatarSandboxPassword"); | ||
184 | if (attri == "") | ||
185 | { | ||
186 | this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test"); | ||
187 | |||
188 | //Should I store this? | ||
189 | configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword); | ||
190 | } | ||
191 | else | ||
192 | { | ||
193 | this.MasterAvatarSandboxPassword = attri; | ||
194 | } | ||
195 | } | ||
153 | 196 | ||
154 | |||
155 | this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256)); | 197 | this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256)); |
156 | 198 | ||
157 | configData.Commit(); | 199 | configData.Commit(); |