diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 48 | ||||
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalUserServices.cs | 4 |
2 files changed, 30 insertions, 22 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 07ab34d..ddea383 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -213,28 +213,6 @@ namespace OpenSim | |||
213 | } | 213 | } |
214 | } | 214 | } |
215 | 215 | ||
216 | private void RunCommandScript(string fileName) | ||
217 | { | ||
218 | MainLog.Instance.Verbose("Running command script (" + fileName + ")"); | ||
219 | if (File.Exists(fileName)) | ||
220 | { | ||
221 | StreamReader readFile = File.OpenText(fileName); | ||
222 | string currentCommand = ""; | ||
223 | while ((currentCommand = readFile.ReadLine()) != null) | ||
224 | { | ||
225 | if (currentCommand != "") | ||
226 | { | ||
227 | MainLog.Instance.Verbose("Running '" + currentCommand + "'"); | ||
228 | MainLog.Instance.MainLogRunCommand(currentCommand); | ||
229 | } | ||
230 | } | ||
231 | } | ||
232 | else | ||
233 | { | ||
234 | MainLog.Instance.Error("Command script missing. Can not run commands"); | ||
235 | } | ||
236 | } | ||
237 | |||
238 | private static void CreateDefaultRegionInfoXml(string fileName) | 216 | private static void CreateDefaultRegionInfoXml(string fileName) |
239 | { | 217 | { |
240 | new RegionInfo("DEFAULT REGION CONFIG", fileName); | 218 | new RegionInfo("DEFAULT REGION CONFIG", fileName); |
@@ -323,6 +301,32 @@ namespace OpenSim | |||
323 | 301 | ||
324 | #region Console Commands | 302 | #region Console Commands |
325 | /// <summary> | 303 | /// <summary> |
304 | /// | ||
305 | /// </summary> | ||
306 | /// <param name="fileName"></param> | ||
307 | private void RunCommandScript(string fileName) | ||
308 | { | ||
309 | MainLog.Instance.Verbose("Running command script (" + fileName + ")"); | ||
310 | if (File.Exists(fileName)) | ||
311 | { | ||
312 | StreamReader readFile = File.OpenText(fileName); | ||
313 | string currentCommand = ""; | ||
314 | while ((currentCommand = readFile.ReadLine()) != null) | ||
315 | { | ||
316 | if (currentCommand != "") | ||
317 | { | ||
318 | MainLog.Instance.Verbose("Running '" + currentCommand + "'"); | ||
319 | MainLog.Instance.MainLogRunCommand(currentCommand); | ||
320 | } | ||
321 | } | ||
322 | } | ||
323 | else | ||
324 | { | ||
325 | MainLog.Instance.Error("Command script missing. Can not run commands"); | ||
326 | } | ||
327 | } | ||
328 | |||
329 | /// <summary> | ||
326 | /// Runs commands issued by the server console from the operator | 330 | /// Runs commands issued by the server console from the operator |
327 | /// </summary> | 331 | /// </summary> |
328 | /// <param name="command">The first argument of the parameter (the command)</param> | 332 | /// <param name="command">The first argument of the parameter (the command)</param> |
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index 65732bd..1a409bf 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs | |||
@@ -63,6 +63,10 @@ namespace OpenSim.Region.Communications.Local | |||
63 | { | 63 | { |
64 | Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here."); | 64 | Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here."); |
65 | } | 65 | } |
66 | else | ||
67 | { | ||
68 | m_Parent.InvenServices.CreateNewUserInventory(profile.UUID); | ||
69 | } | ||
66 | 70 | ||
67 | return profile; | 71 | return profile; |
68 | } | 72 | } |