aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLSimulationData.cs
diff options
context:
space:
mode:
authorMandarinka Tasty2016-12-04 07:10:13 +0100
committerUbitUmarov2016-12-04 17:18:56 +0000
commit7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9 (patch)
treeb065a6dc4641b3d0ff1b805fdcb76bd4a2248518 /OpenSim/Data/MySQL/MySQLSimulationData.cs
parenta few changes to new GetDisplaynames and friends (diff)
downloadopensim-SC-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.zip
opensim-SC-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.gz
opensim-SC-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.bz2
opensim-SC-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.xz
The new Constant: integer OBJECT_REZZER_KEY = 32;
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLSimulationData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index ab24b76..2aaa2ff 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -167,7 +167,7 @@ namespace OpenSim.Data.MySQL
167 "SitTargetOrientY, SitTargetOrientZ, " + 167 "SitTargetOrientY, SitTargetOrientZ, " +
168 "RegionUUID, CreatorID, " + 168 "RegionUUID, CreatorID, " +
169 "OwnerID, GroupID, " + 169 "OwnerID, GroupID, " +
170 "LastOwnerID, SceneGroupID, " + 170 "LastOwnerID, RezzerID, SceneGroupID, " +
171 "PayPrice, PayButton1, " + 171 "PayPrice, PayButton1, " +
172 "PayButton2, PayButton3, " + 172 "PayButton2, PayButton3, " +
173 "PayButton4, LoopedSound, " + 173 "PayButton4, LoopedSound, " +
@@ -207,7 +207,7 @@ namespace OpenSim.Data.MySQL
207 "?SitTargetOrientW, ?SitTargetOrientX, " + 207 "?SitTargetOrientW, ?SitTargetOrientX, " +
208 "?SitTargetOrientY, ?SitTargetOrientZ, " + 208 "?SitTargetOrientY, ?SitTargetOrientZ, " +
209 "?RegionUUID, ?CreatorID, ?OwnerID, " + 209 "?RegionUUID, ?CreatorID, ?OwnerID, " +
210 "?GroupID, ?LastOwnerID, ?SceneGroupID, " + 210 "?GroupID, ?LastOwnerID, ?RezzerID, ?SceneGroupID, " +
211 "?PayPrice, ?PayButton1, ?PayButton2, " + 211 "?PayPrice, ?PayButton1, ?PayButton2, " +
212 "?PayButton3, ?PayButton4, ?LoopedSound, " + 212 "?PayButton3, ?PayButton4, ?LoopedSound, " +
213 "?LoopedSoundGain, ?TextureAnimation, " + 213 "?LoopedSoundGain, ?TextureAnimation, " +
@@ -1279,6 +1279,10 @@ namespace OpenSim.Data.MySQL
1279 prim.OwnerID = DBGuid.FromDB(row["OwnerID"]); 1279 prim.OwnerID = DBGuid.FromDB(row["OwnerID"]);
1280 prim.GroupID = DBGuid.FromDB(row["GroupID"]); 1280 prim.GroupID = DBGuid.FromDB(row["GroupID"]);
1281 prim.LastOwnerID = DBGuid.FromDB(row["LastOwnerID"]); 1281 prim.LastOwnerID = DBGuid.FromDB(row["LastOwnerID"]);
1282 if (row["RezzerID"] != DBNull.Value)
1283 prim.RezzerID = DBGuid.FromDB(row["RezzerID"]);
1284 else
1285 prim.RezzerID = UUID.Zero;
1282 1286
1283 // explicit conversion of integers is required, which sort 1287 // explicit conversion of integers is required, which sort
1284 // of sucks. No idea if there is a shortcut here or not. 1288 // of sucks. No idea if there is a shortcut here or not.
@@ -1682,6 +1686,7 @@ namespace OpenSim.Data.MySQL
1682 cmd.Parameters.AddWithValue("OwnerID", prim.OwnerID.ToString()); 1686 cmd.Parameters.AddWithValue("OwnerID", prim.OwnerID.ToString());
1683 cmd.Parameters.AddWithValue("GroupID", prim.GroupID.ToString()); 1687 cmd.Parameters.AddWithValue("GroupID", prim.GroupID.ToString());
1684 cmd.Parameters.AddWithValue("LastOwnerID", prim.LastOwnerID.ToString()); 1688 cmd.Parameters.AddWithValue("LastOwnerID", prim.LastOwnerID.ToString());
1689 cmd.Parameters.AddWithValue("RezzerID", prim.RezzerID.ToString());
1685 cmd.Parameters.AddWithValue("OwnerMask", prim.OwnerMask); 1690 cmd.Parameters.AddWithValue("OwnerMask", prim.OwnerMask);
1686 cmd.Parameters.AddWithValue("NextOwnerMask", prim.NextOwnerMask); 1691 cmd.Parameters.AddWithValue("NextOwnerMask", prim.NextOwnerMask);
1687 cmd.Parameters.AddWithValue("GroupMask", prim.GroupMask); 1692 cmd.Parameters.AddWithValue("GroupMask", prim.GroupMask);