aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-09 01:28:54 +0000
committerTeravus Ovares2008-05-09 01:28:54 +0000
commit7e275bfa371883778c3481ddd206ea627fb54cf9 (patch)
treea2786130896d7c1293921e28853c348702e5c554 /OpenSim/Framework
parent* remove 2 warnings. (diff)
downloadopensim-SC_OLD-7e275bfa371883778c3481ddd206ea627fb54cf9.zip
opensim-SC_OLD-7e275bfa371883778c3481ddd206ea627fb54cf9.tar.gz
opensim-SC_OLD-7e275bfa371883778c3481ddd206ea627fb54cf9.tar.bz2
opensim-SC_OLD-7e275bfa371883778c3481ddd206ea627fb54cf9.tar.xz
* Wrote a method to get the OpenJpeg data of a sculpt texture asset and save it to the prim shape.
* Added some stuff around sculpted prim meshes.. but it's just there so the project compiles now.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 46181f1..82aec06 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -100,13 +100,14 @@ namespace OpenSim.Framework
100 // Sculpted 100 // Sculpted
101 [XmlIgnore] public LLUUID SculptTexture = LLUUID.Zero; 101 [XmlIgnore] public LLUUID SculptTexture = LLUUID.Zero;
102 [XmlIgnore] public byte SculptType = (byte)0; 102 [XmlIgnore] public byte SculptType = (byte)0;
103 [XmlIgnore] public byte[] SculptData = new byte[0];
103 104
104 // Flexi 105 // Flexi
105 [XmlIgnore] public int FlexiSoftness = 0; 106 [XmlIgnore] public int FlexiSoftness = 0;
106 [XmlIgnore] public float FlexiTension = 0f; 107 [XmlIgnore] public float FlexiTension = 0f;
107 [XmlIgnore] public float FlexiDrag = 0f; 108 [XmlIgnore] public float FlexiDrag = 0f;
108 [XmlIgnore] public float FlexiGravity = 0f; 109 [XmlIgnore] public float FlexiGravity = 0f;
109 [XmlIgnore] public float FlexiWind= 0f; 110 [XmlIgnore] public float FlexiWind = 0f;
110 [XmlIgnore] public float FlexiForceX = 0f; 111 [XmlIgnore] public float FlexiForceX = 0f;
111 [XmlIgnore] public float FlexiForceY = 0f; 112 [XmlIgnore] public float FlexiForceY = 0f;
112 [XmlIgnore] public float FlexiForceZ = 0f; 113 [XmlIgnore] public float FlexiForceZ = 0f;