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/SQLite | |
| 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 'OpenSim/Data/SQLite')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index e02ac7d..1403a8f 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
| @@ -1742,7 +1742,10 @@ namespace OpenSim.Data.SQLite | |||
| 1742 | 1742 | ||
| 1743 | prim.Sound = new UUID(row["LoopedSound"].ToString()); | 1743 | prim.Sound = new UUID(row["LoopedSound"].ToString()); |
| 1744 | prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]); | 1744 | prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]); |
| 1745 | prim.SoundFlags = 1; // If it's persisted at all, it's looped | 1745 | if (prim.Sound != UUID.Zero) |
| 1746 | prim.SoundFlags = 1; // If it's persisted at all, it's looped | ||
| 1747 | else | ||
| 1748 | prim.SoundFlags = 0; | ||
| 1746 | 1749 | ||
| 1747 | if (!row.IsNull("TextureAnimation")) | 1750 | if (!row.IsNull("TextureAnimation")) |
| 1748 | prim.TextureAnimation = Convert.FromBase64String(row["TextureAnimation"].ToString()); | 1751 | prim.TextureAnimation = Convert.FromBase64String(row["TextureAnimation"].ToString()); |