diff options
author | Justin Clarke Casey | 2008-06-16 22:43:30 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-16 22:43:30 +0000 |
commit | cb702990923d77bf261b66d2feb47d01981f16d2 (patch) | |
tree | d9a31a18489b2bac7bfdf30bca256128b28b1755 /OpenSim/Framework | |
parent | * Enables binary data in BaseHttpServer with 'image' in content type. (diff) | |
download | opensim-SC-cb702990923d77bf261b66d2feb47d01981f16d2.zip opensim-SC-cb702990923d77bf261b66d2feb47d01981f16d2.tar.gz opensim-SC-cb702990923d77bf261b66d2feb47d01981f16d2.tar.bz2 opensim-SC-cb702990923d77bf261b66d2feb47d01981f16d2.tar.xz |
* Fix a bug in the archiver where I didn't realize a shape still needs its default texture as well as its face textures
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 27ce433..aa88717 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
@@ -296,6 +296,7 @@ namespace OpenSim.Framework | |||
296 | ProfileBegin = LLObject.PackBeginCut(profileRange.X); | 296 | ProfileBegin = LLObject.PackBeginCut(profileRange.X); |
297 | ProfileEnd = LLObject.PackEndCut(profileRange.Y); | 297 | ProfileEnd = LLObject.PackEndCut(profileRange.Y); |
298 | } | 298 | } |
299 | |||
299 | public byte[] ExtraParams | 300 | public byte[] ExtraParams |
300 | { | 301 | { |
301 | get | 302 | get |
@@ -528,6 +529,7 @@ namespace OpenSim.Framework | |||
528 | 529 | ||
529 | return data; | 530 | return data; |
530 | } | 531 | } |
532 | |||
531 | public void ReadFlexiData(byte[] data, int pos) | 533 | public void ReadFlexiData(byte[] data, int pos) |
532 | { | 534 | { |
533 | if (data.Length-pos >= 5) | 535 | if (data.Length-pos >= 5) |
@@ -558,6 +560,7 @@ namespace OpenSim.Framework | |||
558 | FlexiForceZ = 0f; | 560 | FlexiForceZ = 0f; |
559 | } | 561 | } |
560 | } | 562 | } |
563 | |||
561 | public byte[] GetFlexiBytes() | 564 | public byte[] GetFlexiBytes() |
562 | { | 565 | { |
563 | byte[] data = new byte[16]; | 566 | byte[] data = new byte[16]; |
@@ -576,6 +579,7 @@ namespace OpenSim.Framework | |||
576 | 579 | ||
577 | return data; | 580 | return data; |
578 | } | 581 | } |
582 | |||
579 | public void ReadLightData(byte[] data, int pos) | 583 | public void ReadLightData(byte[] data, int pos) |
580 | { | 584 | { |
581 | if (data.Length - pos >= 16) | 585 | if (data.Length - pos >= 16) |
@@ -605,6 +609,7 @@ namespace OpenSim.Framework | |||
605 | LightIntensity = 0f; | 609 | LightIntensity = 0f; |
606 | } | 610 | } |
607 | } | 611 | } |
612 | |||
608 | public byte[] GetLightBytes() | 613 | public byte[] GetLightBytes() |
609 | { | 614 | { |
610 | byte[] data = new byte[16]; | 615 | byte[] data = new byte[16]; |