aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs5
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
3 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
index 0fcafcc..085b5ca 100644
--- a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
@@ -116,5 +116,10 @@ namespace OpenSim.Region.Framework.Interfaces
116 /// <param name="regionUUID">the region UUID</param> 116 /// <param name="regionUUID">the region UUID</param>
117 void RemoveRegionEnvironmentSettings(UUID regionUUID); 117 void RemoveRegionEnvironmentSettings(UUID regionUUID);
118 118
119 void SaveExtra(UUID regionID, string name, string value);
120
121 void RemoveExtra(UUID regionID, string name);
122
123 Dictionary<string, string> GetExtra(UUID regionID);
119 } 124 }
120} 125}
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
index e424976..3787ca0 100644
--- a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
@@ -127,6 +127,12 @@ namespace OpenSim.Region.Framework.Interfaces
127 /// <param name="regionUUID">the region UUID</param> 127 /// <param name="regionUUID">the region UUID</param>
128 void RemoveRegionEnvironmentSettings(UUID regionUUID); 128 void RemoveRegionEnvironmentSettings(UUID regionUUID);
129 129
130 void SaveExtra(UUID regionID, string name, string val);
131
132 void RemoveExtra(UUID regionID, string name);
133
134 Dictionary<string, string> GetExtra(UUID regionID);
135
130 void Shutdown(); 136 void Shutdown();
131 } 137 }
132} 138}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0967c34..59f49ea 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -174,6 +174,8 @@ namespace OpenSim.Region.Framework.Scenes
174 protected ICapabilitiesModule m_capsModule; 174 protected ICapabilitiesModule m_capsModule;
175 protected IGroupsModule m_groupsModule; 175 protected IGroupsModule m_groupsModule;
176 176
177 private Dictionary<string, string> m_extraSettings;
178
177 /// <summary> 179 /// <summary>
178 /// Current scene frame number 180 /// Current scene frame number
179 /// </summary> 181 /// </summary>
@@ -635,6 +637,8 @@ namespace OpenSim.Region.Framework.Scenes
635 // FIXME: It shouldn't be up to the database plugins to create this data - we should do it when a new 637 // FIXME: It shouldn't be up to the database plugins to create this data - we should do it when a new
636 // region is set up and avoid these gyrations. 638 // region is set up and avoid these gyrations.
637 RegionSettings rs = simDataService.LoadRegionSettings(RegionInfo.RegionID); 639 RegionSettings rs = simDataService.LoadRegionSettings(RegionInfo.RegionID);
640 m_extraSettings = simDataService.GetExtra(RegionInfo.RegionID);
641
638 bool updatedTerrainTextures = false; 642 bool updatedTerrainTextures = false;
639 if (rs.TerrainTexture1 == UUID.Zero) 643 if (rs.TerrainTexture1 == UUID.Zero)
640 { 644 {