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.SQLite/SQLiteGridData.cs | 14 +++++++------- OpenSim/Framework/Data.SQLite/SQLiteManager.cs | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'OpenSim/Framework/Data.SQLite') diff --git a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs index a7ff0f7..2fc80b4 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs @@ -86,7 +86,7 @@ namespace OpenSim.Framework.Data.SQLite /// 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; } @@ -96,7 +96,7 @@ namespace OpenSim.Framework.Data.SQLite /// /// Region location handle /// Sim profile - public SimProfileData GetProfileByHandle(ulong handle) + public RegionProfileData GetProfileByHandle(ulong handle) { Dictionary param = new Dictionary(); param["handle"] = handle.ToString(); @@ -104,7 +104,7 @@ namespace OpenSim.Framework.Data.SQLite IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param); IDataReader reader = result.ExecuteReader(); - SimProfileData row = database.getRow(reader); + RegionProfileData row = database.getRow(reader); reader.Close(); result.Dispose(); @@ -116,7 +116,7 @@ namespace OpenSim.Framework.Data.SQLite /// /// The region UUID /// The sim profile - public SimProfileData GetProfileByLLUUID(LLUUID uuid) + public RegionProfileData GetProfileByLLUUID(LLUUID uuid) { Dictionary param = new Dictionary(); param["uuid"] = uuid.ToStringHyphenated(); @@ -124,7 +124,7 @@ namespace OpenSim.Framework.Data.SQLite IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param); IDataReader reader = result.ExecuteReader(); - SimProfileData row = database.getRow(reader); + RegionProfileData row = database.getRow(reader); reader.Close(); result.Dispose(); @@ -136,7 +136,7 @@ namespace OpenSim.Framework.Data.SQLite /// /// The profile to add /// A dataresponse enum indicating success - public DataResponse AddProfile(SimProfileData profile) + public DataResponse AddProfile(RegionProfileData profile) { if (database.insertRow(profile)) { @@ -162,7 +162,7 @@ namespace OpenSim.Framework.Data.SQLite if (throwHissyFit) throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); - SimProfileData data = GetProfileByLLUUID(uuid); + RegionProfileData data = GetProfileByLLUUID(uuid); return (handle == data.regionHandle && authkey == data.regionSecret); } diff --git a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs index f73f480..5954fba 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs @@ -161,9 +161,9 @@ namespace OpenSim.Framework.Data.SQLite /// /// An active database reader /// A region profile - public SimProfileData getRow(IDataReader reader) + public RegionProfileData getRow(IDataReader reader) { - SimProfileData retval = new SimProfileData(); + RegionProfileData retval = new RegionProfileData(); if (reader.Read()) { @@ -217,7 +217,7 @@ namespace OpenSim.Framework.Data.SQLite /// /// The region to insert /// Success? - public bool insertRow(SimProfileData profile) + public bool insertRow(RegionProfileData profile) { string sql = "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, "; sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, "; -- cgit v1.1