aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDahlia Trimble2009-05-29 05:42:06 +0000
committerDahlia Trimble2009-05-29 05:42:06 +0000
commit42fa7cf98902c91cb712db1a38c375aa86397328 (patch)
treec349ac93129d34a02f599694e4be4d549966a62b /OpenSim/Framework
parentdisable sculpt map caching until a better method of avoiding asset requests c... (diff)
downloadopensim-SC_OLD-42fa7cf98902c91cb712db1a38c375aa86397328.zip
opensim-SC_OLD-42fa7cf98902c91cb712db1a38c375aa86397328.tar.gz
opensim-SC_OLD-42fa7cf98902c91cb712db1a38c375aa86397328.tar.bz2
opensim-SC_OLD-42fa7cf98902c91cb712db1a38c375aa86397328.tar.xz
plumbing for future sculpt map caching
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs12
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 300e37c..f22b6ef 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -26,6 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Drawing;
30using System.Drawing.Imaging;
29using System.Reflection; 31using System.Reflection;
30using System.Xml.Serialization; 32using System.Xml.Serialization;
31using log4net; 33using log4net;
@@ -105,6 +107,7 @@ namespace OpenSim.Framework
105 [XmlIgnore] private UUID _sculptTexture = UUID.Zero; 107 [XmlIgnore] private UUID _sculptTexture = UUID.Zero;
106 [XmlIgnore] private byte _sculptType = (byte)0; 108 [XmlIgnore] private byte _sculptType = (byte)0;
107 [XmlIgnore] private byte[] _sculptData = new byte[0]; 109 [XmlIgnore] private byte[] _sculptData = new byte[0];
110 [XmlIgnore] private Image _sculptBitmap = null;
108 111
109 // Flexi 112 // Flexi
110 [XmlIgnore] private int _flexiSoftness = 0; 113 [XmlIgnore] private int _flexiSoftness = 0;
@@ -562,6 +565,15 @@ namespace OpenSim.Framework
562 } 565 }
563 } 566 }
564 567
568 public Image SculptBitmap {
569 get {
570 return _sculptBitmap;
571 }
572 set {
573 _sculptBitmap = value;
574 }
575 }
576
565 public int FlexiSoftness { 577 public int FlexiSoftness {
566 get { 578 get {
567 return _flexiSoftness; 579 return _flexiSoftness;