diff options
| author | Armin Weatherwax | 2009-11-30 23:38:38 +0100 |
|---|---|---|
| committer | Armin Weatherwax | 2009-12-01 22:59:17 +0100 |
| commit | 738192c930d8857d11ccbebaf62bffb7c48a8e2e (patch) | |
| tree | 5c878ce2e12b37b338866eb677464a3de3af6703 /linden/indra/llprimitive/llprimitive.h | |
| parent | Fixed a little mistake in .gitignore. (diff) | |
| download | meta-impy-738192c930d8857d11ccbebaf62bffb7c48a8e2e.zip meta-impy-738192c930d8857d11ccbebaf62bffb7c48a8e2e.tar.gz meta-impy-738192c930d8857d11ccbebaf62bffb7c48a8e2e.tar.bz2 meta-impy-738192c930d8857d11ccbebaf62bffb7c48a8e2e.tar.xz | |
Emeralds client name tag and clothing layer protection. Needs decision about a few things - find "Imprudence FIXME" (woq) in llprimitive.cpp and llvoavatar.cpp, its commented there.
modified: linden/indra/llprimitive/llprimitive.cpp
modified: linden/indra/llprimitive/llprimitive.h
modified: linden/indra/newview/app_settings/settings.xml
modified: linden/indra/newview/llagent.cpp
modified: linden/indra/newview/llappviewer.cpp
modified: linden/indra/newview/llfirstuse.cpp
modified: linden/indra/newview/llfirstuse.h
modified: linden/indra/newview/llstartup.cpp
modified: linden/indra/newview/llvoavatar.cpp
modified: linden/indra/newview/llvoavatar.h
modified: linden/indra/newview/skins/default/xui/en-us/notifications.xml
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llprimitive/llprimitive.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h index cc86f5b..cf9ff0f 100644 --- a/linden/indra/llprimitive/llprimitive.h +++ b/linden/indra/llprimitive/llprimitive.h | |||
| @@ -339,7 +339,7 @@ public: | |||
| 339 | void copyTEs(const LLPrimitive *primitive); | 339 | void copyTEs(const LLPrimitive *primitive); |
| 340 | S32 packTEField(U8 *cur_ptr, U8 *data_ptr, U8 data_size, U8 last_face_index, EMsgVariableType type) const; | 340 | S32 packTEField(U8 *cur_ptr, U8 *data_ptr, U8 data_size, U8 last_face_index, EMsgVariableType type) const; |
| 341 | S32 unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 data_size, U8 face_count, EMsgVariableType type); | 341 | S32 unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 data_size, U8 face_count, EMsgVariableType type); |
| 342 | BOOL packTEMessage(LLMessageSystem *mesgsys) const; | 342 | BOOL packTEMessage(LLMessageSystem *mesgsys, bool shield = false) const; |
| 343 | BOOL packTEMessage(LLDataPacker &dp) const; | 343 | BOOL packTEMessage(LLDataPacker &dp) const; |
| 344 | S32 unpackTEMessage(LLMessageSystem *mesgsys, char *block_name); | 344 | S32 unpackTEMessage(LLMessageSystem *mesgsys, char *block_name); |
| 345 | S32 unpackTEMessage(LLMessageSystem *mesgsys, char *block_name, const S32 block_num); // Variable num of blocks | 345 | S32 unpackTEMessage(LLMessageSystem *mesgsys, char *block_name, const S32 block_num); // Variable num of blocks |