aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService/GridService.cs
diff options
context:
space:
mode:
authorUbitUmarov2014-07-16 16:16:37 +0100
committerUbitUmarov2014-07-16 16:16:37 +0100
commitfc1bd4567db449ddcc99f142027e68e5b890b1f1 (patch)
treee61e1f2c4f7b6eb09bd427783569827a9bf29855 /OpenSim/Services/GridService/GridService.cs
parentMerge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in... (diff)
parentDifferentiate between requests only the owner should be able to do and those (diff)
downloadopensim-SC-fc1bd4567db449ddcc99f142027e68e5b890b1f1.zip
opensim-SC-fc1bd4567db449ddcc99f142027e68e5b890b1f1.tar.gz
opensim-SC-fc1bd4567db449ddcc99f142027e68e5b890b1f1.tar.bz2
opensim-SC-fc1bd4567db449ddcc99f142027e68e5b890b1f1.tar.xz
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/GridService/GridService.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index daebf8b..7f71835 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -283,7 +283,7 @@ namespace OpenSim.Services.GridService
283 283
284 int flags = Convert.ToInt32(region.Data["flags"]); 284 int flags = Convert.ToInt32(region.Data["flags"]);
285 285
286 if (!m_DeleteOnUnregister || (flags & (int)OpenSim.Framework.RegionFlags.Persistent) != 0) 286 if ((!m_DeleteOnUnregister) || ((flags & (int)OpenSim.Framework.RegionFlags.Persistent) != 0))
287 { 287 {
288 flags &= ~(int)OpenSim.Framework.RegionFlags.RegionOnline; 288 flags &= ~(int)OpenSim.Framework.RegionFlags.RegionOnline;
289 region.Data["flags"] = flags.ToString(); 289 region.Data["flags"] = flags.ToString();
@@ -298,7 +298,6 @@ namespace OpenSim.Services.GridService
298 } 298 }
299 299
300 return true; 300 return true;
301
302 } 301 }
303 302
304 return m_Database.Delete(regionID); 303 return m_Database.Delete(regionID);