diff options
author | Jacek Antonelli | 2009-10-13 20:20:37 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-10-13 20:20:37 -0500 |
commit | 20235c92e6e0deddf3c8582bbed75361e24ecc0d (patch) | |
tree | 754db362c0ad8060ceaa3ed24059e320f4b13f5c /linden/indra/newview/llwearable.h | |
parent | Merge remote branch 'mccabe/next' into next (diff) | |
parent | Added history button for group chat as well (diff) | |
download | meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.zip meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.tar.gz meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.tar.bz2 meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.tar.xz |
Merge remote branch 'mccabe/next' into next
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llwearable.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/llwearable.h b/linden/indra/newview/llwearable.h index ea16d20..9986e85 100644 --- a/linden/indra/newview/llwearable.h +++ b/linden/indra/newview/llwearable.h | |||
@@ -60,6 +60,10 @@ public: | |||
60 | 60 | ||
61 | BOOL exportFile(LLFILE* file); | 61 | BOOL exportFile(LLFILE* file); |
62 | BOOL importFile(LLFILE* file); | 62 | BOOL importFile(LLFILE* file); |
63 | // reX: new function | ||
64 | BOOL FileExportParams(FILE* file); | ||
65 | // reX: new function | ||
66 | BOOL FileExportTextures(FILE* file); | ||
63 | 67 | ||
64 | EWearableType getType() const { return mType; } | 68 | EWearableType getType() const { return mType; } |
65 | void setType( EWearableType type ) { mType = type; } | 69 | void setType( EWearableType type ) { mType = type; } |