diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-05 17:50:26 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-05 17:50:26 +0200 |
| commit | 166ac89de9bcf951103cbf2551a133ebe9e43035 (patch) | |
| tree | 21f23a3841592edef65f940274b5b59b662e2ba6 /indra/newview/llwearable.h | |
| parent | ac8753a7eaab05b47d7da6e5ae8ef5f3aa324273 (diff) | |
| parent | 77b5a39cc1daa79ceea599aea3f680127c9949b1 (diff) | |
merge
--HG--
branch : product-engine
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. |