diff options
author | Sean Dague | 2007-07-30 20:11:40 +0000 |
---|---|---|
committer | Sean Dague | 2007-07-30 20:11:40 +0000 |
commit | 74bb5282a09ec095a7ff810c62f79cc64e187686 (patch) | |
tree | e0a9b703bfcbbab59b04351dd71508fa913e741a /OpenSim/Framework/General | |
parent | added OnDisconnectUser event to required classes (diff) | |
download | opensim-SC-74bb5282a09ec095a7ff810c62f79cc64e187686.zip opensim-SC-74bb5282a09ec095a7ff810c62f79cc64e187686.tar.gz opensim-SC-74bb5282a09ec095a7ff810c62f79cc64e187686.tar.bz2 opensim-SC-74bb5282a09ec095a7ff810c62f79cc64e187686.tar.xz |
mass update of files to have native line endings
Diffstat (limited to 'OpenSim/Framework/General')
6 files changed, 722 insertions, 722 deletions
diff --git a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs index b8dfc0c..eb5465f 100644 --- a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs +++ b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs | |||
@@ -1,379 +1,379 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Reflection; | 2 | using System.Reflection; |
3 | using System.Collections; | 3 | using System.Collections; |
4 | using System.Collections.Generic; | 4 | using System.Collections.Generic; |
5 | using System.Text; | 5 | using System.Text; |
6 | using System.Net; | 6 | using System.Net; |
7 | 7 | ||
8 | using libsecondlife; | 8 | using libsecondlife; |
9 | 9 | ||
10 | using OpenSim.Framework.Console; | 10 | using OpenSim.Framework.Console; |
11 | using OpenSim.Framework.Configuration.Interfaces; | 11 | using OpenSim.Framework.Configuration.Interfaces; |
12 | 12 | ||
13 | namespace OpenSim.Framework.Configuration | 13 | namespace OpenSim.Framework.Configuration |
14 | { | 14 | { |
15 | public class ConfigurationMember | 15 | public class ConfigurationMember |
16 | { | 16 | { |
17 | public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result); | 17 | public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result); |
18 | public delegate void ConfigurationOptionsLoad(); | 18 | public delegate void ConfigurationOptionsLoad(); |
19 | 19 | ||
20 | private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>(); | 20 | private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>(); |
21 | private string configurationFilename = ""; | 21 | private string configurationFilename = ""; |
22 | private string configurationDescription = ""; | 22 | private string configurationDescription = ""; |
23 | 23 | ||
24 | private ConfigurationOptionsLoad loadFunction; | 24 | private ConfigurationOptionsLoad loadFunction; |
25 | private ConfigurationOptionResult resultFunction; | 25 | private ConfigurationOptionResult resultFunction; |
26 | 26 | ||
27 | private IGenericConfig configurationPlugin = null; | 27 | private IGenericConfig configurationPlugin = null; |
28 | /// <summary> | 28 | /// <summary> |
29 | /// This is the default configuration DLL loaded | 29 | /// This is the default configuration DLL loaded |
30 | /// </summary> | 30 | /// </summary> |
31 | private string configurationPluginFilename = "OpenSim.Framework.Configuration.XML.dll"; | 31 | private string configurationPluginFilename = "OpenSim.Framework.Configuration.XML.dll"; |
32 | public ConfigurationMember(string configuration_filename, string configuration_description, ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function) | 32 | public ConfigurationMember(string configuration_filename, string configuration_description, ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function) |
33 | { | 33 | { |
34 | this.configurationFilename = configuration_filename; | 34 | this.configurationFilename = configuration_filename; |
35 | this.configurationDescription = configuration_description; | 35 | this.configurationDescription = configuration_description; |
36 | this.loadFunction = load_function; | 36 | this.loadFunction = load_function; |
37 | this.resultFunction = result_function; | 37 | this.resultFunction = result_function; |
38 | } | 38 | } |
39 | 39 | ||
40 | public void setConfigurationFilename(string filename) | 40 | public void setConfigurationFilename(string filename) |
41 | { | 41 | { |
42 | configurationFilename = filename; | 42 | configurationFilename = filename; |
43 | } | 43 | } |
44 | public void setConfigurationDescription(string desc) | 44 | public void setConfigurationDescription(string desc) |
45 | { | 45 | { |
46 | configurationDescription = desc; | 46 | configurationDescription = desc; |
47 | } | 47 | } |
48 | 48 | ||
49 | public void setConfigurationResultFunction(ConfigurationOptionResult result) | 49 | public void setConfigurationResultFunction(ConfigurationOptionResult result) |
50 | { | 50 | { |
51 | resultFunction = result; | 51 | resultFunction = result; |
52 | } | 52 | } |
53 | 53 | ||
54 | public void forceConfigurationPluginLibrary(string dll_filename) | 54 | public void forceConfigurationPluginLibrary(string dll_filename) |
55 | { | 55 | { |
56 | configurationPluginFilename = dll_filename; | 56 | configurationPluginFilename = dll_filename; |
57 | } | 57 | } |
58 | public void addConfigurationOption(string configuration_key, ConfigurationOption.ConfigurationTypes configuration_type, string configuration_question, string configuration_default, bool use_default_no_prompt) | 58 | public void addConfigurationOption(string configuration_key, ConfigurationOption.ConfigurationTypes configuration_type, string configuration_question, string configuration_default, bool use_default_no_prompt) |
59 | { | 59 | { |
60 | ConfigurationOption configOption = new ConfigurationOption(); | 60 | ConfigurationOption configOption = new ConfigurationOption(); |
61 | configOption.configurationKey = configuration_key; | 61 | configOption.configurationKey = configuration_key; |
62 | configOption.configurationQuestion = configuration_question; | 62 | configOption.configurationQuestion = configuration_question; |
63 | configOption.configurationDefault = configuration_default; | 63 | configOption.configurationDefault = configuration_default; |
64 | configOption.configurationType = configuration_type; | 64 | configOption.configurationType = configuration_type; |
65 | configOption.configurationUseDefaultNoPrompt = use_default_no_prompt; | 65 | configOption.configurationUseDefaultNoPrompt = use_default_no_prompt; |
66 | 66 | ||
67 | if (configuration_key != "" && configuration_question != "") | 67 | if (configuration_key != "" && configuration_question != "") |
68 | { | 68 | { |
69 | if (!configurationOptions.Contains(configOption)) | 69 | if (!configurationOptions.Contains(configOption)) |
70 | { | 70 | { |
71 | configurationOptions.Add(configOption); | 71 | configurationOptions.Add(configOption); |
72 | } | 72 | } |
73 | } | 73 | } |
74 | else | 74 | else |
75 | { | 75 | { |
76 | MainLog.Instance.Notice("Required fields for adding a configuration option is invalid. Will not add this option (" + configuration_key + ")"); | 76 | MainLog.Instance.Notice("Required fields for adding a configuration option is invalid. Will not add this option (" + configuration_key + ")"); |
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
80 | public void performConfigurationRetrieve() | 80 | public void performConfigurationRetrieve() |
81 | { | 81 | { |
82 | configurationPlugin = this.LoadConfigDll(configurationPluginFilename); | 82 | configurationPlugin = this.LoadConfigDll(configurationPluginFilename); |
83 | configurationOptions.Clear(); | 83 | configurationOptions.Clear(); |
84 | if(loadFunction == null) | 84 | if(loadFunction == null) |
85 | { | 85 | { |
86 | MainLog.Instance.Error("Load Function for '" + this.configurationDescription + "' is null. Refusing to run configuration."); | 86 | MainLog.Instance.Error("Load Function for '" + this.configurationDescription + "' is null. Refusing to run configuration."); |
87 | return; | 87 | return; |
88 | } | 88 | } |
89 | 89 | ||
90 | if(resultFunction == null) | 90 | if(resultFunction == null) |
91 | { | 91 | { |
92 | MainLog.Instance.Error("Result Function for '" + this.configurationDescription + "' is null. Refusing to run configuration."); | 92 | MainLog.Instance.Error("Result Function for '" + this.configurationDescription + "' is null. Refusing to run configuration."); |
93 | return; | 93 | return; |
94 | } | 94 | } |
95 | 95 | ||
96 | MainLog.Instance.Verbose("Calling Configuration Load Function..."); | 96 | MainLog.Instance.Verbose("Calling Configuration Load Function..."); |
97 | this.loadFunction(); | 97 | this.loadFunction(); |
98 | 98 | ||
99 | if(configurationOptions.Count <= 0) | 99 | if(configurationOptions.Count <= 0) |
100 | { | 100 | { |
101 | MainLog.Instance.Error("No configuration options were specified for '" + this.configurationOptions + "'. Refusing to continue configuration."); | 101 | MainLog.Instance.Error("No configuration options were specified for '" + this.configurationOptions + "'. Refusing to continue configuration."); |
102 | return; | 102 | return; |
103 | } | 103 | } |
104 | 104 | ||
105 | bool useFile = true; | 105 | bool useFile = true; |
106 | if (configurationPlugin == null) | 106 | if (configurationPlugin == null) |
107 | { | 107 | { |
108 | MainLog.Instance.Error("Configuration Plugin NOT LOADED!"); | 108 | MainLog.Instance.Error("Configuration Plugin NOT LOADED!"); |
109 | return; | 109 | return; |
110 | } | 110 | } |
111 | 111 | ||
112 | if (configurationFilename.Trim() != "") | 112 | if (configurationFilename.Trim() != "") |
113 | { | 113 | { |
114 | configurationPlugin.SetFileName(configurationFilename); | 114 | configurationPlugin.SetFileName(configurationFilename); |
115 | configurationPlugin.LoadData(); | 115 | configurationPlugin.LoadData(); |
116 | useFile = true; | 116 | useFile = true; |
117 | } | 117 | } |
118 | 118 | ||
119 | else | 119 | else |
120 | { | 120 | { |
121 | MainLog.Instance.Notice("XML Configuration Filename is not valid; will not save to the file."); | 121 | MainLog.Instance.Notice("XML Configuration Filename is not valid; will not save to the file."); |
122 | useFile = false; | 122 | useFile = false; |
123 | } | 123 | } |
124 | 124 | ||
125 | foreach (ConfigurationOption configOption in configurationOptions) | 125 | foreach (ConfigurationOption configOption in configurationOptions) |
126 | { | 126 | { |
127 | bool convertSuccess = false; | 127 | bool convertSuccess = false; |
128 | object return_result = null; | 128 | object return_result = null; |
129 | string errorMessage = ""; | 129 | string errorMessage = ""; |
130 | bool ignoreNextFromConfig = false; | 130 | bool ignoreNextFromConfig = false; |
131 | while (convertSuccess == false) | 131 | while (convertSuccess == false) |
132 | { | 132 | { |
133 | 133 | ||
134 | string console_result = ""; | 134 | string console_result = ""; |
135 | string attribute = null; | 135 | string attribute = null; |
136 | if (useFile) | 136 | if (useFile) |
137 | { | 137 | { |
138 | if (!ignoreNextFromConfig) | 138 | if (!ignoreNextFromConfig) |
139 | { | 139 | { |
140 | attribute = configurationPlugin.GetAttribute(configOption.configurationKey); | 140 | attribute = configurationPlugin.GetAttribute(configOption.configurationKey); |
141 | } | 141 | } |
142 | else | 142 | else |
143 | { | 143 | { |
144 | ignoreNextFromConfig = false; | 144 | ignoreNextFromConfig = false; |
145 | } | 145 | } |
146 | } | 146 | } |
147 | 147 | ||
148 | if (attribute == null) | 148 | if (attribute == null) |
149 | { | 149 | { |
150 | if (configOption.configurationUseDefaultNoPrompt) | 150 | if (configOption.configurationUseDefaultNoPrompt) |
151 | { | 151 | { |
152 | console_result = configOption.configurationDefault; | 152 | console_result = configOption.configurationDefault; |
153 | } | 153 | } |
154 | else | 154 | else |
155 | { | 155 | { |
156 | 156 | ||
157 | if (configurationDescription.Trim() != "") | 157 | if (configurationDescription.Trim() != "") |
158 | { | 158 | { |
159 | console_result = MainLog.Instance.CmdPrompt(configurationDescription + ": " + configOption.configurationQuestion, configOption.configurationDefault); | 159 | console_result = MainLog.Instance.CmdPrompt(configurationDescription + ": " + configOption.configurationQuestion, configOption.configurationDefault); |
160 | } | 160 | } |
161 | else | 161 | else |
162 | { | 162 | { |
163 | console_result = MainLog.Instance.CmdPrompt(configOption.configurationQuestion, configOption.configurationDefault); | 163 | console_result = MainLog.Instance.CmdPrompt(configOption.configurationQuestion, configOption.configurationDefault); |
164 | } | 164 | } |
165 | } | 165 | } |
166 | } | 166 | } |
167 | else | 167 | else |
168 | { | 168 | { |
169 | console_result = attribute; | 169 | console_result = attribute; |
170 | } | 170 | } |
171 | 171 | ||
172 | switch (configOption.configurationType) | 172 | switch (configOption.configurationType) |
173 | { | 173 | { |
174 | case ConfigurationOption.ConfigurationTypes.TYPE_STRING: | 174 | case ConfigurationOption.ConfigurationTypes.TYPE_STRING: |
175 | return_result = console_result; | 175 | return_result = console_result; |
176 | convertSuccess = true; | 176 | convertSuccess = true; |
177 | break; | 177 | break; |
178 | case ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY: | 178 | case ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY: |
179 | if (console_result.Length > 0) | 179 | if (console_result.Length > 0) |
180 | { | 180 | { |
181 | return_result = console_result; | 181 | return_result = console_result; |
182 | convertSuccess = true; | 182 | convertSuccess = true; |
183 | } | 183 | } |
184 | errorMessage = "a string that is not empty"; | 184 | errorMessage = "a string that is not empty"; |
185 | break; | 185 | break; |
186 | case ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN: | 186 | case ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN: |
187 | bool boolResult; | 187 | bool boolResult; |
188 | if (Boolean.TryParse(console_result, out boolResult)) | 188 | if (Boolean.TryParse(console_result, out boolResult)) |
189 | { | 189 | { |
190 | convertSuccess = true; | 190 | convertSuccess = true; |
191 | return_result = boolResult; | 191 | return_result = boolResult; |
192 | } | 192 | } |
193 | errorMessage = "'true' or 'false' (Boolean)"; | 193 | errorMessage = "'true' or 'false' (Boolean)"; |
194 | break; | 194 | break; |
195 | case ConfigurationOption.ConfigurationTypes.TYPE_BYTE: | 195 | case ConfigurationOption.ConfigurationTypes.TYPE_BYTE: |
196 | byte byteResult; | 196 | byte byteResult; |
197 | if (Byte.TryParse(console_result, out byteResult)) | 197 | if (Byte.TryParse(console_result, out byteResult)) |
198 | { | 198 | { |
199 | convertSuccess = true; | 199 | convertSuccess = true; |
200 | return_result = byteResult; | 200 | return_result = byteResult; |
201 | } | 201 | } |
202 | errorMessage = "a byte (Byte)"; | 202 | errorMessage = "a byte (Byte)"; |
203 | break; | 203 | break; |
204 | case ConfigurationOption.ConfigurationTypes.TYPE_CHARACTER: | 204 | case ConfigurationOption.ConfigurationTypes.TYPE_CHARACTER: |
205 | char charResult; | 205 | char charResult; |
206 | if (Char.TryParse(console_result, out charResult)) | 206 | if (Char.TryParse(console_result, out charResult)) |
207 | { | 207 | { |
208 | convertSuccess = true; | 208 | convertSuccess = true; |
209 | return_result = charResult; | 209 | return_result = charResult; |
210 | } | 210 | } |
211 | errorMessage = "a character (Char)"; | 211 | errorMessage = "a character (Char)"; |
212 | break; | 212 | break; |
213 | case ConfigurationOption.ConfigurationTypes.TYPE_INT16: | 213 | case ConfigurationOption.ConfigurationTypes.TYPE_INT16: |
214 | short shortResult; | 214 | short shortResult; |
215 | if (Int16.TryParse(console_result, out shortResult)) | 215 | if (Int16.TryParse(console_result, out shortResult)) |
216 | { | 216 | { |
217 | convertSuccess = true; | 217 | convertSuccess = true; |
218 | return_result = shortResult; | 218 | return_result = shortResult; |
219 | } | 219 | } |
220 | errorMessage = "a signed 32 bit integer (short)"; | 220 | errorMessage = "a signed 32 bit integer (short)"; |
221 | break; | 221 | break; |
222 | case ConfigurationOption.ConfigurationTypes.TYPE_INT32: | 222 | case ConfigurationOption.ConfigurationTypes.TYPE_INT32: |
223 | int intResult; | 223 | int intResult; |
224 | if (Int32.TryParse(console_result, out intResult)) | 224 | if (Int32.TryParse(console_result, out intResult)) |
225 | { | 225 | { |
226 | convertSuccess = true; | 226 | convertSuccess = true; |
227 | return_result = intResult; | 227 | return_result = intResult; |
228 | 228 | ||
229 | } | 229 | } |
230 | errorMessage = "a signed 32 bit integer (int)"; | 230 | errorMessage = "a signed 32 bit integer (int)"; |
231 | break; | 231 | break; |
232 | case ConfigurationOption.ConfigurationTypes.TYPE_INT64: | 232 | case ConfigurationOption.ConfigurationTypes.TYPE_INT64: |
233 | long longResult; | 233 | long longResult; |
234 | if (Int64.TryParse(console_result, out longResult)) | 234 | if (Int64.TryParse(console_result, out longResult)) |
235 | { | 235 | { |
236 | convertSuccess = true; | 236 | convertSuccess = true; |
237 | return_result = longResult; | 237 | return_result = longResult; |
238 | } | 238 | } |
239 | errorMessage = "a signed 32 bit integer (long)"; | 239 | errorMessage = "a signed 32 bit integer (long)"; |
240 | break; | 240 | break; |
241 | case ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS: | 241 | case ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS: |
242 | IPAddress ipAddressResult; | 242 | IPAddress ipAddressResult; |
243 | if (IPAddress.TryParse(console_result, out ipAddressResult)) | 243 | if (IPAddress.TryParse(console_result, out ipAddressResult)) |
244 | { | 244 | { |
245 | convertSuccess = true; | 245 | convertSuccess = true; |
246 | return_result = ipAddressResult; | 246 | return_result = ipAddressResult; |
247 | } | 247 | } |
248 | errorMessage = "an IP Address (IPAddress)"; | 248 | errorMessage = "an IP Address (IPAddress)"; |
249 | break; | 249 | break; |
250 | case ConfigurationOption.ConfigurationTypes.TYPE_LLUUID: | 250 | case ConfigurationOption.ConfigurationTypes.TYPE_LLUUID: |
251 | LLUUID uuidResult; | 251 | LLUUID uuidResult; |
252 | if (LLUUID.TryParse(console_result, out uuidResult)) | 252 | if (LLUUID.TryParse(console_result, out uuidResult)) |
253 | { | 253 | { |
254 | convertSuccess = true; | 254 | convertSuccess = true; |
255 | return_result = uuidResult; | 255 | return_result = uuidResult; |
256 | } | 256 | } |
257 | errorMessage = "a UUID (LLUUID)"; | 257 | errorMessage = "a UUID (LLUUID)"; |
258 | break; | 258 | break; |
259 | case ConfigurationOption.ConfigurationTypes.TYPE_LLVECTOR3: | 259 | case ConfigurationOption.ConfigurationTypes.TYPE_LLVECTOR3: |
260 | LLVector3 vectorResult; | 260 | LLVector3 vectorResult; |
261 | if (LLVector3.TryParse(console_result, out vectorResult)) | 261 | if (LLVector3.TryParse(console_result, out vectorResult)) |
262 | { | 262 | { |
263 | convertSuccess = true; | 263 | convertSuccess = true; |
264 | return_result = vectorResult; | 264 | return_result = vectorResult; |
265 | } | 265 | } |
266 | errorMessage = "a vector (LLVector3)"; | 266 | errorMessage = "a vector (LLVector3)"; |
267 | break; | 267 | break; |
268 | case ConfigurationOption.ConfigurationTypes.TYPE_UINT16: | 268 | case ConfigurationOption.ConfigurationTypes.TYPE_UINT16: |
269 | ushort ushortResult; | 269 | ushort ushortResult; |
270 | if (UInt16.TryParse(console_result, out ushortResult)) | 270 | if (UInt16.TryParse(console_result, out ushortResult)) |
271 | { | 271 | { |
272 | convertSuccess = true; | 272 | convertSuccess = true; |
273 | return_result = ushortResult; | 273 | return_result = ushortResult; |
274 | } | 274 | } |
275 | errorMessage = "an unsigned 16 bit integer (ushort)"; | 275 | errorMessage = "an unsigned 16 bit integer (ushort)"; |
276 | break; | 276 | break; |
277 | case ConfigurationOption.ConfigurationTypes.TYPE_UINT32: | 277 | case ConfigurationOption.ConfigurationTypes.TYPE_UINT32: |
278 | uint uintResult; | 278 | uint uintResult; |
279 | if (UInt32.TryParse(console_result, out uintResult)) | 279 | if (UInt32.TryParse(console_result, out uintResult)) |
280 | { | 280 | { |
281 | convertSuccess = true; | 281 | convertSuccess = true; |
282 | return_result = uintResult; | 282 | return_result = uintResult; |
283 | 283 | ||
284 | } | 284 | } |
285 | errorMessage = "an unsigned 32 bit integer (uint)"; | 285 | errorMessage = "an unsigned 32 bit integer (uint)"; |
286 | break; | 286 | break; |
287 | case ConfigurationOption.ConfigurationTypes.TYPE_UINT64: | 287 | case ConfigurationOption.ConfigurationTypes.TYPE_UINT64: |
288 | ulong ulongResult; | 288 | ulong ulongResult; |
289 | if (UInt64.TryParse(console_result, out ulongResult)) | 289 | if (UInt64.TryParse(console_result, out ulongResult)) |
290 | { | 290 | { |
291 | convertSuccess = true; | 291 | convertSuccess = true; |
292 | return_result = ulongResult; | 292 | return_result = ulongResult; |
293 | } | 293 | } |
294 | errorMessage = "an unsigned 64 bit integer (ulong)"; | 294 | errorMessage = "an unsigned 64 bit integer (ulong)"; |
295 | break; | 295 | break; |
296 | case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT: | 296 | case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT: |
297 | float floatResult; | 297 | float floatResult; |
298 | if (float.TryParse(console_result, out floatResult)) | 298 | if (float.TryParse(console_result, out floatResult)) |
299 | { | 299 | { |
300 | convertSuccess = true; | 300 | convertSuccess = true; |
301 | return_result = floatResult; | 301 | return_result = floatResult; |
302 | } | 302 | } |
303 | errorMessage = "a single-precision floating point number (float)"; | 303 | errorMessage = "a single-precision floating point number (float)"; |
304 | break; | 304 | break; |
305 | case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE: | 305 | case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE: |
306 | double doubleResult; | 306 | double doubleResult; |
307 | if (Double.TryParse(console_result, out doubleResult)) | 307 | if (Double.TryParse(console_result, out doubleResult)) |
308 | { | 308 | { |
309 | convertSuccess = true; | 309 | convertSuccess = true; |
310 | return_result = doubleResult; | 310 | return_result = doubleResult; |
311 | } | 311 | } |
312 | errorMessage = "an double-precision floating point number (double)"; | 312 | errorMessage = "an double-precision floating point number (double)"; |
313 | break; | 313 | break; |
314 | } | 314 | } |
315 | 315 | ||
316 | if (convertSuccess) | 316 | if (convertSuccess) |
317 | { | 317 | { |
318 | if (useFile) | 318 | if (useFile) |
319 | { | 319 | { |
320 | configurationPlugin.SetAttribute(configOption.configurationKey, console_result); | 320 | configurationPlugin.SetAttribute(configOption.configurationKey, console_result); |
321 | } | 321 | } |
322 | 322 | ||
323 | 323 | ||
324 | if (!this.resultFunction(configOption.configurationKey, return_result)) | 324 | if (!this.resultFunction(configOption.configurationKey, return_result)) |
325 | { | 325 | { |
326 | Console.MainLog.Instance.Notice("The handler for the last configuration option denied that input, please try again."); | 326 | Console.MainLog.Instance.Notice("The handler for the last configuration option denied that input, please try again."); |
327 | convertSuccess = false; | 327 | convertSuccess = false; |
328 | ignoreNextFromConfig = true; | 328 | ignoreNextFromConfig = true; |
329 | } | 329 | } |
330 | } | 330 | } |
331 | else | 331 | else |
332 | { | 332 | { |
333 | if (configOption.configurationUseDefaultNoPrompt) | 333 | if (configOption.configurationUseDefaultNoPrompt) |
334 | { | 334 | { |
335 | MainLog.Instance.Error("Default given for '" + configOption.configurationKey + "' is not valid; the configuration result must be " + errorMessage + ". Will skip this option..."); | 335 | MainLog.Instance.Error("Default given for '" + configOption.configurationKey + "' is not valid; the configuration result must be " + errorMessage + ". Will skip this option..."); |
336 | convertSuccess = true; | 336 | convertSuccess = true; |
337 | } | 337 | } |
338 | else | 338 | else |
339 | { | 339 | { |
340 | MainLog.Instance.Warn("configuration","Incorrect result given, the configuration option must be " + errorMessage + ". Prompting for same option..."); | 340 | MainLog.Instance.Warn("configuration","Incorrect result given, the configuration option must be " + errorMessage + ". Prompting for same option..."); |
341 | ignoreNextFromConfig = true; | 341 | ignoreNextFromConfig = true; |
342 | } | 342 | } |
343 | } | 343 | } |
344 | } | 344 | } |
345 | } | 345 | } |
346 | 346 | ||
347 | if(useFile) | 347 | if(useFile) |
348 | { | 348 | { |
349 | configurationPlugin.Commit(); | 349 | configurationPlugin.Commit(); |
350 | configurationPlugin.Close(); | 350 | configurationPlugin.Close(); |
351 | } | 351 | } |
352 | } | 352 | } |
353 | 353 | ||
354 | private IGenericConfig LoadConfigDll(string dllName) | 354 | private IGenericConfig LoadConfigDll(string dllName) |
355 | { | 355 | { |
356 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); | 356 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); |
357 | IGenericConfig plug = null; | 357 | IGenericConfig plug = null; |
358 | 358 | ||
359 | foreach (Type pluginType in pluginAssembly.GetTypes()) | 359 | foreach (Type pluginType in pluginAssembly.GetTypes()) |
360 | { | 360 | { |
361 | if (pluginType.IsPublic) | 361 | if (pluginType.IsPublic) |
362 | { | 362 | { |
363 | if (!pluginType.IsAbstract) | 363 | if (!pluginType.IsAbstract) |
364 | { | 364 | { |
365 | Type typeInterface = pluginType.GetInterface("IGenericConfig", true); | 365 | Type typeInterface = pluginType.GetInterface("IGenericConfig", true); |
366 | 366 | ||
367 | if (typeInterface != null) | 367 | if (typeInterface != null) |
368 | { | 368 | { |
369 | plug = (IGenericConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 369 | plug = (IGenericConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
370 | } | 370 | } |
371 | } | 371 | } |
372 | } | 372 | } |
373 | } | 373 | } |
374 | 374 | ||
375 | pluginAssembly = null; | 375 | pluginAssembly = null; |
376 | return plug; | 376 | return plug; |
377 | } | 377 | } |
378 | } | 378 | } |
379 | } | 379 | } |
diff --git a/OpenSim/Framework/General/Configuration/ConfigurationOption.cs b/OpenSim/Framework/General/Configuration/ConfigurationOption.cs index 38f60a0..c94ba4c 100644 --- a/OpenSim/Framework/General/Configuration/ConfigurationOption.cs +++ b/OpenSim/Framework/General/Configuration/ConfigurationOption.cs | |||
@@ -1,36 +1,36 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | 4 | ||
5 | namespace OpenSim.Framework.Configuration | 5 | namespace OpenSim.Framework.Configuration |
6 | { | 6 | { |
7 | public class ConfigurationOption | 7 | public class ConfigurationOption |
8 | { | 8 | { |
9 | public enum ConfigurationTypes | 9 | public enum ConfigurationTypes |
10 | { | 10 | { |
11 | TYPE_STRING, | 11 | TYPE_STRING, |
12 | TYPE_STRING_NOT_EMPTY, | 12 | TYPE_STRING_NOT_EMPTY, |
13 | TYPE_UINT16, | 13 | TYPE_UINT16, |
14 | TYPE_UINT32, | 14 | TYPE_UINT32, |
15 | TYPE_UINT64, | 15 | TYPE_UINT64, |
16 | TYPE_INT16, | 16 | TYPE_INT16, |
17 | TYPE_INT32, | 17 | TYPE_INT32, |
18 | TYPE_INT64, | 18 | TYPE_INT64, |
19 | TYPE_IP_ADDRESS, | 19 | TYPE_IP_ADDRESS, |
20 | TYPE_CHARACTER, | 20 | TYPE_CHARACTER, |
21 | TYPE_BOOLEAN, | 21 | TYPE_BOOLEAN, |
22 | TYPE_BYTE, | 22 | TYPE_BYTE, |
23 | TYPE_LLUUID, | 23 | TYPE_LLUUID, |
24 | TYPE_LLVECTOR3, | 24 | TYPE_LLVECTOR3, |
25 | TYPE_FLOAT, | 25 | TYPE_FLOAT, |
26 | TYPE_DOUBLE | 26 | TYPE_DOUBLE |
27 | }; | 27 | }; |
28 | 28 | ||
29 | public string configurationKey = ""; | 29 | public string configurationKey = ""; |
30 | public string configurationQuestion = ""; | 30 | public string configurationQuestion = ""; |
31 | public string configurationDefault = ""; | 31 | public string configurationDefault = ""; |
32 | 32 | ||
33 | public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING; | 33 | public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING; |
34 | public bool configurationUseDefaultNoPrompt = false; | 34 | public bool configurationUseDefaultNoPrompt = false; |
35 | } | 35 | } |
36 | } | 36 | } |
diff --git a/OpenSim/Framework/General/Configuration/GridConfig.cs b/OpenSim/Framework/General/Configuration/GridConfig.cs index 3d07d9b..a81cac2 100644 --- a/OpenSim/Framework/General/Configuration/GridConfig.cs +++ b/OpenSim/Framework/General/Configuration/GridConfig.cs | |||
@@ -1,85 +1,85 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | 4 | ||
5 | namespace OpenSim.Framework.Configuration | 5 | namespace OpenSim.Framework.Configuration |
6 | { | 6 | { |
7 | public class GridConfig | 7 | public class GridConfig |
8 | { | 8 | { |
9 | public string GridOwner = ""; | 9 | public string GridOwner = ""; |
10 | public string DefaultAssetServer = ""; | 10 | public string DefaultAssetServer = ""; |
11 | public string AssetSendKey = ""; | 11 | public string AssetSendKey = ""; |
12 | public string AssetRecvKey = ""; | 12 | public string AssetRecvKey = ""; |
13 | 13 | ||
14 | public string DefaultUserServer = ""; | 14 | public string DefaultUserServer = ""; |
15 | public string UserSendKey = ""; | 15 | public string UserSendKey = ""; |
16 | public string UserRecvKey = ""; | 16 | public string UserRecvKey = ""; |
17 | 17 | ||
18 | public string SimSendKey = ""; | 18 | public string SimSendKey = ""; |
19 | public string SimRecvKey = ""; | 19 | public string SimRecvKey = ""; |
20 | 20 | ||
21 | public string DatabaseProvider = ""; | 21 | public string DatabaseProvider = ""; |
22 | 22 | ||
23 | private ConfigurationMember configMember; | 23 | private ConfigurationMember configMember; |
24 | public GridConfig(string description, string filename) | 24 | public GridConfig(string description, string filename) |
25 | { | 25 | { |
26 | configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration); | 26 | configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration); |
27 | configMember.performConfigurationRetrieve(); | 27 | configMember.performConfigurationRetrieve(); |
28 | } | 28 | } |
29 | 29 | ||
30 | public void loadConfigurationOptions() | 30 | public void loadConfigurationOptions() |
31 | { | 31 | { |
32 | configMember.addConfigurationOption("grid_owner", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "OGS Grid Owner", "OGS development team", false); | 32 | configMember.addConfigurationOption("grid_owner", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "OGS Grid Owner", "OGS development team", false); |
33 | configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", "http://127.0.0.1:8003/", false); | 33 | configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", "http://127.0.0.1:8003/", false); |
34 | configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to asset server", "null", false); | 34 | configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to asset server", "null", false); |
35 | configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from asset server", "null", false); | 35 | configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from asset server", "null", false); |
36 | 36 | ||
37 | configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:8002/", false); | 37 | configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:8002/", false); |
38 | configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false); | 38 | configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false); |
39 | configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false); | 39 | configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false); |
40 | 40 | ||
41 | configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to a simulator", "null", false); | 41 | configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to a simulator", "null", false); |
42 | configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false); | 42 | configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false); |
43 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); | 43 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); |
44 | } | 44 | } |
45 | 45 | ||
46 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 46 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
47 | { | 47 | { |
48 | switch (configuration_key) | 48 | switch (configuration_key) |
49 | { | 49 | { |
50 | case "grid_owner": | 50 | case "grid_owner": |
51 | this.GridOwner = (string)configuration_result; | 51 | this.GridOwner = (string)configuration_result; |
52 | break; | 52 | break; |
53 | case "default_asset_server": | 53 | case "default_asset_server": |
54 | this.DefaultAssetServer = (string)configuration_result; | 54 | this.DefaultAssetServer = (string)configuration_result; |
55 | break; | 55 | break; |
56 | case "asset_send_key": | 56 | case "asset_send_key": |
57 | this.AssetSendKey = (string)configuration_result; | 57 | this.AssetSendKey = (string)configuration_result; |
58 | break; | 58 | break; |
59 | case "asset_recv_key": | 59 | case "asset_recv_key": |
60 | this.AssetRecvKey = (string)configuration_result; | 60 | this.AssetRecvKey = (string)configuration_result; |
61 | break; | 61 | break; |
62 | case "default_user_server": | 62 | case "default_user_server": |
63 | this.DefaultUserServer = (string)configuration_result; | 63 | this.DefaultUserServer = (string)configuration_result; |
64 | break; | 64 | break; |
65 | case "user_send_key": | 65 | case "user_send_key": |
66 | this.UserSendKey = (string)configuration_result; | 66 | this.UserSendKey = (string)configuration_result; |
67 | break; | 67 | break; |
68 | case "user_recv_key": | 68 | case "user_recv_key": |
69 | this.UserRecvKey = (string)configuration_result; | 69 | this.UserRecvKey = (string)configuration_result; |
70 | break; | 70 | break; |
71 | case "sim_send_key": | 71 | case "sim_send_key": |
72 | this.SimSendKey = (string)configuration_result; | 72 | this.SimSendKey = (string)configuration_result; |
73 | break; | 73 | break; |
74 | case "sim_recv_key": | 74 | case "sim_recv_key": |
75 | this.SimRecvKey = (string)configuration_result; | 75 | this.SimRecvKey = (string)configuration_result; |
76 | break; | 76 | break; |
77 | case "database_provider": | 77 | case "database_provider": |
78 | this.DatabaseProvider = (string)configuration_result; | 78 | this.DatabaseProvider = (string)configuration_result; |
79 | break; | 79 | break; |
80 | } | 80 | } |
81 | 81 | ||
82 | return true; | 82 | return true; |
83 | } | 83 | } |
84 | } | 84 | } |
85 | } | 85 | } |
diff --git a/OpenSim/Framework/General/Configuration/Interfaces/IGenericConfig.cs b/OpenSim/Framework/General/Configuration/Interfaces/IGenericConfig.cs index ceccd04..0222745 100644 --- a/OpenSim/Framework/General/Configuration/Interfaces/IGenericConfig.cs +++ b/OpenSim/Framework/General/Configuration/Interfaces/IGenericConfig.cs | |||
@@ -1,40 +1,40 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | 2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | namespace OpenSim.Framework.Configuration.Interfaces | 28 | namespace OpenSim.Framework.Configuration.Interfaces |
29 | { | 29 | { |
30 | public interface IGenericConfig | 30 | public interface IGenericConfig |
31 | { | 31 | { |
32 | void SetFileName(string fileName); | 32 | void SetFileName(string fileName); |
33 | void LoadData(); | 33 | void LoadData(); |
34 | void LoadDataFromString(string data); | 34 | void LoadDataFromString(string data); |
35 | string GetAttribute(string attributeName); | 35 | string GetAttribute(string attributeName); |
36 | bool SetAttribute(string attributeName, string attributeValue); | 36 | bool SetAttribute(string attributeName, string attributeValue); |
37 | void Commit(); | 37 | void Commit(); |
38 | void Close(); | 38 | void Close(); |
39 | } | 39 | } |
40 | } | 40 | } |
diff --git a/OpenSim/Framework/General/Configuration/UserConfig.cs b/OpenSim/Framework/General/Configuration/UserConfig.cs index 2183491..177506f 100644 --- a/OpenSim/Framework/General/Configuration/UserConfig.cs +++ b/OpenSim/Framework/General/Configuration/UserConfig.cs | |||
@@ -1,62 +1,62 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | 4 | ||
5 | namespace OpenSim.Framework.Configuration | 5 | namespace OpenSim.Framework.Configuration |
6 | { | 6 | { |
7 | /// <summary> | 7 | /// <summary> |
8 | /// UserConfig -- For User Server Configuration | 8 | /// UserConfig -- For User Server Configuration |
9 | /// </summary> | 9 | /// </summary> |
10 | public class UserConfig | 10 | public class UserConfig |
11 | { | 11 | { |
12 | public string DefaultStartupMsg = ""; | 12 | public string DefaultStartupMsg = ""; |
13 | public string GridServerURL = ""; | 13 | public string GridServerURL = ""; |
14 | public string GridSendKey = ""; | 14 | public string GridSendKey = ""; |
15 | public string GridRecvKey = ""; | 15 | public string GridRecvKey = ""; |
16 | 16 | ||
17 | public string DatabaseProvider = ""; | 17 | public string DatabaseProvider = ""; |
18 | 18 | ||
19 | private ConfigurationMember configMember; | 19 | private ConfigurationMember configMember; |
20 | 20 | ||
21 | public UserConfig(string description, string filename) | 21 | public UserConfig(string description, string filename) |
22 | { | 22 | { |
23 | configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration); | 23 | configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration); |
24 | configMember.performConfigurationRetrieve(); | 24 | configMember.performConfigurationRetrieve(); |
25 | } | 25 | } |
26 | 26 | ||
27 | public void loadConfigurationOptions() | 27 | public void loadConfigurationOptions() |
28 | { | 28 | { |
29 | configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS",false); | 29 | configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS",false); |
30 | 30 | ||
31 | configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:8001/", false); | 31 | configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:8001/", false); |
32 | configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false); | 32 | configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false); |
33 | configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false); | 33 | configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false); |
34 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); | 34 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); |
35 | 35 | ||
36 | } | 36 | } |
37 | 37 | ||
38 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 38 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
39 | { | 39 | { |
40 | switch (configuration_key) | 40 | switch (configuration_key) |
41 | { | 41 | { |
42 | case "default_startup_message": | 42 | case "default_startup_message": |
43 | this.DefaultStartupMsg = (string)configuration_result; | 43 | this.DefaultStartupMsg = (string)configuration_result; |
44 | break; | 44 | break; |
45 | case "default_grid_server": | 45 | case "default_grid_server": |
46 | this.GridServerURL = (string)configuration_result; | 46 | this.GridServerURL = (string)configuration_result; |
47 | break; | 47 | break; |
48 | case "grid_send_key": | 48 | case "grid_send_key": |
49 | this.GridSendKey = (string)configuration_result; | 49 | this.GridSendKey = (string)configuration_result; |
50 | break; | 50 | break; |
51 | case "grid_recv_key": | 51 | case "grid_recv_key": |
52 | this.GridRecvKey = (string)configuration_result; | 52 | this.GridRecvKey = (string)configuration_result; |
53 | break; | 53 | break; |
54 | case "database_provider": | 54 | case "database_provider": |
55 | this.DatabaseProvider = (string)configuration_result; | 55 | this.DatabaseProvider = (string)configuration_result; |
56 | break; | 56 | break; |
57 | } | 57 | } |
58 | 58 | ||
59 | return true; | 59 | return true; |
60 | } | 60 | } |
61 | } | 61 | } |
62 | } | 62 | } |
diff --git a/OpenSim/Framework/General/Types/LandData.cs b/OpenSim/Framework/General/Types/LandData.cs index 2ae4927..26cb8d5 100644 --- a/OpenSim/Framework/General/Types/LandData.cs +++ b/OpenSim/Framework/General/Types/LandData.cs | |||
@@ -1,120 +1,120 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | 2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using libsecondlife; | 28 | using libsecondlife; |
29 | 29 | ||
30 | namespace OpenSim.Framework.Types | 30 | namespace OpenSim.Framework.Types |
31 | { | 31 | { |
32 | 32 | ||
33 | public class LandData | 33 | public class LandData |
34 | { | 34 | { |
35 | public byte[] landBitmapByteArray = new byte[512]; | 35 | public byte[] landBitmapByteArray = new byte[512]; |
36 | public string landName = "Your Parcel"; | 36 | public string landName = "Your Parcel"; |
37 | public string landDesc = ""; | 37 | public string landDesc = ""; |
38 | public LLUUID ownerID = new LLUUID(); | 38 | public LLUUID ownerID = new LLUUID(); |
39 | public bool isGroupOwned = false; | 39 | public bool isGroupOwned = false; |
40 | public LLVector3 AABBMin = new LLVector3(); | 40 | public LLVector3 AABBMin = new LLVector3(); |
41 | public LLVector3 AABBMax = new LLVector3(); | 41 | public LLVector3 AABBMax = new LLVector3(); |
42 | public int area = 0; | 42 | public int area = 0; |
43 | public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned | 43 | public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned |
44 | public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID | 44 | public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID |
45 | public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category | 45 | public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category |
46 | public int claimDate = 0; //Unemplemented | 46 | public int claimDate = 0; //Unemplemented |
47 | public int claimPrice = 0; //Unemplemented | 47 | public int claimPrice = 0; //Unemplemented |
48 | public LLUUID groupID = new LLUUID(); //Unemplemented | 48 | public LLUUID groupID = new LLUUID(); //Unemplemented |
49 | public int groupPrims = 0; | 49 | public int groupPrims = 0; |
50 | public int otherPrims = 0; | 50 | public int otherPrims = 0; |
51 | public int ownerPrims = 0; | 51 | public int ownerPrims = 0; |
52 | public int selectedPrims = 0; | 52 | public int selectedPrims = 0; |
53 | public int simwidePrims = 0; | 53 | public int simwidePrims = 0; |
54 | public int simwideArea = 0; | 54 | public int simwideArea = 0; |
55 | public int salePrice = 0; //Unemeplemented. Parcels price. | 55 | public int salePrice = 0; //Unemeplemented. Parcels price. |
56 | public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased; | 56 | public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased; |
57 | public uint landFlags = (uint)Parcel.ParcelFlags.AllowFly | (uint)Parcel.ParcelFlags.AllowLandmark | (uint)Parcel.ParcelFlags.AllowAllObjectEntry | (uint)Parcel.ParcelFlags.AllowDeedToGroup | (uint)Parcel.ParcelFlags.AllowTerraform | (uint)Parcel.ParcelFlags.CreateObjects | (uint)Parcel.ParcelFlags.AllowOtherScripts; | 57 | public uint landFlags = (uint)Parcel.ParcelFlags.AllowFly | (uint)Parcel.ParcelFlags.AllowLandmark | (uint)Parcel.ParcelFlags.AllowAllObjectEntry | (uint)Parcel.ParcelFlags.AllowDeedToGroup | (uint)Parcel.ParcelFlags.AllowTerraform | (uint)Parcel.ParcelFlags.CreateObjects | (uint)Parcel.ParcelFlags.AllowOtherScripts; |
58 | public byte landingType = 0; | 58 | public byte landingType = 0; |
59 | public byte mediaAutoScale = 0; | 59 | public byte mediaAutoScale = 0; |
60 | public LLUUID mediaID = LLUUID.Zero; | 60 | public LLUUID mediaID = LLUUID.Zero; |
61 | public int localID = 0; | 61 | public int localID = 0; |
62 | public LLUUID globalID = new LLUUID(); | 62 | public LLUUID globalID = new LLUUID(); |
63 | 63 | ||
64 | public string mediaURL = ""; | 64 | public string mediaURL = ""; |
65 | public string musicURL = ""; | 65 | public string musicURL = ""; |
66 | public float passHours = 0; | 66 | public float passHours = 0; |
67 | public int passPrice = 0; | 67 | public int passPrice = 0; |
68 | public LLUUID snapshotID = LLUUID.Zero; | 68 | public LLUUID snapshotID = LLUUID.Zero; |
69 | public LLVector3 userLocation = new LLVector3(); | 69 | public LLVector3 userLocation = new LLVector3(); |
70 | public LLVector3 userLookAt = new LLVector3(); | 70 | public LLVector3 userLookAt = new LLVector3(); |
71 | 71 | ||
72 | public LandData() | 72 | public LandData() |
73 | { | 73 | { |
74 | globalID = LLUUID.Random(); | 74 | globalID = LLUUID.Random(); |
75 | } | 75 | } |
76 | 76 | ||
77 | public LandData Copy() | 77 | public LandData Copy() |
78 | { | 78 | { |
79 | LandData landData = new LandData(); | 79 | LandData landData = new LandData(); |
80 | 80 | ||
81 | landData.AABBMax = this.AABBMax; | 81 | landData.AABBMax = this.AABBMax; |
82 | landData.AABBMin = this.AABBMin; | 82 | landData.AABBMin = this.AABBMin; |
83 | landData.area = this.area; | 83 | landData.area = this.area; |
84 | landData.auctionID = this.auctionID; | 84 | landData.auctionID = this.auctionID; |
85 | landData.authBuyerID = this.authBuyerID; | 85 | landData.authBuyerID = this.authBuyerID; |
86 | landData.category = this.category; | 86 | landData.category = this.category; |
87 | landData.claimDate = this.claimDate; | 87 | landData.claimDate = this.claimDate; |
88 | landData.claimPrice = this.claimPrice; | 88 | landData.claimPrice = this.claimPrice; |
89 | landData.globalID = this.globalID; | 89 | landData.globalID = this.globalID; |
90 | landData.groupID = this.groupID; | 90 | landData.groupID = this.groupID; |
91 | landData.groupPrims = this.groupPrims; | 91 | landData.groupPrims = this.groupPrims; |
92 | landData.otherPrims = this.otherPrims; | 92 | landData.otherPrims = this.otherPrims; |
93 | landData.ownerPrims = this.ownerPrims; | 93 | landData.ownerPrims = this.ownerPrims; |
94 | landData.selectedPrims = this.selectedPrims; | 94 | landData.selectedPrims = this.selectedPrims; |
95 | landData.isGroupOwned = this.isGroupOwned; | 95 | landData.isGroupOwned = this.isGroupOwned; |
96 | landData.localID = this.localID; | 96 | landData.localID = this.localID; |
97 | landData.landingType = this.landingType; | 97 | landData.landingType = this.landingType; |
98 | landData.mediaAutoScale = this.mediaAutoScale; | 98 | landData.mediaAutoScale = this.mediaAutoScale; |
99 | landData.mediaID = this.mediaID; | 99 | landData.mediaID = this.mediaID; |
100 | landData.mediaURL = this.mediaURL; | 100 | landData.mediaURL = this.mediaURL; |
101 | landData.musicURL = this.musicURL; | 101 | landData.musicURL = this.musicURL; |
102 | landData.ownerID = this.ownerID; | 102 | landData.ownerID = this.ownerID; |
103 | landData.landBitmapByteArray = (byte[])this.landBitmapByteArray.Clone(); | 103 | landData.landBitmapByteArray = (byte[])this.landBitmapByteArray.Clone(); |
104 | landData.landDesc = this.landDesc; | 104 | landData.landDesc = this.landDesc; |
105 | landData.landFlags = this.landFlags; | 105 | landData.landFlags = this.landFlags; |
106 | landData.landName = this.landName; | 106 | landData.landName = this.landName; |
107 | landData.landStatus = this.landStatus; | 107 | landData.landStatus = this.landStatus; |
108 | landData.passHours = this.passHours; | 108 | landData.passHours = this.passHours; |
109 | landData.passPrice = this.passPrice; | 109 | landData.passPrice = this.passPrice; |
110 | landData.salePrice = this.salePrice; | 110 | landData.salePrice = this.salePrice; |
111 | landData.snapshotID = this.snapshotID; | 111 | landData.snapshotID = this.snapshotID; |
112 | landData.userLocation = this.userLocation; | 112 | landData.userLocation = this.userLocation; |
113 | landData.userLookAt = this.userLookAt; | 113 | landData.userLookAt = this.userLookAt; |
114 | 114 | ||
115 | return landData; | 115 | return landData; |
116 | 116 | ||
117 | } | 117 | } |
118 | } | 118 | } |
119 | 119 | ||
120 | } | 120 | } |