diff options
| author | Melanie | 2012-08-29 11:18:32 +0200 |
|---|---|---|
| committer | Melanie | 2012-08-29 11:18:32 +0200 |
| commit | f671e446bfdca5932d45cc358324a667d3239473 (patch) | |
| tree | 05c6a16e9e983a10845b2622f3c4d7091dae5765 /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |
| parent | Add a queue with two priority levels. This is a drop in replacement for (diff) | |
| parent | A few more changes to keyframes (diff) | |
| download | opensim-SC-f671e446bfdca5932d45cc358324a667d3239473.zip opensim-SC-f671e446bfdca5932d45cc358324a667d3239473.tar.gz opensim-SC-f671e446bfdca5932d45cc358324a667d3239473.tar.bz2 opensim-SC-f671e446bfdca5932d45cc358324a667d3239473.tar.xz | |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 134bd9d..123c158 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
| @@ -1241,7 +1241,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
| 1241 | 1241 | ||
| 1242 | if (sog.RootPart.KeyframeMotion != null) | 1242 | if (sog.RootPart.KeyframeMotion != null) |
| 1243 | { | 1243 | { |
| 1244 | Byte[] data = sog.RootPart.KeyframeMotion.Serialize(); | 1244 | Byte[] data = sog.RootPart.KeyframeMotion.Serialize(); |
| 1245 | 1245 | ||
| 1246 | writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty); | 1246 | writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty); |
| 1247 | writer.WriteBase64(data, 0, data.Length); | 1247 | writer.WriteBase64(data, 0, data.Length); |