aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-10-31 08:54:54 +0000
committerAdam Frisby2008-10-31 08:54:54 +0000
commit1f52ca97c75bce4b376a6047993b0995d0527033 (patch)
treebd5e48f4a245ab4605c5956c2ffeaf2a35c50d3b
parent* Added some debug information to MySQL UserDataManager to help diagnose a po... (diff)
downloadopensim-SC_OLD-1f52ca97c75bce4b376a6047993b0995d0527033.zip
opensim-SC_OLD-1f52ca97c75bce4b376a6047993b0995d0527033.tar.gz
opensim-SC_OLD-1f52ca97c75bce4b376a6047993b0995d0527033.tar.bz2
opensim-SC_OLD-1f52ca97c75bce4b376a6047993b0995d0527033.tar.xz
* Enables PrimitiveBaseShape to be used inside a libOpenMV project by adding some alternate codepaths that avoid triggering OpenSim specific code. Probably not useful for most people, but might be for those working on interop projects.
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 56e566b..49bc953 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -182,6 +182,16 @@ namespace OpenSim.Framework
182 Textures = m_defaultTexture; 182 Textures = m_defaultTexture;
183 } 183 }
184 184
185 public PrimitiveBaseShape(bool noShape)
186 {
187 if (noShape)
188 return;
189
190 PCode = (byte)PCodeEnum.Primitive;
191 ExtraParams = new byte[1];
192 Textures = m_defaultTexture;
193 }
194
185 [XmlIgnore] 195 [XmlIgnore]
186 public Primitive.TextureEntry Textures 196 public Primitive.TextureEntry Textures
187 { 197 {
@@ -843,7 +853,7 @@ namespace OpenSim.Framework
843 853
844 public void ReadInExtraParamsBytes(byte[] data) 854 public void ReadInExtraParamsBytes(byte[] data)
845 { 855 {
846 if (data == null) 856 if (data == null || data.Length == 1)
847 return; 857 return;
848 858
849 const ushort FlexiEP = 0x10; 859 const ushort FlexiEP = 0x10;