diff options
author | Justin Clarke Casey | 2008-11-03 20:16:47 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-03 20:16:47 +0000 |
commit | c789a9d02af057e888f9dea50502ed0d787adf4c (patch) | |
tree | 40241da15aa27bb0b6ddb4b9127f9ca803a234b2 | |
parent | * minor: fussy little change to put colons in some log output (diff) | |
download | opensim-SC-c789a9d02af057e888f9dea50502ed0d787adf4c.zip opensim-SC-c789a9d02af057e888f9dea50502ed0d787adf4c.tar.gz opensim-SC-c789a9d02af057e888f9dea50502ed0d787adf4c.tar.bz2 opensim-SC-c789a9d02af057e888f9dea50502ed0d787adf4c.tar.xz |
* mionr: correct CONTRIBUTORS file for Plugh
-rw-r--r-- | CONTRIBUTORS.txt | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 489e784..228f09c 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
@@ -56,7 +56,7 @@ Patches | |||
56 | * John R Sohn (XenReborn) | 56 | * John R Sohn (XenReborn) |
57 | * Junta Kohime | 57 | * Junta Kohime |
58 | * Kayne | 58 | * Kayne |
59 | * kcoznes | 59 | * Kevin Cozens |
60 | * kinoc (Daxtron Labs) | 60 | * kinoc (Daxtron Labs) |
61 | * krtaylor (IBM) | 61 | * krtaylor (IBM) |
62 | * lulurun | 62 | * lulurun |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs index 36e90ba..c941b0e 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs | |||
@@ -460,7 +460,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge | |||
460 | string welcome = Path.Combine(_welcomes, regionName); | 460 | string welcome = Path.Combine(_welcomes, regionName); |
461 | if (File.Exists(welcome)) | 461 | if (File.Exists(welcome)) |
462 | { | 462 | { |
463 | _log.InfoFormat("[Concierge] UpdateWelcome: updating existing template \"{0}\"", welcome); | 463 | _log.InfoFormat("[Concierge]: UpdateWelcome: updating existing template \"{0}\"", welcome); |
464 | string welcomeBackup = String.Format("{0}~", welcome); | 464 | string welcomeBackup = String.Format("{0}~", welcome); |
465 | if (File.Exists(welcomeBackup)) | 465 | if (File.Exists(welcomeBackup)) |
466 | File.Delete(welcomeBackup); | 466 | File.Delete(welcomeBackup); |
@@ -473,7 +473,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge | |||
473 | } | 473 | } |
474 | catch (Exception e) | 474 | catch (Exception e) |
475 | { | 475 | { |
476 | _log.InfoFormat("[Concierge] UpdateWelcome failed: {0}", e.Message); | 476 | _log.InfoFormat("[Concierge]: UpdateWelcome failed: {0}", e.Message); |
477 | 477 | ||
478 | responseData["success"] = "false"; | 478 | responseData["success"] = "false"; |
479 | responseData["error"] = e.Message; | 479 | responseData["error"] = e.Message; |