diff options
| author | McCabe Maxsted | 2011-04-04 23:01:06 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-04-11 13:17:59 -0700 |
| commit | 8431725c0bf08da2b909cefe2f3ecfb43a2aecad (patch) | |
| tree | 933af8593aedfbf136adb89523a6c51ffbda50cb /linden/indra/llmath | |
| parent | Added search to the Debug Settings (diff) | |
| download | meta-impy-8431725c0bf08da2b909cefe2f3ecfb43a2aecad.zip meta-impy-8431725c0bf08da2b909cefe2f3ecfb43a2aecad.tar.gz meta-impy-8431725c0bf08da2b909cefe2f3ecfb43a2aecad.tar.bz2 meta-impy-8431725c0bf08da2b909cefe2f3ecfb43a2aecad.tar.xz | |
Ported the GPL version of Zwagoth Klaar's fix for sculpty crashers. This has two major side effects: 1. instead of crashing on bad sculpt data, the viewer freezes for a time. 2. Sculpties can be slow to build
Diffstat (limited to 'linden/indra/llmath')
| -rw-r--r-- | linden/indra/llmath/llvolume.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/llmath/llvolume.h b/linden/indra/llmath/llvolume.h index 0b9002f..77af2c4 100644 --- a/linden/indra/llmath/llvolume.h +++ b/linden/indra/llmath/llvolume.h | |||
| @@ -949,9 +949,11 @@ public: | |||
| 949 | LLVector3 mLODScaleBias; // vector for biasing LOD based on scale | 949 | LLVector3 mLODScaleBias; // vector for biasing LOD based on scale |
| 950 | 950 | ||
| 951 | void sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, S32 sculpt_level); | 951 | void sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, S32 sculpt_level); |
| 952 | |||
| 953 | F32 sculptGetSurfaceArea(); | ||
| 954 | |||
| 952 | private: | 955 | private: |
| 953 | void sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, U8 sculpt_type); | 956 | void sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, U8 sculpt_type); |
| 954 | F32 sculptGetSurfaceArea(); | ||
| 955 | void sculptGeneratePlaceholder(); | 957 | void sculptGeneratePlaceholder(); |
| 956 | void sculptCalcMeshResolution(U16 width, U16 height, U8 type, S32& s, S32& t); | 958 | void sculptCalcMeshResolution(U16 width, U16 height, U8 type, S32& s, S32& t); |
| 957 | 959 | ||