diff options
author | gareth | 2007-03-18 20:18:52 +0000 |
---|---|---|
committer | gareth | 2007-03-18 20:18:52 +0000 |
commit | 99c56acf746516068562fd42ab286668413894e8 (patch) | |
tree | 6bd5141f0db0cf44d8fbaf4855f65fe3de414695 /src/Config | |
parent | Added neighbourinfo class (diff) | |
download | opensim-SC_OLD-99c56acf746516068562fd42ab286668413894e8.zip opensim-SC_OLD-99c56acf746516068562fd42ab286668413894e8.tar.gz opensim-SC_OLD-99c56acf746516068562fd42ab286668413894e8.tar.bz2 opensim-SC_OLD-99c56acf746516068562fd42ab286668413894e8.tar.xz |
Added some sanity
Diffstat (limited to '')
-rw-r--r-- | src/Config.cs | 7 | ||||
-rw-r--r-- | src/Config/SimConfig/AssemblyInfo.cs | 42 | ||||
-rw-r--r-- | src/Config/SimConfig/Db4SimConfig.cs | 6 |
3 files changed, 32 insertions, 23 deletions
diff --git a/src/Config.cs b/src/Config.cs index c7cd3cd..1c0a6cc 100644 --- a/src/Config.cs +++ b/src/Config.cs | |||
@@ -59,7 +59,12 @@ namespace OpenSim | |||
59 | 59 | ||
60 | public string GridURL; | 60 | public string GridURL; |
61 | public string GridSendKey; | 61 | public string GridSendKey; |
62 | 62 | public string GridRecvKey; | |
63 | public string UserURL; | ||
64 | public string UserSendKey; | ||
65 | public string UserRecvKey; | ||
66 | |||
67 | |||
63 | public abstract void InitConfig(); | 68 | public abstract void InitConfig(); |
64 | public abstract void LoadFromGrid(); | 69 | public abstract void LoadFromGrid(); |
65 | public abstract World LoadWorld(); | 70 | public abstract World LoadWorld(); |
diff --git a/src/Config/SimConfig/AssemblyInfo.cs b/src/Config/SimConfig/AssemblyInfo.cs index f808f4c..c97d673 100644 --- a/src/Config/SimConfig/AssemblyInfo.cs +++ b/src/Config/SimConfig/AssemblyInfo.cs | |||
@@ -1,21 +1,21 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Reflection; | 2 | using System.Reflection; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | //------------------------------------------------------------------------------ | 5 | // ------------------------------------------------------------------------------ |
6 | // <auto-generated> | 6 | // <autogenerated> |
7 | // This code was generated by a tool. | 7 | // This code was generated by a tool. |
8 | // Runtime Version:2.0.50727.42 | 8 | // Mono Runtime Version: 2.0.50727.42 |
9 | // | 9 | // |
10 | // Changes to this file may cause incorrect behavior and will be lost if | 10 | // Changes to this file may cause incorrect behavior and will be lost if |
11 | // the code is regenerated. | 11 | // the code is regenerated. |
12 | // </auto-generated> | 12 | // </autogenerated> |
13 | //------------------------------------------------------------------------------ | 13 | // ------------------------------------------------------------------------------ |
14 | 14 | ||
15 | [assembly: ComVisibleAttribute(false)] | 15 | [assembly: ComVisibleAttribute(false)] |
16 | [assembly: CLSCompliantAttribute(false)] | 16 | [assembly: CLSCompliantAttribute(false)] |
17 | [assembly: AssemblyVersionAttribute("0.0.0.1")] | 17 | [assembly: AssemblyVersionAttribute("0.1.*.236")] |
18 | [assembly: AssemblyTitleAttribute("opensim-simconfig")] | 18 | [assembly: AssemblyTitleAttribute("opensim-simconfig")] |
19 | [assembly: AssemblyDescriptionAttribute("The default configuration handler")] | 19 | [assembly: AssemblyDescriptionAttribute("The default configuration handler")] |
20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] | 20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] |
21 | 21 | ||
diff --git a/src/Config/SimConfig/Db4SimConfig.cs b/src/Config/SimConfig/Db4SimConfig.cs index fc2c019..1b696fe 100644 --- a/src/Config/SimConfig/Db4SimConfig.cs +++ b/src/Config/SimConfig/Db4SimConfig.cs | |||
@@ -59,7 +59,11 @@ namespace Db40SimConfig | |||
59 | this.AssetURL=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server URL: "); | 59 | this.AssetURL=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server URL: "); |
60 | this.AssetSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server key: "); | 60 | this.AssetSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server key: "); |
61 | this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid server URL: "); | 61 | this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid server URL: "); |
62 | this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Grid server key: "); | 62 | this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid server: "); |
63 | this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid server: "); | ||
64 | this.UserURL=ServerConsole.MainConsole.Instance.CmdPrompt("User server URL: "); | ||
65 | this.UserSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to user server: "); | ||
66 | this.UserRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from user server: "); | ||
63 | } | 67 | } |
64 | this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256)); | 68 | this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256)); |
65 | } | 69 | } |