diff options
author | Dahlia Trimble | 2009-05-29 05:42:06 +0000 |
---|---|---|
committer | Dahlia Trimble | 2009-05-29 05:42:06 +0000 |
commit | 42fa7cf98902c91cb712db1a38c375aa86397328 (patch) | |
tree | c349ac93129d34a02f599694e4be4d549966a62b | |
parent | disable sculpt map caching until a better method of avoiding asset requests c... (diff) | |
download | opensim-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
-rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 12 | ||||
-rw-r--r-- | prebuild.xml | 1 |
2 files changed, 13 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Drawing; | ||
30 | using System.Drawing.Imaging; | ||
29 | using System.Reflection; | 31 | using System.Reflection; |
30 | using System.Xml.Serialization; | 32 | using System.Xml.Serialization; |
31 | using log4net; | 33 | using 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; |
diff --git a/prebuild.xml b/prebuild.xml index e85bf84..51fb6e8 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -129,6 +129,7 @@ | |||
129 | <Reference name="System"/> | 129 | <Reference name="System"/> |
130 | <Reference name="System.Xml"/> | 130 | <Reference name="System.Xml"/> |
131 | <Reference name="System.Data"/> | 131 | <Reference name="System.Data"/> |
132 | <Reference name="System.Drawing"/> | ||
132 | <Reference name="OpenMetaverseTypes.dll"/> | 133 | <Reference name="OpenMetaverseTypes.dll"/> |
133 | <Reference name="OpenMetaverse.dll"/> | 134 | <Reference name="OpenMetaverse.dll"/> |
134 | <Reference name="OpenMetaverse.StructuredData.dll"/> | 135 | <Reference name="OpenMetaverse.StructuredData.dll"/> |