Merge branch 'master' of /var/git/opensim/

1 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs
index 465da29..09b9719 100644
--- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs
@@ -217,9 +217,12 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
                     switch ((ushort)extraParam.Type)
                     {
                         case (ushort)ExtraParamType.Sculpt:
+                            Primitive.SculptData sculpt = new Primitive.SculptData(extraParam.ExtraParamData, 0);
+
                             pbs.SculptEntry = true;
+
                             pbs.SculptTexture = obj.SculptID;
-                            pbs.SculptType = (byte)SculptType.Mesh;
+                            pbs.SculptType = (byte)sculpt.Type;
 
                             break;
                         case (ushort)ExtraParamType.Flexible: