aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2012-08-15 01:08:30 +0200
committerMelanie2012-08-15 01:08:30 +0200
commit7d1bec00d5cda6d7024a3d64b5913b5c08c15a3f (patch)
treeb069ddb4607d598ff93b60103ba5756cca3520ae /OpenSim/Region
parentRemove NPC debug spam (diff)
downloadopensim-SC_OLD-7d1bec00d5cda6d7024a3d64b5913b5c08c15a3f.zip
opensim-SC_OLD-7d1bec00d5cda6d7024a3d64b5913b5c08c15a3f.tar.gz
opensim-SC_OLD-7d1bec00d5cda6d7024a3d64b5913b5c08c15a3f.tar.bz2
opensim-SC_OLD-7d1bec00d5cda6d7024a3d64b5913b5c08c15a3f.tar.xz
Add a skeleton for a name value storage associated with regions
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs6
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
3 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
index ccb583d..3e97a7a 100644
--- a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
@@ -117,5 +117,11 @@ namespace OpenSim.Region.Framework.Interfaces
117 void RemoveRegionEnvironmentSettings(UUID regionUUID); 117 void RemoveRegionEnvironmentSettings(UUID regionUUID);
118 118
119 UUID[] GetObjectIDs(UUID regionID); 119 UUID[] GetObjectIDs(UUID regionID);
120
121 void SaveExtra(UUID regionID, string name, string value);
122
123 void RemoveExtra(UUID regionID, string name);
124
125 Dictionary<string, string> GetExtra(UUID regionID);
120 } 126 }
121} 127}
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
index d7c80f7..17bd48b 100644
--- a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
@@ -128,6 +128,12 @@ namespace OpenSim.Region.Framework.Interfaces
128 /// <param name="regionUUID">the region UUID</param> 128 /// <param name="regionUUID">the region UUID</param>
129 void RemoveRegionEnvironmentSettings(UUID regionUUID); 129 void RemoveRegionEnvironmentSettings(UUID regionUUID);
130 130
131 void SaveExtra(UUID regionID, string name, string val);
132
133 void RemoveExtra(UUID regionID, string name);
134
135 Dictionary<string, string> GetExtra(UUID regionID);
136
131 void Shutdown(); 137 void Shutdown();
132 } 138 }
133} 139}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1fc4c52..79ebc6e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -177,6 +177,8 @@ namespace OpenSim.Region.Framework.Scenes
177 protected ICapabilitiesModule m_capsModule; 177 protected ICapabilitiesModule m_capsModule;
178 protected IGroupsModule m_groupsModule; 178 protected IGroupsModule m_groupsModule;
179 179
180 private Dictionary<string, string> m_extraSettings;
181
180 /// <summary> 182 /// <summary>
181 /// Current scene frame number 183 /// Current scene frame number
182 /// </summary> 184 /// </summary>
@@ -658,6 +660,8 @@ namespace OpenSim.Region.Framework.Scenes
658 // FIXME: It shouldn't be up to the database plugins to create this data - we should do it when a new 660 // FIXME: It shouldn't be up to the database plugins to create this data - we should do it when a new
659 // region is set up and avoid these gyrations. 661 // region is set up and avoid these gyrations.
660 RegionSettings rs = simDataService.LoadRegionSettings(RegionInfo.RegionID); 662 RegionSettings rs = simDataService.LoadRegionSettings(RegionInfo.RegionID);
663 m_extraSettings = simDataService.GetExtra(RegionInfo.RegionID);
664
661 bool updatedTerrainTextures = false; 665 bool updatedTerrainTextures = false;
662 if (rs.TerrainTexture1 == UUID.Zero) 666 if (rs.TerrainTexture1 == UUID.Zero)
663 { 667 {