diff options
| author | dahlia | 2010-10-26 21:20:18 -0700 |
|---|---|---|
| committer | dahlia | 2010-10-26 21:20:18 -0700 |
| commit | a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389 (patch) | |
| tree | 8e10af353afa5c301a250b2e3017234cee02cbe7 /OpenSim/Region/Framework/Scenes/Serialization | |
| parent | Overload Scene.NewUserConnection() to facilitate NPCs and other region specif... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389.zip opensim-SC_OLD-a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389.tar.gz opensim-SC_OLD-a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389.tar.bz2 opensim-SC_OLD-a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389.tar.xz | |
Merge branch 'master' of ssh://MyConnection01/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) |