diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-04 19:04:03 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-04 19:04:03 -0500 |
| commit | a05766c200df4094c483a755b95b9a3ac970fe81 (patch) | |
| tree | ddec0c53547f743aa8649307716ab1d0df61f958 /indra/newview/llwearable.h | |
| parent | 14d77a36d4392cd51a0887d957905ce4c532ba38 (diff) | |
| parent | 195b13beff0ea476ed47a08f6a44b85dc151eec8 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llwearable.h')
| -rw-r--r-- | indra/newview/llwearable.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h index dae983bcf3..7bd5305079 100644 --- a/indra/newview/llwearable.h +++ b/indra/newview/llwearable.h @@ -128,6 +128,7 @@ public: void revertValues(); void saveValues(); + void pullCrossWearableValues(); BOOL isOnTop() const; @@ -145,7 +146,7 @@ private: void createLayers(S32 te); void createVisualParams(); void syncImages(te_map_t &src, te_map_t &dst); - void destroyTextures(); + void destroyTextures(); static S32 sCurrentDefinitionVersion; // Depends on the current state of the avatar_lad.xml. S32 mDefinitionVersion; // Depends on the state of the avatar_lad.xml when this asset was created. |