diff options
| author | Justin Clarke Casey | 2008-12-23 20:41:52 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-12-23 20:41:52 +0000 |
| commit | e64d9b66a9cb58d66c76cca2984801e2d056504c (patch) | |
| tree | cd9291298404c2d99a5346465039fe3aecde4828 /OpenSim | |
| parent | * Correct build break, no idea how that one managed to slip by me (diff) | |
| download | opensim-SC-e64d9b66a9cb58d66c76cca2984801e2d056504c.zip opensim-SC-e64d9b66a9cb58d66c76cca2984801e2d056504c.tar.gz opensim-SC-e64d9b66a9cb58d66c76cca2984801e2d056504c.tar.bz2 opensim-SC-e64d9b66a9cb58d66c76cca2984801e2d056504c.tar.xz | |
* Fix http://opensimulator.org/mantis/view.php?id=2889
* Primshapes uuid wasn't being converted to raw (non-dashed) format before being used in primshapes delete command
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index b8da7c3..a06dbb3 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs | |||
| @@ -365,7 +365,7 @@ namespace OpenSim.Data.MySQL | |||
| 365 | 365 | ||
| 366 | for (int i = 0; i < uuids.Count; i++) | 366 | for (int i = 0; i < uuids.Count; i++) |
| 367 | { | 367 | { |
| 368 | cmd.Parameters.AddWithValue("UUID" + i, uuids[i].ToString()); | 368 | cmd.Parameters.AddWithValue("UUID" + i, Util.ToRawUuidString(uuids[i])); |
| 369 | } | 369 | } |
| 370 | 370 | ||
| 371 | ExecuteNonQuery(cmd); | 371 | ExecuteNonQuery(cmd); |
| @@ -1437,7 +1437,7 @@ namespace OpenSim.Data.MySQL | |||
| 1437 | s.ProfileEnd = Convert.ToUInt16(row["ProfileEnd"]); | 1437 | s.ProfileEnd = Convert.ToUInt16(row["ProfileEnd"]); |
| 1438 | s.ProfileCurve = Convert.ToByte(row["ProfileCurve"]); | 1438 | s.ProfileCurve = Convert.ToByte(row["ProfileCurve"]); |
| 1439 | s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]); | 1439 | s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]); |
| 1440 | byte[] textureEntry = (byte[]) row["Texture"]; | 1440 | byte[] textureEntry = (byte[]) row["Texture"]; |
| 1441 | s.TextureEntry = textureEntry; | 1441 | s.TextureEntry = textureEntry; |
| 1442 | 1442 | ||
| 1443 | s.ExtraParams = (byte[]) row["ExtraParams"]; | 1443 | s.ExtraParams = (byte[]) row["ExtraParams"]; |