diff options
author | CG Linden <cg@lindenlab.com> | 2010-01-29 16:29:12 -0800 |
---|---|---|
committer | CG Linden <cg@lindenlab.com> | 2010-01-29 16:29:12 -0800 |
commit | f6a59081a7959e21f952a93bc3809315f2fa361e (patch) | |
tree | d77373c86810e505892cfb483001fe535201db46 /indra/newview/llwearable.h | |
parent | b8856efd5ff0e4899bb369dfd0815e824cd3a432 (diff) | |
parent | 682f8afcc073b62fed64a3fd2adc5f65793e1f3e (diff) |
Merge in latest viewer-2-0 changes.
Diffstat (limited to 'indra/newview/llwearable.h')
-rw-r--r-- | indra/newview/llwearable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h index 7a579b248e..dae983bcf3 100644 --- a/indra/newview/llwearable.h +++ b/indra/newview/llwearable.h @@ -114,7 +114,7 @@ public: LLLocalTextureObject* getLocalTextureObject(S32 index); const LLLocalTextureObject* getConstLocalTextureObject(S32 index) const; - void setLocalTextureObject(S32 index, LLLocalTextureObject *lto); + void setLocalTextureObject(S32 index, LLLocalTextureObject <o); void addVisualParam(LLVisualParam *param); void setVisualParams(); void setVisualParamWeight(S32 index, F32 value, BOOL upload_bake); |