aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-01-13 15:42:43 -0800
committerDiva Canto2010-01-13 15:42:43 -0800
commitab021aaa25d4ec4874ddc06eee77af9944d75926 (patch)
treec0c8126448c7cf58e86d8eb4d4adcd255688f493 /OpenSim
parentRemoved unnecessary debug message. (diff)
downloadopensim-SC_OLD-ab021aaa25d4ec4874ddc06eee77af9944d75926.zip
opensim-SC_OLD-ab021aaa25d4ec4874ddc06eee77af9944d75926.tar.gz
opensim-SC_OLD-ab021aaa25d4ec4874ddc06eee77af9944d75926.tar.bz2
opensim-SC_OLD-ab021aaa25d4ec4874ddc06eee77af9944d75926.tar.xz
Make region flag specs work for regions whose names contain spaces. Uses underscore in place of spaces. Region_Word1_Word2.
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/GridService/GridService.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index c48b10c..4f93ce5 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -127,10 +127,11 @@ namespace OpenSim.Services.GridService
127 else 127 else
128 { 128 {
129 rdata.Data["flags"] = "0"; 129 rdata.Data["flags"] = "0";
130 if (gridConfig != null) 130 if ((gridConfig != null) && rdata.RegionName != string.Empty)
131 { 131 {
132 int newFlags = 0; 132 int newFlags = 0;
133 newFlags = ParseFlags(newFlags, gridConfig.GetString("Region_" + rdata.RegionName, String.Empty)); 133 string regionName = rdata.RegionName.Trim().Replace(' ', '_');
134 newFlags = ParseFlags(newFlags, gridConfig.GetString("Region_" + regionName, String.Empty));
134 newFlags = ParseFlags(newFlags, gridConfig.GetString("Region_" + rdata.RegionID.ToString(), String.Empty)); 135 newFlags = ParseFlags(newFlags, gridConfig.GetString("Region_" + rdata.RegionID.ToString(), String.Empty));
135 rdata.Data["flags"] = newFlags.ToString(); 136 rdata.Data["flags"] = newFlags.ToString();
136 } 137 }