From 44a7db0e44d175fcb854b7bfd11d3b97ed6b934c Mon Sep 17 00:00:00 2001 From: Tleiades Hax Date: Wed, 17 Oct 2007 09:36:11 +0000 Subject: Renamed SimProfileData to RegionProfileData --- OpenSim/Framework/Data.DB4o/DB4oGridData.cs | 9 +++++---- OpenSim/Framework/Data.DB4o/DB4oManager.cs | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'OpenSim/Framework/Data.DB4o') diff --git a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs index a01d1a4..bc7225a 100644 --- a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs +++ b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs @@ -56,7 +56,7 @@ namespace OpenSim.Framework.Data.DB4o /// maximum X coordinate /// maximum Y coordinate /// An array of region profiles - public SimProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d) + public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d) { return null; } @@ -66,7 +66,8 @@ namespace OpenSim.Framework.Data.DB4o /// /// The handle to search for /// A region profile - public SimProfileData GetProfileByHandle(ulong handle) { + public RegionProfileData GetProfileByHandle(ulong handle) + { lock (manager.simProfiles) { foreach (LLUUID UUID in manager.simProfiles.Keys) @@ -85,7 +86,7 @@ namespace OpenSim.Framework.Data.DB4o /// /// The region ID code /// A region profile - public SimProfileData GetProfileByLLUUID(LLUUID uuid) + public RegionProfileData GetProfileByLLUUID(LLUUID uuid) { lock (manager.simProfiles) { @@ -100,7 +101,7 @@ namespace OpenSim.Framework.Data.DB4o /// /// The profile to add /// A dataresponse enum indicating success - public DataResponse AddProfile(SimProfileData profile) + public DataResponse AddProfile(RegionProfileData profile) { lock (manager.simProfiles) { diff --git a/OpenSim/Framework/Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs index 224b842..10c8490 100644 --- a/OpenSim/Framework/Data.DB4o/DB4oManager.cs +++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs @@ -41,7 +41,7 @@ namespace OpenSim.Framework.Data.DB4o /// /// A list of the current regions connected (in-memory cache) /// - public Dictionary simProfiles = new Dictionary(); + public Dictionary simProfiles = new Dictionary(); /// /// Database File Name /// @@ -56,9 +56,10 @@ namespace OpenSim.Framework.Data.DB4o dbfl = db4odb; IObjectContainer database; database = Db4oFactory.OpenFile(dbfl); - IObjectSet result = database.Get(typeof(SimProfileData)); + IObjectSet result = database.Get(typeof(RegionProfileData)); // Loads the file into the in-memory cache - foreach(SimProfileData row in result) { + foreach (RegionProfileData row in result) + { simProfiles.Add(row.UUID, row); } database.Close(); @@ -69,7 +70,7 @@ namespace OpenSim.Framework.Data.DB4o /// /// The profile to add /// Successful? - public bool AddRow(SimProfileData row) + public bool AddRow(RegionProfileData row) { if (simProfiles.ContainsKey(row.UUID)) { -- cgit v1.1