diff options
author | Charles Krinke | 2008-11-19 23:57:19 +0000 |
---|---|---|
committer | Charles Krinke | 2008-11-19 23:57:19 +0000 |
commit | b0ee8fc271fdb12958c91f9e567ed21d35472f8d (patch) | |
tree | e9008832f2c67bc2e2a4631acb0afcc3e0135e11 | |
parent | * Add just enough to allow the scene presences test to establish a new user c... (diff) | |
download | opensim-SC_OLD-b0ee8fc271fdb12958c91f9e567ed21d35472f8d.zip opensim-SC_OLD-b0ee8fc271fdb12958c91f9e567ed21d35472f8d.tar.gz opensim-SC_OLD-b0ee8fc271fdb12958c91f9e567ed21d35472f8d.tar.bz2 opensim-SC_OLD-b0ee8fc271fdb12958c91f9e567ed21d35472f8d.tar.xz |
Mantis#2658. Thank you kindly, StrawberryFride for a patch that:
Keeping up with MySQL and SQLite. Small code changes and
another resource file to add.
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLRegionData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/Resources/011_RegionStore.sql | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs index 5faaec4..6298a19 100644 --- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs | |||
@@ -1048,6 +1048,9 @@ VALUES | |||
1048 | if (!primRow.IsNull("ClickAction")) | 1048 | if (!primRow.IsNull("ClickAction")) |
1049 | prim.ClickAction = Convert.ToByte(primRow["ClickAction"]); | 1049 | prim.ClickAction = Convert.ToByte(primRow["ClickAction"]); |
1050 | 1050 | ||
1051 | prim.CollisionSound = new UUID(primRow["CollisionSound"].ToString()); | ||
1052 | prim.CollisionSoundVolume = Convert.ToSingle(primRow["CollisionSoundVolume"]); | ||
1053 | |||
1051 | return prim; | 1054 | return prim; |
1052 | } | 1055 | } |
1053 | 1056 | ||
@@ -1419,6 +1422,9 @@ VALUES | |||
1419 | row["ClickAction"] = clickAction; | 1422 | row["ClickAction"] = clickAction; |
1420 | 1423 | ||
1421 | row["Material"] = prim.Material; | 1424 | row["Material"] = prim.Material; |
1425 | |||
1426 | row["CollisionSound"] = prim.CollisionSound.ToString(); | ||
1427 | row["CollisionSoundVolume"] = prim.CollisionSoundVolume; | ||
1422 | } | 1428 | } |
1423 | 1429 | ||
1424 | /// <summary> | 1430 | /// <summary> |
diff --git a/OpenSim/Data/MSSQL/Resources/011_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/011_RegionStore.sql new file mode 100644 index 0000000..2218216 --- /dev/null +++ b/OpenSim/Data/MSSQL/Resources/011_RegionStore.sql | |||
@@ -0,0 +1,6 @@ | |||
1 | BEGIN TRANSACTION | ||
2 | |||
3 | ALTER TABLE prims ADD CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000' | ||
4 | ALTER TABLE prims ADD CollisionSoundVolume float not null default 0.0 | ||
5 | |||
6 | COMMIT | ||