aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2010-10-20 01:23:54 -0400
committerTeravus Ovares (Dan Olivares)2010-10-20 01:23:54 -0400
commit9f975ad5aacdca94b2c8531bb00ac486c6e5af52 (patch)
treeaaa21f035c20260ab46264936ba9a72e57d478af /OpenSim/Region
parent* This removes an ugly extraparams hack that I used and makes UploadObjectAss... (diff)
downloadopensim-SC_OLD-9f975ad5aacdca94b2c8531bb00ac486c6e5af52.zip
opensim-SC_OLD-9f975ad5aacdca94b2c8531bb00ac486c6e5af52.tar.gz
opensim-SC_OLD-9f975ad5aacdca94b2c8531bb00ac486c6e5af52.tar.bz2
opensim-SC_OLD-9f975ad5aacdca94b2c8531bb00ac486c6e5af52.tar.xz
* One more goofy thing. I note that the sculpt texture id is broken out of the ExtraParams data in UploadObjectAsset. At this moment, if you're uploading a Sculpt, make sure to break out the Texture ID into the object data or it might not get applied appropriately.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs5
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
217 switch ((ushort)extraParam.Type) 217 switch ((ushort)extraParam.Type)
218 { 218 {
219 case (ushort)ExtraParamType.Sculpt: 219 case (ushort)ExtraParamType.Sculpt:
220 Primitive.SculptData sculpt = new Primitive.SculptData(extraParam.ExtraParamData, 0);
221
220 pbs.SculptEntry = true; 222 pbs.SculptEntry = true;
223
221 pbs.SculptTexture = obj.SculptID; 224 pbs.SculptTexture = obj.SculptID;
222 pbs.SculptType = (byte)SculptType.Mesh; 225 pbs.SculptType = (byte)sculpt.Type;
223 226
224 break; 227 break;
225 case (ushort)ExtraParamType.Flexible: 228 case (ushort)ExtraParamType.Flexible: