diff options
author | Melanie Thielker | 2008-07-18 02:40:47 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-07-18 02:40:47 +0000 |
commit | 263633e274082135b21b8183b92280b768d18883 (patch) | |
tree | f6104eef3633a8b454a4e8ac09d15182970c6bae /OpenSim/Framework/RegionSettings.cs | |
parent | added region port number to output of "show regions" command (diff) | |
download | opensim-SC_OLD-263633e274082135b21b8183b92280b768d18883.zip opensim-SC_OLD-263633e274082135b21b8183b92280b768d18883.tar.gz opensim-SC_OLD-263633e274082135b21b8183b92280b768d18883.tar.bz2 opensim-SC_OLD-263633e274082135b21b8183b92280b768d18883.tar.xz |
Patch #9151
Makes the estate dialog fully functional. Implements all client facing functionality. Moves estate data from estate_settings.xml, which is used to provide defaults, to the region data store. Creates one estate for each region, and places the region in it. Converts all region bans to estate bans.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/RegionSettings.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index be57c1b..13fabaf 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs | |||
@@ -162,6 +162,8 @@ namespace OpenSim.Framework | |||
162 | (flags & Simulator.RegionFlags.SkipPhysics) != 0; | 162 | (flags & Simulator.RegionFlags.SkipPhysics) != 0; |
163 | m_FixedSun = | 163 | m_FixedSun = |
164 | (flags & Simulator.RegionFlags.SunFixed) != 0; | 164 | (flags & Simulator.RegionFlags.SunFixed) != 0; |
165 | m_Sandbox = | ||
166 | (flags & Simulator.RegionFlags.Sandbox) != 0; | ||
165 | break; | 167 | break; |
166 | case "max_agents": | 168 | case "max_agents": |
167 | m_AgentLimit = (int)value; | 169 | m_AgentLimit = (int)value; |
@@ -231,7 +233,8 @@ namespace OpenSim.Framework | |||
231 | 233 | ||
232 | public void Save() | 234 | public void Save() |
233 | { | 235 | { |
234 | OnSave(this); | 236 | if(OnSave != null) |
237 | OnSave(this); | ||
235 | } | 238 | } |
236 | 239 | ||
237 | private LLUUID m_RegionUUID = LLUUID.Zero; | 240 | private LLUUID m_RegionUUID = LLUUID.Zero; |
@@ -474,6 +477,14 @@ namespace OpenSim.Framework | |||
474 | set { m_UseEstateSun = value; } | 477 | set { m_UseEstateSun = value; } |
475 | } | 478 | } |
476 | 479 | ||
480 | private bool m_Sandbox = false; | ||
481 | |||
482 | public bool Sandbox | ||
483 | { | ||
484 | get { return m_Sandbox; } | ||
485 | set { m_Sandbox = value; } | ||
486 | } | ||
487 | |||
477 | private LLVector3 m_SunVector; | 488 | private LLVector3 m_SunVector; |
478 | 489 | ||
479 | public LLVector3 SunVector | 490 | public LLVector3 SunVector |