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.MySQL/MySQLGridData.cs | 18 +++++++++---------
OpenSim/Framework/Data.MySQL/MySQLManager.cs | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
(limited to 'OpenSim/Framework/Data.MySQL')
diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index 5709bf0..9876ab1 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Data.MySQL
/// Maximum X coordinate
/// Maximum Y coordinate
///
- public SimProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax)
+ public RegionProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax)
{
try
{
@@ -111,9 +111,9 @@ namespace OpenSim.Framework.Data.MySQL
IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param);
IDataReader reader = result.ExecuteReader();
- SimProfileData row;
+ RegionProfileData row;
- List rows = new List();
+ List rows = new List();
while ((row = database.readSimRow(reader)) != null)
{
@@ -139,7 +139,7 @@ namespace OpenSim.Framework.Data.MySQL
///
/// Region location handle
/// Sim profile
- public SimProfileData GetProfileByHandle(ulong handle)
+ public RegionProfileData GetProfileByHandle(ulong handle)
{
try
{
@@ -151,7 +151,7 @@ namespace OpenSim.Framework.Data.MySQL
IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);
IDataReader reader = result.ExecuteReader();
- SimProfileData row = database.readSimRow(reader);
+ RegionProfileData row = database.readSimRow(reader);
reader.Close();
result.Dispose();
@@ -171,7 +171,7 @@ namespace OpenSim.Framework.Data.MySQL
///
/// The region UUID
/// The sim profile
- public SimProfileData GetProfileByLLUUID(LLUUID uuid)
+ public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
{
try
{
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Data.MySQL
IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
IDataReader reader = result.ExecuteReader();
- SimProfileData row = database.readSimRow(reader);
+ RegionProfileData row = database.readSimRow(reader);
reader.Close();
result.Dispose();
@@ -203,7 +203,7 @@ namespace OpenSim.Framework.Data.MySQL
///
/// The profile to add
/// Successful?
- public DataResponse AddProfile(SimProfileData profile)
+ public DataResponse AddProfile(RegionProfileData profile)
{
lock (database)
{
@@ -232,7 +232,7 @@ namespace OpenSim.Framework.Data.MySQL
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.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index d3f6976..8600d6b 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -267,9 +267,9 @@ namespace OpenSim.Framework.Data.MySQL
///
/// An active database reader
/// A region profile
- public SimProfileData readSimRow(IDataReader reader)
+ public RegionProfileData readSimRow(IDataReader reader)
{
- SimProfileData retval = new SimProfileData();
+ RegionProfileData retval = new RegionProfileData();
if (reader.Read())
{
@@ -583,7 +583,7 @@ namespace OpenSim.Framework.Data.MySQL
///
/// The region to insert
/// Success?
- public bool insertRegion(SimProfileData regiondata)
+ public bool insertRegion(RegionProfileData regiondata)
{
string sql = "REPLACE INTO regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
--
cgit v1.1