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/Region/Environment/Scenes | |
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/Region/Environment/Scenes/Scene.cs | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index ad9646f..4aa9cf9 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -271,9 +271,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
271 | // Load region settings | 271 | // Load region settings |
272 | // First try database | 272 | // First try database |
273 | m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID); | 273 | m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID); |
274 | |||
275 | // Hook up save event | 274 | // Hook up save event |
276 | m_regInfo.RegionSettings.OnSave += m_storageManager.DataStore.StoreRegionSettings; | 275 | m_regInfo.RegionSettings.OnSave += m_storageManager.DataStore.StoreRegionSettings; |
276 | if(m_storageManager.EstateDataStore != null) | ||
277 | { | ||
278 | m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID); | ||
279 | m_regInfo.EstateSettings.OnSave += m_storageManager.EstateDataStore.StoreEstateSettings; | ||
280 | } | ||
281 | |||
277 | 282 | ||
278 | 283 | ||
279 | //Bind Storage Manager functions to some land manager functions for this scene | 284 | //Bind Storage Manager functions to some land manager functions for this scene |
@@ -1445,20 +1450,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
1445 | } | 1450 | } |
1446 | } | 1451 | } |
1447 | 1452 | ||
1448 | public void LoadRegionBanlist() | ||
1449 | { | ||
1450 | List<RegionBanListItem> regionbanlist = m_storageManager.DataStore.LoadRegionBanList(m_regInfo.RegionID); | ||
1451 | m_regInfo.regionBanlist = regionbanlist; | ||
1452 | } | ||
1453 | public void AddToRegionBanlist(RegionBanListItem item) | ||
1454 | { | ||
1455 | m_storageManager.DataStore.AddToRegionBanlist(item); | ||
1456 | } | ||
1457 | |||
1458 | public void RemoveFromRegionBanlist(RegionBanListItem item) | ||
1459 | { | ||
1460 | m_storageManager.DataStore.RemoveFromRegionBanlist(item); | ||
1461 | } | ||
1462 | #endregion | 1453 | #endregion |
1463 | 1454 | ||
1464 | #region Primitives Methods | 1455 | #region Primitives Methods |
@@ -1916,7 +1907,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1916 | SceneObjectPart RootPrim = GetSceneObjectPart(primID); | 1907 | SceneObjectPart RootPrim = GetSceneObjectPart(primID); |
1917 | if (RootPrim != null) | 1908 | if (RootPrim != null) |
1918 | { | 1909 | { |
1919 | if (m_regInfo.CheckIfUserBanned(RootPrim.OwnerID)) | 1910 | if (m_regInfo.EstateSettings.IsBanned(RootPrim.OwnerID)) |
1920 | { | 1911 | { |
1921 | SceneObjectGroup grp = RootPrim.ParentGroup; | 1912 | SceneObjectGroup grp = RootPrim.ParentGroup; |
1922 | if (grp != null) | 1913 | if (grp != null) |
@@ -2410,7 +2401,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2410 | { | 2401 | { |
2411 | if (regionHandle == m_regInfo.RegionHandle) | 2402 | if (regionHandle == m_regInfo.RegionHandle) |
2412 | { | 2403 | { |
2413 | if (m_regInfo.CheckIfUserBanned(agent.AgentID)) | 2404 | if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) |
2414 | { | 2405 | { |
2415 | m_log.WarnFormat( | 2406 | m_log.WarnFormat( |
2416 | "[CONNECTION DEBUGGING]: Denied access to: {0} [{1}] at {2} because the user is on the region banlist", | 2407 | "[CONNECTION DEBUGGING]: Denied access to: {0} [{1}] at {2} because the user is on the region banlist", |