diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-30 15:22:12 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-30 15:22:12 -0500 |
| commit | 4c90bcd5745ef84133651fd6394e9a786b7b6256 (patch) | |
| tree | f4d734245173fbd8b4e8b1b39e1684ecb20889c3 /indra/newview/llvoavatarself.h | |
| parent | 4899fea00652d37b35cbc32ad6f2ca05a5cffd6b (diff) | |
| parent | 467125856922a715b3a3b3d02ed108240b2ce95d (diff) | |
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rw-r--r-- | indra/newview/llvoavatarself.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index e376e5e9ef..6bf4ef5496 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -270,7 +270,7 @@ protected: public: /*virtual*/ BOOL isWearingWearableType(EWearableType type) const; - void wearableUpdated(EWearableType type); + void wearableUpdated(EWearableType type, BOOL upload_result); protected: U32 getNumWearables(LLVOAvatarDefines::ETextureIndex i) const; |