Merge branch 'master' into careminster

Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat

2 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 20f6af5..739bcc2 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -766,7 +766,7 @@ namespace OpenSim
                             foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name))
                                 MainConsole.Instance.OutputFormat("New Region Module (Shared): {0}", module.Name);
 
-                            foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name))
+                            foreach (IRegionModuleBase module in nonSharedModules.OrderBy(m => m.Name))
                                 MainConsole.Instance.OutputFormat("New Region Module (Non-Shared): {0}", module.Name);
                         }
                     );
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 4891c1a..f663c77 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -985,7 +985,7 @@ namespace OpenSim
             regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, true);
 
             string newName;
-            if (estateName != null && estateName != "")
+            if (!string.IsNullOrEmpty(estateName))
                 newName = estateName;
             else
                 newName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName);