diff options
| author | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
| commit | 3234472d6203671a492a73042a0b56d6301903e0 (patch) | |
| tree | 2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |
| parent | Ensure that the physics representation of a deleted object is also removed (diff) | |
| download | opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.zip opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.gz opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2 opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.xz | |
Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index c7862ec..227a941 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
| @@ -1089,9 +1089,9 @@ if (m_shape != null) { | |||
| 1089 | data[pos] = (byte)pTexAnim.SizeX; pos++; | 1089 | data[pos] = (byte)pTexAnim.SizeX; pos++; |
| 1090 | data[pos] = (byte)pTexAnim.SizeY; pos++; | 1090 | data[pos] = (byte)pTexAnim.SizeY; pos++; |
| 1091 | 1091 | ||
| 1092 | Utils.FloatToBytes(pTexAnim.Start).CopyTo(data, pos); | 1092 | Helpers.FloatToBytes(pTexAnim.Start).CopyTo(data, pos); |
| 1093 | Utils.FloatToBytes(pTexAnim.Length).CopyTo(data, pos + 4); | 1093 | Helpers.FloatToBytes(pTexAnim.Length).CopyTo(data, pos + 4); |
| 1094 | Utils.FloatToBytes(pTexAnim.Rate).CopyTo(data, pos + 8); | 1094 | Helpers.FloatToBytes(pTexAnim.Rate).CopyTo(data, pos + 8); |
| 1095 | 1095 | ||
| 1096 | m_TextureAnimation = data; | 1096 | m_TextureAnimation = data; |
| 1097 | } | 1097 | } |