diff options
| author | opensim mirror account | 2010-10-26 21:10:12 -0700 |
|---|---|---|
| committer | opensim mirror account | 2010-10-26 21:10:12 -0700 |
| commit | d6771ed4d5c21b328fc6b32a51c6745a3e7ca8f4 (patch) | |
| tree | 80979fb53e2531c434900390087f83f9a2a74254 /OpenSim/Region/Framework/Scenes/Serialization | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC-d6771ed4d5c21b328fc6b32a51c6745a3e7ca8f4.zip opensim-SC-d6771ed4d5c21b328fc6b32a51c6745a3e7ca8f4.tar.gz opensim-SC-d6771ed4d5c21b328fc6b32a51c6745a3e7ca8f4.tar.bz2 opensim-SC-d6771ed4d5c21b328fc6b32a51c6745a3e7ca8f4.tar.xz | |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
| -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 95908fc..e661ca9 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
| @@ -804,7 +804,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
| 804 | private static void ProcessShpTextureEntry(PrimitiveBaseShape shp, XmlTextReader reader) | 804 | private static void ProcessShpTextureEntry(PrimitiveBaseShape shp, XmlTextReader reader) |
| 805 | { | 805 | { |
| 806 | byte[] teData = Convert.FromBase64String(reader.ReadElementString("TextureEntry")); | 806 | byte[] teData = Convert.FromBase64String(reader.ReadElementString("TextureEntry")); |
| 807 | shp.Textures = new Primitive.TextureEntry(teData, 0, teData.Length); | 807 | shp.Textures = new Primitive.TextureEntry(teData, 0, teData.Length); |
| 808 | } | 808 | } |
| 809 | 809 | ||
| 810 | private static void ProcessShpExtraParams(PrimitiveBaseShape shp, XmlTextReader reader) | 810 | private static void ProcessShpExtraParams(PrimitiveBaseShape shp, XmlTextReader reader) |