OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster 

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
avinationmerge
Melanie 2012-01-23 00:24:31 +00:00
parent 02572ab1d3 f7bd7c5901
commit cd2bf64b87
3 changed files with 44 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1011,7 +1011,11 @@ namespace OpenSim.Data.MySQL
"use_estate_sun, fixed_sun, sun_position, " + "use_estate_sun, fixed_sun, sun_position, " +
"covenant, Sandbox, sunvectorx, sunvectory, " + "covenant, Sandbox, sunvectorx, sunvectory, " +
"sunvectorz, loaded_creation_datetime, " + "sunvectorz, loaded_creation_datetime, " +
"loaded_creation_id, map_tile_ID, block_search, casino) values (?RegionUUID, ?BlockTerraform, " + "loaded_creation_id, map_tile_ID, block_search, casino, " +
"TelehubEnabled, TelehubObject, TelehubName, " +
"TelehubPosX, TelehubPosY, TelehubPosZ, " +
"TelehubRotX, TelehubRotY, TelehubRotZ, TelehubRotW) " +
"values (?RegionUUID, ?BlockTerraform, " +
"?BlockFly, ?AllowDamage, ?RestrictPushing, " + "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
"?AllowLandResell, ?AllowLandJoinDivide, " + "?AllowLandResell, ?AllowLandJoinDivide, " +
"?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " + "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
@ -1026,7 +1030,10 @@ namespace OpenSim.Data.MySQL
"?SunPosition, ?Covenant, ?Sandbox, " + "?SunPosition, ?Covenant, ?Sandbox, " +
"?SunVectorX, ?SunVectorY, ?SunVectorZ, " + "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
"?LoadedCreationDateTime, ?LoadedCreationID, " + "?LoadedCreationDateTime, ?LoadedCreationID, " +
"?TerrainImageID, ?block_search, ?casino)"; "?TerrainImageID, ?block_search, ?casino, " +
"?TelehubEnabled, ?TelehubObject, ?TelehubName, " +
"?TelehubPosX, ?TelehubPosY, ?TelehubPosZ, " +
"?TelehubRotX, ?TelehubRotY, ?TelehubRotZ, ?TelehubRotW )";
FillRegionSettingsCommand(cmd, rs); FillRegionSettingsCommand(cmd, rs);
@ -1314,6 +1321,20 @@ namespace OpenSim.Data.MySQL
newSettings.LoadedCreationID = (String) row["loaded_creation_id"]; newSettings.LoadedCreationID = (String) row["loaded_creation_id"];
newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]); newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]);
newSettings.HasTelehub = Convert.ToBoolean(row["TelehubEnabled"]);
newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]);
newSettings.TelehubName = (string) row["TelehubName"];
newSettings.TelehubPos = new Vector3 (
Convert.ToSingle(row["TelehubPosX"]),
Convert.ToSingle(row["TelehubPosY"]),
Convert.ToSingle(row["TelehubPosZ"])
);
newSettings.TelehubRot = new Quaternion (
Convert.ToSingle(row["TelehubRotX"]),
Convert.ToSingle(row["TelehubRotY"]),
Convert.ToSingle(row["TelehubRotZ"]),
Convert.ToSingle(row["TelehubRotW"])
);
newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]); newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
newSettings.Casino = Convert.ToBoolean(row["casino"]); newSettings.Casino = Convert.ToBoolean(row["casino"]);
@ -1654,6 +1675,16 @@ namespace OpenSim.Data.MySQL
cmd.Parameters.AddWithValue("block_search", settings.GodBlockSearch); cmd.Parameters.AddWithValue("block_search", settings.GodBlockSearch);
cmd.Parameters.AddWithValue("casino", settings.Casino); cmd.Parameters.AddWithValue("casino", settings.Casino);
cmd.Parameters.AddWithValue("TelehubEnabled", settings.HasTelehub);
cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject);
cmd.Parameters.AddWithValue("TelehubName", settings.TelehubName);
cmd.Parameters.AddWithValue("TelehubPosX", settings.TelehubPos.X);
cmd.Parameters.AddWithValue("TelehubPosY", settings.TelehubPos.Y);
cmd.Parameters.AddWithValue("TelehubPosZ", settings.TelehubPos.Z);
cmd.Parameters.AddWithValue("TelehubRotX", settings.TelehubRot.X);
cmd.Parameters.AddWithValue("TelehubRotY", settings.TelehubRot.Y);
cmd.Parameters.AddWithValue("TelehubRotZ", settings.TelehubRot.Z);
cmd.Parameters.AddWithValue("TelehubRotW", settings.TelehubRot.W);
} }
/// <summary> /// <summary>
@ -1906,11 +1937,11 @@ namespace OpenSim.Data.MySQL
cmd.Parameters.Clear(); cmd.Parameters.Clear();
cmd.CommandText = "insert into spawn_points (RegionID, PointX, PointY, PointZ) values ( ?EstateID, ?PointX, ?PointY,?PointZ)"; cmd.CommandText = "insert into spawn_points (RegionID, PointX, PointY, PointZ) values ( ?RegionID, ?PointX, ?PointY,?PointZ)";
foreach (Vector3 p in rs.SpawnPoints()) foreach (Vector3 p in rs.SpawnPoints())
{ {
cmd.Parameters.AddWithValue("?EstateID", rs.RegionUUID.ToString()); cmd.Parameters.AddWithValue("?RegionID", rs.RegionUUID.ToString());
cmd.Parameters.AddWithValue("?PointX", p.X); cmd.Parameters.AddWithValue("?PointX", p.X);
cmd.Parameters.AddWithValue("?PointY", p.Y); cmd.Parameters.AddWithValue("?PointY", p.Y);
cmd.Parameters.AddWithValue("?PointZ", p.Z); cmd.Parameters.AddWithValue("?PointZ", p.Z);

50
OpenSim/Framework/RegionSettings.cs
View File

@ -463,17 +463,14 @@ namespace OpenSim.Framework
} }
// Connected Telehub position // Connected Telehub position
private float m_TelehubPosX; private Vector3 m_TelehubPos;
private float m_TelehubPosY;
private float m_TelehubPosZ;
public Vector3 TelehubPos public Vector3 TelehubPos
{ {
get get
{ {
if (HasTelehub) if (HasTelehub)
{ {
Vector3 Pos = new Vector3(m_TelehubPosX, m_TelehubPosY, m_TelehubPosZ); return m_TelehubPos;
return Pos;
} }
else else
{ {
@ -482,53 +479,18 @@ namespace OpenSim.Framework
} }
set set
{ {
m_TelehubPos = value;
m_TelehubPosX = value.X;
m_TelehubPosY = value.Y;
m_TelehubPosZ = value.Z;
} }
} }
// Connected Telehub rotation // Connected Telehub rotation
private float m_TelehubRotX; private Quaternion m_TelehubRot;
private float m_TelehubRotY;
private float m_TelehubRotZ;
private float m_TelehubRotW;
public Quaternion TelehubRot public Quaternion TelehubRot
{ {
get get
{ { return m_TelehubRot; }
if (HasTelehub)
{
Quaternion quat = new Quaternion();
quat.X = m_TelehubRotX;
quat.Y = m_TelehubRotY;
quat.Z = m_TelehubRotZ;
quat.W = m_TelehubRotW;
return quat;
}
else
{
// What else to do??
Quaternion quat = new Quaternion();
quat.X = m_TelehubRotX;
quat.X = m_TelehubRotY;
quat.X = m_TelehubRotZ;
quat.X = m_TelehubRotW;
return quat;
}
}
set set
{ { m_TelehubRot = value; }
m_TelehubRotX = value.X;
m_TelehubRotY = value.Y;
m_TelehubRotZ = value.Z;
m_TelehubRotW = value.W;
}
} }
// Our Connected Telehub's SpawnPoints // Our Connected Telehub's SpawnPoints

3
TESTING.txt
View File

@ -69,3 +69,6 @@ Example
nunit-console2 OpenSim.Framework.Tests.dll (on linux) nunit-console2 OpenSim.Framework.Tests.dll (on linux)
nunit-console OpenSim.Framework.Tests.dll (on windows) nunit-console OpenSim.Framework.Tests.dll (on windows)
See the file OpenSim/Data/Tests/Resources/TestDataConnections.ini
for information to setup testing for data