aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorRobert Adams2013-11-15 14:56:13 -0800
committerRobert Adams2013-11-15 14:56:13 -0800
commit604b39cea908029c80aa8ee5ff3aee5c8000c0e4 (patch)
treebea875d6651531a030630e161b658c74d3aaf357 /OpenSim/Region/Application
parentMerge branch 'master' into varregion (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.zip
opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.gz
opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.bz2
opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 70d7ee9..7e7f42e 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -909,7 +909,7 @@ namespace OpenSim
909 regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, true); 909 regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, true);
910 910
911 string newName; 911 string newName;
912 if (estateName != null && estateName != "") 912 if (!string.IsNullOrEmpty(estateName))
913 newName = estateName; 913 newName = estateName;
914 else 914 else
915 newName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName); 915 newName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName);