ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Framework/RegionSettings.cs
This commit is contained in:
Melanie
2012-01-22 16:35:14 +00:00
parent ba3b0c69f1 24b20f6e4b
commit 02572ab1d3
7 changed files with 349 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Data/MySQL/MySQLEstateData.cs
View File

@@ -210,7 +210,6 @@ namespace OpenSim.Data.MySQL
}
LoadBanList(es);
es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");

70
OpenSim/Data/MySQL/MySQLSimulationData.cs
View File

@@ -861,6 +861,8 @@ namespace OpenSim.Data.MySQL
}
}
LoadSpawnPoints(rs);
return rs;
}
@@ -1032,6 +1034,7 @@ namespace OpenSim.Data.MySQL
}
}
}
SaveSpawnPoints(rs);
}
public virtual List<LandData> LoadLandObjects(UUID regionUUID)
@@ -1852,5 +1855,72 @@ namespace OpenSim.Data.MySQL
}
}
}
private void LoadSpawnPoints(RegionSettings rs)
{
rs.ClearSpawnPoints();
lock (m_dbLock)
{
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{
dbcon.Open();
using (MySqlCommand cmd = dbcon.CreateCommand())
{
cmd.CommandText = "select PointX, PointY, PointZ from spawn_points where RegionID = ?RegionID";
cmd.Parameters.AddWithValue("?RegionID", rs.RegionUUID.ToString());
using (IDataReader r = cmd.ExecuteReader())
{
while (r.Read())
{
Vector3 point = new Vector3();
point.X = (float)r["PointX"];
point.Y = (float)r["PointY"];
point.Z = (float)r["PointZ"];
rs.AddSpawnPoint(point);
}
}
}
}
}
}
private void SaveSpawnPoints(RegionSettings rs)
{
lock (m_dbLock)
{
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{
dbcon.Open();
using (MySqlCommand cmd = dbcon.CreateCommand())
{
cmd.CommandText = "delete from spawn_points where RegionID = ?RegionID";
cmd.Parameters.AddWithValue("?RegionID", rs.RegionUUID.ToString());
cmd.ExecuteNonQuery();
cmd.Parameters.Clear();
cmd.CommandText = "insert into spawn_points (RegionID, PointX, PointY, PointZ) values ( ?EstateID, ?PointX, ?PointY,?PointZ)";
foreach (Vector3 p in rs.SpawnPoints())
{
cmd.Parameters.AddWithValue("?EstateID", rs.RegionUUID.ToString());
cmd.Parameters.AddWithValue("?PointX", p.X);
cmd.Parameters.AddWithValue("?PointY", p.Y);
cmd.Parameters.AddWithValue("?PointZ", p.Z);
cmd.ExecuteNonQuery();
cmd.Parameters.Clear();
}
}
}
}
}
}
}

26
OpenSim/Data/MySQL/Resources/RegionStore.migrations
View File

@@ -841,4 +841,28 @@ alter table regionban ENGINE = MyISAM;
alter table regionsettings ENGINE = MyISAM;
alter table terrain ENGINE = MyISAM;
COMMIT;
COMMIT;
:VERSION 39 #--------------- Telehub support
BEGIN;
CREATE TABLE IF NOT EXISTS `spawn_points` (
`RegionID` varchar(36) COLLATE utf8_unicode_ci NOT NULL,
`PointX` float NOT NULL,
`PointY` float NOT NULL,
`PointZ` float NOT NULL,
KEY `RegionID` (`RegionID`)
) ENGINE=Innodb;
ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TelehubName` varchar(255) NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TelehubEnabled` tinyint(4) NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TelehubPosX` float NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TelehubPosY` float NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TelehubPosZ` float NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TelehubRotX` float NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TelehubRotY` float NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TelehubRotZ` float NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TelehubRotW` float NOT NULL;
COMMIT;