diff options
| author | opensim mirror account | 2010-10-16 18:00:09 -0700 |
|---|---|---|
| committer | opensim mirror account | 2010-10-16 18:00:09 -0700 |
| commit | f90b2ef918b58875d1ebaa2c2265ef4110e65e87 (patch) | |
| tree | ec64c28ed62391fd91dcf22ec8fbf7f4b7db5a78 | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | Add missing check for !_projectionEntry (diff) | |
| download | opensim-SC-f90b2ef918b58875d1ebaa2c2265ef4110e65e87.zip opensim-SC-f90b2ef918b58875d1ebaa2c2265ef4110e65e87.tar.gz opensim-SC-f90b2ef918b58875d1ebaa2c2265ef4110e65e87.tar.bz2 opensim-SC-f90b2ef918b58875d1ebaa2c2265ef4110e65e87.tar.xz | |
Merge branch 'master' of /var/git/opensim/
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index ff7eaef..c5eb40b 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
| @@ -901,7 +901,7 @@ namespace OpenSim.Framework | |||
| 901 | Array.Copy(ProjectionData, 0, returnbytes, i, ProjectionData.Length); | 901 | Array.Copy(ProjectionData, 0, returnbytes, i, ProjectionData.Length); |
| 902 | i += ProjectionData.Length; | 902 | i += ProjectionData.Length; |
| 903 | } | 903 | } |
| 904 | if (!_flexiEntry && !_lightEntry && !_sculptEntry) | 904 | if (!_flexiEntry && !_lightEntry && !_sculptEntry && !_projectionEntry) |
| 905 | { | 905 | { |
| 906 | byte[] returnbyte = new byte[1]; | 906 | byte[] returnbyte = new byte[1]; |
| 907 | returnbyte[0] = 0; | 907 | returnbyte[0] = 0; |