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_code.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_code.h')
| -rw-r--r-- | linden/indra/llmessage/patch_code.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llmessage/patch_code.h b/linden/indra/llmessage/patch_code.h index 82fa6bb..dbfdf70 100644 --- a/linden/indra/llmessage/patch_code.h +++ b/linden/indra/llmessage/patch_code.h | |||
| @@ -46,7 +46,7 @@ void end_patch_coding(LLBitPack &bitpack); | |||
| 46 | 46 | ||
| 47 | void init_patch_decoding(LLBitPack &bitpack); | 47 | void init_patch_decoding(LLBitPack &bitpack); |
| 48 | void decode_patch_group_header(LLBitPack &bitpack, LLGroupHeader *gopp); | 48 | void decode_patch_group_header(LLBitPack &bitpack, LLGroupHeader *gopp); |
| 49 | void decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph); | 49 | void decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph, BOOL b_large_patch); |
| 50 | void decode_patch(LLBitPack &bitpack, S32 *patches); | 50 | void decode_patch(LLBitPack &bitpack, S32 *patches); |
| 51 | 51 | ||
| 52 | #endif | 52 | #endif |