OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow specifying default region flags. Correct a typo.

avinationmerge
Melanie Thielker 2010-08-04 00:45:15 +02:00
parent e3cea888fb
commit d9ae837063
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Services/GridService/GridService.cs
View File

@ -124,7 +124,7 @@ namespace OpenSim.Services.GridService
{ {
// Regions reserved for the null key cannot be taken. // Regions reserved for the null key cannot be taken.
if ((string)region.Data["PrincipalID"] == UUID.Zero.ToString()) if ((string)region.Data["PrincipalID"] == UUID.Zero.ToString())
return "Region location us reserved"; return "Region location is reserved";
// Treat it as an auth request // Treat it as an auth request
// //
@ -210,6 +210,7 @@ namespace OpenSim.Services.GridService
{ {
int newFlags = 0; int newFlags = 0;
string regionName = rdata.RegionName.Trim().Replace(' ', '_'); string regionName = rdata.RegionName.Trim().Replace(' ', '_');
newFlags = ParseFlags(newFlags, gridConfig.GetString("DefaultRegionFlags", String.Empty));
newFlags = ParseFlags(newFlags, gridConfig.GetString("Region_" + regionName, String.Empty)); newFlags = ParseFlags(newFlags, gridConfig.GetString("Region_" + regionName, String.Empty));
newFlags = ParseFlags(newFlags, gridConfig.GetString("Region_" + rdata.RegionID.ToString(), String.Empty)); newFlags = ParseFlags(newFlags, gridConfig.GetString("Region_" + rdata.RegionID.ToString(), String.Empty));
rdata.Data["flags"] = newFlags.ToString(); rdata.Data["flags"] = newFlags.ToString();