diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-02-04 16:46:29 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-02-04 16:46:29 -0500 |
| commit | 5684a9d1bbeb236c033c97105b50dcc3242021df (patch) | |
| tree | ca45e89cc281025ec718d6769ce3637b1e382e30 /indra/newview/llwearable.h | |
| parent | b735ecb89912a90a597333f45dd853f2565c0928 (diff) | |
| parent | 20c49c78483e7608242b8f34bfc71fbf40837494 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-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. |