diff options
Diffstat (limited to 'OpenSim/Framework/GridConfig.cs')
-rw-r--r-- | OpenSim/Framework/GridConfig.cs | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs index 7ccd0c4..f0cf91f 100644 --- a/OpenSim/Framework/GridConfig.cs +++ b/OpenSim/Framework/GridConfig.cs | |||
@@ -31,27 +31,22 @@ namespace OpenSim.Framework | |||
31 | { | 31 | { |
32 | public class GridConfig | 32 | public class GridConfig |
33 | { | 33 | { |
34 | public string GridOwner = String.Empty; | ||
35 | public string DefaultAssetServer = String.Empty; | ||
36 | public string AssetSendKey = String.Empty; | ||
37 | public string AssetRecvKey = String.Empty; | ||
38 | |||
39 | public string DefaultUserServer = String.Empty; | ||
40 | public string UserSendKey = String.Empty; | ||
41 | public string UserRecvKey = String.Empty; | ||
42 | |||
43 | public string SimSendKey = String.Empty; | ||
44 | public string SimRecvKey = String.Empty; | ||
45 | |||
46 | public string DatabaseProvider = String.Empty; | ||
47 | |||
48 | |||
49 | public static uint DefaultHttpPort = 8001; | 34 | public static uint DefaultHttpPort = 8001; |
50 | public uint HttpPort = DefaultHttpPort; | ||
51 | 35 | ||
52 | public string AllowForcefulBanlines = "TRUE"; | 36 | public string AllowForcefulBanlines = "TRUE"; |
37 | public string AssetRecvKey = String.Empty; | ||
38 | public string AssetSendKey = String.Empty; | ||
53 | 39 | ||
54 | private ConfigurationMember configMember; | 40 | private ConfigurationMember configMember; |
41 | public string DatabaseProvider = String.Empty; | ||
42 | public string DefaultAssetServer = String.Empty; | ||
43 | public string DefaultUserServer = String.Empty; | ||
44 | public string GridOwner = String.Empty; | ||
45 | public uint HttpPort = DefaultHttpPort; | ||
46 | public string SimRecvKey = String.Empty; | ||
47 | public string SimSendKey = String.Empty; | ||
48 | public string UserRecvKey = String.Empty; | ||
49 | public string UserSendKey = String.Empty; | ||
55 | 50 | ||
56 | public GridConfig(string description, string filename) | 51 | public GridConfig(string description, string filename) |
57 | { | 52 | { |
@@ -144,4 +139,4 @@ namespace OpenSim.Framework | |||
144 | return true; | 139 | return true; |
145 | } | 140 | } |
146 | } | 141 | } |
147 | } | 142 | } \ No newline at end of file |