aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJohn Hurliman2010-09-11 20:43:06 -0700
committerJohn Hurliman2010-09-11 20:43:06 -0700
commit109b51758398d24a96a16900e8feb24361aee29d (patch)
treeaa696571c44fcf7afdad1931137a51f3074cd524 /OpenSim/Region/Framework
parentRe-enabled asset last access time logging in MySQL (diff)
downloadopensim-SC_OLD-109b51758398d24a96a16900e8feb24361aee29d.zip
opensim-SC_OLD-109b51758398d24a96a16900e8feb24361aee29d.tar.gz
opensim-SC_OLD-109b51758398d24a96a16900e8feb24361aee29d.tar.bz2
opensim-SC_OLD-109b51758398d24a96a16900e8feb24361aee29d.tar.xz
Fixed the naming mess around data connectors for simulation data
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityInventory.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs (renamed from OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
-rw-r--r--OpenSim/Region/Framework/StorageManager.cs10
6 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index ae2e844..54845fd 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Region.Framework.Interfaces
200 /// Backup the inventory to the given data store 200 /// Backup the inventory to the given data store
201 /// </summary> 201 /// </summary>
202 /// <param name="datastore"></param> 202 /// <param name="datastore"></param>
203 void ProcessInventoryBackup(IRegionDataStore datastore); 203 void ProcessInventoryBackup(ISimulationDataStore datastore);
204 204
205 uint MaskEffectivePermissions(); 205 uint MaskEffectivePermissions();
206 206
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
index 3e8e196..0a4d531 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
@@ -32,7 +32,7 @@ using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.Framework.Interfaces 33namespace OpenSim.Region.Framework.Interfaces
34{ 34{
35 public interface IRegionDataStore 35 public interface ISimulationDataStore
36 { 36 {
37 /// <summary> 37 /// <summary>
38 /// Initialises the data storage engine 38 /// Initialises the data storage engine
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index c434e4f..6b2e03e 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Framework.Scenes
57 57
58 public event OnTerrainTickDelegate OnTerrainTick; 58 public event OnTerrainTickDelegate OnTerrainTick;
59 59
60 public delegate void OnBackupDelegate(IRegionDataStore datastore, bool forceBackup); 60 public delegate void OnBackupDelegate(ISimulationDataStore datastore, bool forceBackup);
61 61
62 public event OnBackupDelegate OnBackup; 62 public event OnBackupDelegate OnBackup;
63 63
@@ -684,7 +684,7 @@ namespace OpenSim.Region.Framework.Scenes
684 } 684 }
685 } 685 }
686 686
687 public void TriggerOnBackup(IRegionDataStore dstore, bool forced) 687 public void TriggerOnBackup(ISimulationDataStore dstore, bool forced)
688 { 688 {
689 OnBackupDelegate handlerOnAttach = OnBackup; 689 OnBackupDelegate handlerOnAttach = OnBackup;
690 if (handlerOnAttach != null) 690 if (handlerOnAttach != null)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ba5e33c..4024328 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1378,7 +1378,7 @@ namespace OpenSim.Region.Framework.Scenes
1378 /// Processes backup. 1378 /// Processes backup.
1379 /// </summary> 1379 /// </summary>
1380 /// <param name="datastore"></param> 1380 /// <param name="datastore"></param>
1381 public virtual void ProcessBackup(IRegionDataStore datastore, bool forcedBackup) 1381 public virtual void ProcessBackup(ISimulationDataStore datastore, bool forcedBackup)
1382 { 1382 {
1383 if (!m_isBackedUp) 1383 if (!m_isBackedUp)
1384 { 1384 {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 87c4860..1984d45 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -848,7 +848,7 @@ namespace OpenSim.Region.Framework.Scenes
848 /// Process inventory backup 848 /// Process inventory backup
849 /// </summary> 849 /// </summary>
850 /// <param name="datastore"></param> 850 /// <param name="datastore"></param>
851 public void ProcessInventoryBackup(IRegionDataStore datastore) 851 public void ProcessInventoryBackup(ISimulationDataStore datastore)
852 { 852 {
853 if (HasInventoryChanged) 853 if (HasInventoryChanged)
854 { 854 {
diff --git a/OpenSim/Region/Framework/StorageManager.cs b/OpenSim/Region/Framework/StorageManager.cs
index 9375b4a..06caa18 100644
--- a/OpenSim/Region/Framework/StorageManager.cs
+++ b/OpenSim/Region/Framework/StorageManager.cs
@@ -36,9 +36,9 @@ namespace OpenSim.Region.Framework
36 { 36 {
37 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 37 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 38
39 protected IRegionDataStore m_dataStore; 39 protected ISimulationDataStore m_dataStore;
40 40
41 public IRegionDataStore DataStore 41 public ISimulationDataStore DataStore
42 { 42 {
43 get { return m_dataStore; } 43 get { return m_dataStore; }
44 } 44 }
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework
50 get { return m_estateDataStore; } 50 get { return m_estateDataStore; }
51 } 51 }
52 52
53 public StorageManager(IRegionDataStore storage) 53 public StorageManager(ISimulationDataStore storage)
54 { 54 {
55 m_dataStore = storage; 55 m_dataStore = storage;
56 } 56 }
@@ -68,8 +68,8 @@ namespace OpenSim.Region.Framework
68 68
69 if (typeInterface != null) 69 if (typeInterface != null)
70 { 70 {
71 IRegionDataStore plug = 71 ISimulationDataStore plug =
72 (IRegionDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 72 (ISimulationDataStore)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
73 plug.Initialise(connectionstring); 73 plug.Initialise(connectionstring);
74 74
75 m_dataStore = plug; 75 m_dataStore = plug;