diff options
| author | David Seikel | 2011-03-20 17:02:40 +1000 |
|---|---|---|
| committer | David Seikel | 2011-03-20 17:02:40 +1000 |
| commit | 8c15fcec590c68337b8aa05d17793cd3c2a48068 (patch) | |
| tree | e233ecfa79c6fe22f47dc0eba44c0300dc0daa71 /linden/indra/llmessage/patch_dct.h | |
| parent | The half arsed IRC support was broken. It's still not working, though it wor... (diff) | |
| parent | Merge remote-tracking branch 'jacek/exp' into exp (diff) | |
| download | meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.zip meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.gz meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.bz2 meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.xz | |
Merge remote-tracking branch 'mccabe/exp' into weekly
Conflicts: (Keeping these around as a record, there was some strangeness.
.gitignore
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llfloaterregioninfo.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/skins/default/html/en-us/loading-error/index.html
linden/indra/newview/skins/default/html/en-us/loading/loading.html
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/install.xml
Diffstat (limited to 'linden/indra/llmessage/patch_dct.h')
| -rw-r--r-- | linden/indra/llmessage/patch_dct.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llmessage/patch_dct.h b/linden/indra/llmessage/patch_dct.h index 663e146..ba21be7 100644 --- a/linden/indra/llmessage/patch_dct.h +++ b/linden/indra/llmessage/patch_dct.h | |||
| @@ -79,7 +79,7 @@ public: | |||
| 79 | F32 dc_offset; // 4 bytes | 79 | F32 dc_offset; // 4 bytes |
| 80 | U16 range; // 2 = 7 ((S16) FP range (breaks if we need > 32K meters in 1 patch) | 80 | U16 range; // 2 = 7 ((S16) FP range (breaks if we need > 32K meters in 1 patch) |
| 81 | U8 quant_wbits; // 1 = 8 (upper 4 bits is quant - 2, lower 4 bits is word bits - 2) | 81 | U8 quant_wbits; // 1 = 8 (upper 4 bits is quant - 2, lower 4 bits is word bits - 2) |
| 82 | U16 patchids; // 2 = 10 (actually only uses 10 bits, 5 for each) | 82 | U32 patchids; // 2 = 10 (actually only uses 10 bits, 5 for each) |
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| 85 | // Compression routines | 85 | // Compression routines |