summaryrefslogtreecommitdiff
path: root/indra/newview/llwearable.h
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-01-15 18:49:02 +0000
committerJosh Bell <josh@lindenlab.com>2007-01-15 18:49:02 +0000
commitaeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 (patch)
tree5aedb2a22e54d9c2c2fe9389d4ad6cebe891c5f1 /indra/newview/llwearable.h
parentdbf45ad4294a59c050982b5a417fe86272026454 (diff)
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llwearable.h')
-rw-r--r--indra/newview/llwearable.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h
index d2dcd764d5..22572981a3 100644
--- a/indra/newview/llwearable.h
+++ b/indra/newview/llwearable.h
@@ -112,8 +112,8 @@ private:
LLPtrSkipMap<S32, F32*> mVisualParamMap; // maps visual param id to weight
LLPtrSkipMap<S32, LLUUID*> mTEMap; // maps TE to Image ID
- static const char* LLWearable::sTypeName[ WT_COUNT ];
- static const char* LLWearable::sTypeLabel[ WT_COUNT ];
+ static const char* sTypeName[ WT_COUNT ];
+ static const char* sTypeLabel[ WT_COUNT ];
};
#endif // LL_LLWEARABLE_H