aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBlueWall2012-01-23 14:54:43 -0500
committerBlueWall2012-01-23 14:54:43 -0500
commit8db64dc77f03e85b11fd0c78efed80e9cc7254bf (patch)
tree62e7d2e1408ee0fb4f66525b818f606e2132ed95 /OpenSim
parentAdd update to Telehub position and rotation before adding SpawnPoints (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-8db64dc77f03e85b11fd0c78efed80e9cc7254bf.zip
opensim-SC-8db64dc77f03e85b11fd0c78efed80e9cc7254bf.tar.gz
opensim-SC-8db64dc77f03e85b11fd0c78efed80e9cc7254bf.tar.bz2
opensim-SC-8db64dc77f03e85b11fd0c78efed80e9cc7254bf.tar.xz
Merge branch 'master' of /home/opensim/var/repo/opensim into telehub
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index a48b91b..b94f6ac 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1912,11 +1912,11 @@ namespace OpenSim.Data.MySQL
1912 1912
1913 cmd.Parameters.Clear(); 1913 cmd.Parameters.Clear();
1914 1914
1915 cmd.CommandText = "insert into spawn_points (RegionID, PointX, PointY, PointZ) values ( ?EstateID, ?PointX, ?PointY,?PointZ)"; 1915 cmd.CommandText = "insert into spawn_points (RegionID, PointX, PointY, PointZ) values ( ?RegionID, ?PointX, ?PointY,?PointZ)";
1916 1916
1917 foreach (Vector3 p in rs.SpawnPoints()) 1917 foreach (Vector3 p in rs.SpawnPoints())
1918 { 1918 {
1919 cmd.Parameters.AddWithValue("?EstateID", rs.RegionUUID.ToString()); 1919 cmd.Parameters.AddWithValue("?RegionID", rs.RegionUUID.ToString());
1920 cmd.Parameters.AddWithValue("?PointX", p.X); 1920 cmd.Parameters.AddWithValue("?PointX", p.X);
1921 cmd.Parameters.AddWithValue("?PointY", p.Y); 1921 cmd.Parameters.AddWithValue("?PointY", p.Y);
1922 cmd.Parameters.AddWithValue("?PointZ", p.Z); 1922 cmd.Parameters.AddWithValue("?PointZ", p.Z);