From 109b51758398d24a96a16900e8feb24361aee29d Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Sat, 11 Sep 2010 20:43:06 -0700
Subject: Fixed the naming mess around data connectors for simulation data
---
OpenSim/Data/Null/NullDataStore.cs | 112 --------------------------------
OpenSim/Data/Null/NullSimulationData.cs | 112 ++++++++++++++++++++++++++++++++
2 files changed, 112 insertions(+), 112 deletions(-)
delete mode 100644 OpenSim/Data/Null/NullDataStore.cs
create mode 100644 OpenSim/Data/Null/NullSimulationData.cs
(limited to 'OpenSim/Data/Null')
diff --git a/OpenSim/Data/Null/NullDataStore.cs b/OpenSim/Data/Null/NullDataStore.cs
deleted file mode 100644
index 3ba44bb..0000000
--- a/OpenSim/Data/Null/NullDataStore.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Data.Null
-{
- ///
- /// NULL DataStore, do not store anything
- ///
- public class NullDataStore : IRegionDataStore
- {
- public void Initialise(string dbfile)
- {
- return;
- }
-
- public void Dispose()
- {
- }
-
- public void StoreRegionSettings(RegionSettings rs)
- {
- }
- public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
- {
- //This connector doesn't support the windlight module yet
- //Return default LL windlight settings
- return new RegionLightShareData();
- }
- public void StoreRegionWindlightSettings(RegionLightShareData wl)
- {
- //This connector doesn't support the windlight module yet
- }
- public RegionSettings LoadRegionSettings(UUID regionUUID)
- {
- return null;
- }
-
- public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
- {
- }
-
- public void RemoveObject(UUID obj, UUID regionUUID)
- {
- }
-
- // see IRegionDatastore
- public void StorePrimInventory(UUID primID, ICollection items)
- {
- }
-
- public List LoadObjects(UUID regionUUID)
- {
- return new List();
- }
-
- public void StoreTerrain(double[,] ter, UUID regionID)
- {
- }
-
- public double[,] LoadTerrain(UUID regionID)
- {
- return null;
- }
-
- public void RemoveLandObject(UUID globalID)
- {
- }
-
- public void StoreLandObject(ILandObject land)
- {
- }
-
- public List LoadLandObjects(UUID regionUUID)
- {
- return new List();
- }
-
- public void Shutdown()
- {
- }
- }
-}
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
new file mode 100644
index 0000000..9c7da8e
--- /dev/null
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Data.Null
+{
+ ///
+ /// NULL DataStore, do not store anything
+ ///
+ public class NullSimulationData : ISimulationDataStore
+ {
+ public void Initialise(string dbfile)
+ {
+ return;
+ }
+
+ public void Dispose()
+ {
+ }
+
+ public void StoreRegionSettings(RegionSettings rs)
+ {
+ }
+ public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
+ {
+ //This connector doesn't support the windlight module yet
+ //Return default LL windlight settings
+ return new RegionLightShareData();
+ }
+ public void StoreRegionWindlightSettings(RegionLightShareData wl)
+ {
+ //This connector doesn't support the windlight module yet
+ }
+ public RegionSettings LoadRegionSettings(UUID regionUUID)
+ {
+ return null;
+ }
+
+ public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
+ {
+ }
+
+ public void RemoveObject(UUID obj, UUID regionUUID)
+ {
+ }
+
+ // see IRegionDatastore
+ public void StorePrimInventory(UUID primID, ICollection items)
+ {
+ }
+
+ public List LoadObjects(UUID regionUUID)
+ {
+ return new List();
+ }
+
+ public void StoreTerrain(double[,] ter, UUID regionID)
+ {
+ }
+
+ public double[,] LoadTerrain(UUID regionID)
+ {
+ return null;
+ }
+
+ public void RemoveLandObject(UUID globalID)
+ {
+ }
+
+ public void StoreLandObject(ILandObject land)
+ {
+ }
+
+ public List LoadLandObjects(UUID regionUUID)
+ {
+ return new List();
+ }
+
+ public void Shutdown()
+ {
+ }
+ }
+}
--
cgit v1.1