diff options
| author | root | 2019-03-11 23:41:26 +0000 |
|---|---|---|
| committer | root | 2019-03-11 23:41:26 +0000 |
| commit | c7a02dc058018429fca8fb0c979785be34bebaf6 (patch) | |
| tree | a364249657222c201c9880ec355dafbcb7f99d9a /OpenSim/Data/MySQL | |
| parent | Should have been in the last commit (diff) | |
| parent | errr use invariantculture compare not current (diff) | |
| download | opensim-SC-c7a02dc058018429fca8fb0c979785be34bebaf6.zip opensim-SC-c7a02dc058018429fca8fb0c979785be34bebaf6.tar.gz opensim-SC-c7a02dc058018429fca8fb0c979785be34bebaf6.tar.bz2 opensim-SC-c7a02dc058018429fca8fb0c979785be34bebaf6.tar.xz | |
Merge branch 'master' of brain.opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index c5d7c47..3db30d8 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
| @@ -1403,7 +1403,10 @@ namespace OpenSim.Data.MySQL | |||
| 1403 | 1403 | ||
| 1404 | prim.Sound = DBGuid.FromDB(row["LoopedSound"].ToString()); | 1404 | prim.Sound = DBGuid.FromDB(row["LoopedSound"].ToString()); |
| 1405 | prim.SoundGain = (float)(double)row["LoopedSoundGain"]; | 1405 | prim.SoundGain = (float)(double)row["LoopedSoundGain"]; |
| 1406 | prim.SoundFlags = 1; // If it's persisted at all, it's looped | 1406 | if (prim.Sound != UUID.Zero) |
| 1407 | prim.SoundFlags = 1; // If it's persisted at all, it's looped | ||
| 1408 | else | ||
| 1409 | prim.SoundFlags = 0; | ||
| 1407 | 1410 | ||
| 1408 | if (!(row["TextureAnimation"] is DBNull)) | 1411 | if (!(row["TextureAnimation"] is DBNull)) |
| 1409 | prim.TextureAnimation = (byte[])row["TextureAnimation"]; | 1412 | prim.TextureAnimation = (byte[])row["TextureAnimation"]; |