diff options
| author | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
| commit | d219317074ae8ff1665118988cecb8168ae0085e (patch) | |
| tree | 89a6b01925b24f83272ec36f0b6a9c378f235d59 /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | Configuration of persistent baked textures and save/send delays. (diff) | |
| download | opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.zip opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.gz opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.bz2 opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.xz | |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs')
| -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) |