aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-18 21:05:48 +0000
committerTeravus Ovares2008-05-18 21:05:48 +0000
commite57c2b47a81b3134adc59fbd57568e98def229db (patch)
treef037f49590121cd8ae5645b8a29feb1cfc146108 /OpenSim/Framework
parent* Refactor: Eliminate empty if clause from AssetCache.GetAsset() (diff)
downloadopensim-SC_OLD-e57c2b47a81b3134adc59fbd57568e98def229db.zip
opensim-SC_OLD-e57c2b47a81b3134adc59fbd57568e98def229db.tar.gz
opensim-SC_OLD-e57c2b47a81b3134adc59fbd57568e98def229db.tar.bz2
opensim-SC_OLD-e57c2b47a81b3134adc59fbd57568e98def229db.tar.xz
* This fixes the Sculpty seam. Unfortunately not all sculpties will survive. A tiny fraction of them will turn into a torus.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 82aec06..f03c6d0 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -472,7 +472,7 @@ namespace OpenSim.Framework
472 { 472 {
473 SculptEntry = true; 473 SculptEntry = true;
474 SculptTextureUUID = new byte[16]; 474 SculptTextureUUID = new byte[16];
475 SculptTypel = data[16]; 475 SculptTypel = data[16 + pos];
476 Array.Copy(data, pos, SculptTextureUUID,0, 16); 476 Array.Copy(data, pos, SculptTextureUUID,0, 16);
477 SculptUUID = new LLUUID(SculptTextureUUID, 0); 477 SculptUUID = new LLUUID(SculptTextureUUID, 0);
478 } 478 }
@@ -483,7 +483,11 @@ namespace OpenSim.Framework
483 SculptTypel = 0x00; 483 SculptTypel = 0x00;
484 } 484 }
485 485
486 486 if (SculptEntry)
487 {
488 if (SculptType != (byte)1 && SculptType != (byte)2 && SculptType != (byte)3 && SculptType != (byte)4)
489 SculptType = 4;
490 }
487 SculptTexture = SculptUUID; 491 SculptTexture = SculptUUID;
488 SculptType = SculptTypel; 492 SculptType = SculptTypel;
489 //m_log.Info("[SCULPT]:" + SculptUUID.ToString()); 493 //m_log.Info("[SCULPT]:" + SculptUUID.ToString());