diff options
| author | UbitUmarov | 2018-02-21 15:30:25 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-02-21 15:30:25 +0000 |
| commit | 4a982adb022e5dafaf15bb10533fb230703d6dca (patch) | |
| tree | 0435ccd6bd06ab697771e23fb7f41ed067bb7b27 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | fix a old issue on some tortured prims number of sides, and so textures set (diff) | |
| download | opensim-SC-4a982adb022e5dafaf15bb10533fb230703d6dca.zip opensim-SC-4a982adb022e5dafaf15bb10533fb230703d6dca.tar.gz opensim-SC-4a982adb022e5dafaf15bb10533fb230703d6dca.tar.bz2 opensim-SC-4a982adb022e5dafaf15bb10533fb230703d6dca.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 532263a..d501939 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -3930,25 +3930,25 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3930 | break; | 3930 | break; |
| 3931 | case PrimType.SPHERE: | 3931 | case PrimType.SPHERE: |
| 3932 | ret = 1; | 3932 | ret = 1; |
| 3933 | if (hasCut) ret += 2; | 3933 | if (hasCut || Shape.PathSkew != 0) ret += 2; |
| 3934 | if (hasDimple) ret += 2; | 3934 | if (hasDimple) ret += 2; |
| 3935 | if (hasHollow) ret += 1; | 3935 | if (hasHollow) ret += 1; |
| 3936 | break; | 3936 | break; |
| 3937 | case PrimType.TORUS: | 3937 | case PrimType.TORUS: |
| 3938 | ret = 1; | 3938 | ret = 1; |
| 3939 | if (hasCut) ret += 2; | 3939 | if (hasCut || Shape.PathSkew != 0) ret += 2; |
| 3940 | if (hasProfileCut) ret += 2; | 3940 | if (hasProfileCut) ret += 2; |
| 3941 | if (hasHollow) ret += 1; | 3941 | if (hasHollow) ret += 1; |
| 3942 | break; | 3942 | break; |
| 3943 | case PrimType.TUBE: | 3943 | case PrimType.TUBE: |
| 3944 | ret = 4; | 3944 | ret = 4; |
| 3945 | if (hasCut) ret += 2; | 3945 | if (hasCut || Shape.PathSkew != 0) ret += 2; |
| 3946 | if (hasProfileCut) ret += 2; | 3946 | if (hasProfileCut) ret += 2; |
| 3947 | if (hasHollow) ret += 1; | 3947 | if (hasHollow) ret += 1; |
| 3948 | break; | 3948 | break; |
| 3949 | case PrimType.RING: | 3949 | case PrimType.RING: |
| 3950 | ret = 3; | 3950 | ret = 3; |
| 3951 | if (hasCut) ret += 2; | 3951 | if (hasCut || Shape.PathSkew != 0) ret += 2; |
| 3952 | if (hasProfileCut) ret += 2; | 3952 | if (hasProfileCut) ret += 2; |
| 3953 | if (hasHollow) ret += 1; | 3953 | if (hasHollow) ret += 1; |
| 3954 | break; | 3954 | break; |