diff options
author | Jeff Ames | 2008-05-25 23:27:38 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-25 23:27:38 +0000 |
commit | 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d (patch) | |
tree | b010c015ac515fe2a3dd0c9f89c16cbc6383d685 /OpenSim/Region/Application | |
parent | * A hacky Top Scripts display. It isn't accurate as far as ms accounting, ho... (diff) | |
download | opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.zip opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.gz opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.bz2 opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimMainConsole.cs | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index cf12be7..dec0311 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim | |||
66 | /// The file used to load and save prim backup xml if none has been specified | 66 | /// The file used to load and save prim backup xml if none has been specified |
67 | /// </summary> | 67 | /// </summary> |
68 | protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; | 68 | protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; |
69 | 69 | ||
70 | /// <summary> | 70 | /// <summary> |
71 | /// The file use to load and save an opensim archive if none has been specified | 71 | /// The file use to load and save an opensim archive if none has been specified |
72 | /// </summary> | 72 | /// </summary> |
@@ -354,7 +354,7 @@ namespace OpenSim | |||
354 | } | 354 | } |
355 | 355 | ||
356 | /// <summary> | 356 | /// <summary> |
357 | /// Enhance the version string with extra information if it's available. | 357 | /// Enhance the version string with extra information if it's available. |
358 | /// </summary> | 358 | /// </summary> |
359 | protected void EnhanceVersionInformation() | 359 | protected void EnhanceVersionInformation() |
360 | { | 360 | { |
@@ -387,7 +387,7 @@ namespace OpenSim | |||
387 | if (!string.IsNullOrEmpty(buildVersion)) | 387 | if (!string.IsNullOrEmpty(buildVersion)) |
388 | { | 388 | { |
389 | VersionInfo.Version += ", SVN build r" + buildVersion; | 389 | VersionInfo.Version += ", SVN build r" + buildVersion; |
390 | } | 390 | } |
391 | else | 391 | else |
392 | { | 392 | { |
393 | VersionInfo.Version += ", SVN build revision not available"; | 393 | VersionInfo.Version += ", SVN build revision not available"; |
@@ -407,9 +407,9 @@ namespace OpenSim | |||
407 | if (OSString.Length > 45) | 407 | if (OSString.Length > 45) |
408 | { | 408 | { |
409 | OSString = OSString.Substring(0, 45); | 409 | OSString = OSString.Substring(0, 45); |
410 | } | 410 | } |
411 | 411 | ||
412 | VersionInfo.Version += ", OS " + OSString; | 412 | VersionInfo.Version += ", OS " + OSString; |
413 | } | 413 | } |
414 | 414 | ||
415 | /// <summary> | 415 | /// <summary> |
@@ -418,7 +418,7 @@ namespace OpenSim | |||
418 | protected void InternalStartUp() | 418 | protected void InternalStartUp() |
419 | { | 419 | { |
420 | EnhanceVersionInformation(); | 420 | EnhanceVersionInformation(); |
421 | 421 | ||
422 | m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n"); | 422 | m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n"); |
423 | 423 | ||
424 | m_stats = StatsManager.StartCollectingSimExtraStats(); | 424 | m_stats = StatsManager.StartCollectingSimExtraStats(); |
@@ -710,7 +710,7 @@ namespace OpenSim | |||
710 | /// </summary> | 710 | /// </summary> |
711 | protected class SimStatusHandler : IStreamedRequestHandler | 711 | protected class SimStatusHandler : IStreamedRequestHandler |
712 | { | 712 | { |
713 | public byte[] Handle(string path, Stream request, | 713 | public byte[] Handle(string path, Stream request, |
714 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 714 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
715 | { | 715 | { |
716 | return Encoding.UTF8.GetBytes("OK"); | 716 | return Encoding.UTF8.GetBytes("OK"); |
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs index dd14c59..e4590f2 100644 --- a/OpenSim/Region/Application/OpenSimMainConsole.cs +++ b/OpenSim/Region/Application/OpenSimMainConsole.cs | |||
@@ -291,7 +291,7 @@ namespace OpenSim | |||
291 | break; | 291 | break; |
292 | case "save-xml": | 292 | case "save-xml": |
293 | m_log.Error("[CONSOLE]: PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason."); | 293 | m_log.Error("[CONSOLE]: PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason."); |
294 | 294 | ||
295 | if (cmdparams.Length > 0) | 295 | if (cmdparams.Length > 0) |
296 | { | 296 | { |
297 | m_sceneManager.SaveCurrentSceneToXml(cmdparams[0]); | 297 | m_sceneManager.SaveCurrentSceneToXml(cmdparams[0]); |
@@ -304,7 +304,7 @@ namespace OpenSim | |||
304 | 304 | ||
305 | case "load-xml": | 305 | case "load-xml": |
306 | m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason."); | 306 | m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason."); |
307 | 307 | ||
308 | LLVector3 loadOffset = new LLVector3(0, 0, 0); | 308 | LLVector3 loadOffset = new LLVector3(0, 0, 0); |
309 | if (cmdparams.Length > 0) | 309 | if (cmdparams.Length > 0) |
310 | { | 310 | { |
@@ -359,10 +359,10 @@ namespace OpenSim | |||
359 | m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME); | 359 | m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME); |
360 | } | 360 | } |
361 | break; | 361 | break; |
362 | 362 | ||
363 | case "save-oar": | 363 | case "save-oar": |
364 | m_log.Error("[CONSOLE]: Don't use me - I haven't yet been sufficiently implemented!"); | 364 | m_log.Error("[CONSOLE]: Don't use me - I haven't yet been sufficiently implemented!"); |
365 | 365 | ||
366 | if (cmdparams.Length > 0) | 366 | if (cmdparams.Length > 0) |
367 | { | 367 | { |
368 | m_sceneManager.SaveCurrentSceneToArchive(cmdparams[0]); | 368 | m_sceneManager.SaveCurrentSceneToArchive(cmdparams[0]); |
@@ -371,7 +371,7 @@ namespace OpenSim | |||
371 | { | 371 | { |
372 | m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME); | 372 | m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME); |
373 | } | 373 | } |
374 | break; | 374 | break; |
375 | 375 | ||
376 | case "plugin": | 376 | case "plugin": |
377 | m_sceneManager.SendCommandToPluginModules(cmdparams); | 377 | m_sceneManager.SendCommandToPluginModules(cmdparams); |
@@ -597,9 +597,9 @@ namespace OpenSim | |||
597 | 597 | ||
598 | case "users": | 598 | case "users": |
599 | IList agents = m_sceneManager.GetCurrentSceneAvatars(); | 599 | IList agents = m_sceneManager.GetCurrentSceneAvatars(); |
600 | 600 | ||
601 | m_console.Notice(String.Format("\nAgents connected: {0}\n", agents.Count)); | 601 | m_console.Notice(String.Format("\nAgents connected: {0}\n", agents.Count)); |
602 | 602 | ||
603 | m_console.Notice( | 603 | m_console.Notice( |
604 | String.Format("{0,-16}{1,-16}{2,-37}{3,-16}", "Firstname", "Lastname", | 604 | String.Format("{0,-16}{1,-16}{2,-37}{3,-16}", "Firstname", "Lastname", |
605 | "Agent ID","Region")); | 605 | "Agent ID","Region")); |
@@ -627,7 +627,7 @@ namespace OpenSim | |||
627 | presence.UUID, | 627 | presence.UUID, |
628 | regionName)); | 628 | regionName)); |
629 | } | 629 | } |
630 | 630 | ||
631 | m_console.Notice(""); | 631 | m_console.Notice(""); |
632 | break; | 632 | break; |
633 | 633 | ||