aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorDiva Canto2009-09-27 16:02:19 -0700
committerDiva Canto2009-09-27 16:02:19 -0700
commitb17be045e47e8ad028ec1b2316f93d933a8d9736 (patch)
treee21d8e4bfc351df29ad039ee4b363df80d039c37 /OpenSim/Data/MySQL
parentGuarding the methods under if (m_Enabled) (diff)
parentMake the RegionData plugin store the RegionName (diff)
downloadopensim-SC_OLD-b17be045e47e8ad028ec1b2316f93d933a8d9736.zip
opensim-SC_OLD-b17be045e47e8ad028ec1b2316f93d933a8d9736.tar.gz
opensim-SC_OLD-b17be045e47e8ad028ec1b2316f93d933a8d9736.tar.bz2
opensim-SC_OLD-b17be045e47e8ad028ec1b2316f93d933a8d9736.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 8c99519..06ef624 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -216,6 +216,7 @@ namespace OpenSim.Data.MySQL
216 216
217 cmd.CommandText = update; 217 cmd.CommandText = update;
218 cmd.Parameters.AddWithValue("?regionID", data.RegionID.ToString()); 218 cmd.Parameters.AddWithValue("?regionID", data.RegionID.ToString());
219 cmd.Parameters.AddWithValue("?regionName", data.RegionName);
219 cmd.Parameters.AddWithValue("?scopeID", data.ScopeID.ToString()); 220 cmd.Parameters.AddWithValue("?scopeID", data.ScopeID.ToString());
220 cmd.Parameters.AddWithValue("?posX", data.posX.ToString()); 221 cmd.Parameters.AddWithValue("?posX", data.posX.ToString());
221 cmd.Parameters.AddWithValue("?posY", data.posY.ToString()); 222 cmd.Parameters.AddWithValue("?posY", data.posY.ToString());
@@ -224,9 +225,9 @@ namespace OpenSim.Data.MySQL
224 225
225 if (ExecuteNonQuery(cmd) < 1) 226 if (ExecuteNonQuery(cmd) < 1)
226 { 227 {
227 string insert = "insert into `" + m_Realm + "` (`uuid`, `ScopeID`, `locX`, `locY`, `sizeX`, `sizeY`, `" + 228 string insert = "insert into `" + m_Realm + "` (`uuid`, `ScopeID`, `locX`, `locY`, `sizeX`, `sizeY`, `regionName`, `" +
228 String.Join("`, `", fields) + 229 String.Join("`, `", fields) +
229 "`) values ( ?regionID, ?scopeID, ?posX, ?posY, ?sizeX, ?sizeY, ?" + String.Join(", ?", fields) + ")"; 230 "`) values ( ?regionID, ?scopeID, ?posX, ?posY, ?sizeX, ?sizeY, ?regionName, ?" + String.Join(", ?", fields) + ")";
230 231
231 cmd.CommandText = insert; 232 cmd.CommandText = insert;
232 233