aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llwearable.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:34 -0500
committerJacek Antonelli2008-08-15 23:45:34 -0500
commitcd17687f01420952712a500107e0f93e7ab8d5f8 (patch)
treece48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/llwearable.h
parentSecond Life viewer sources 1.19.0.5 (diff)
downloadmeta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/llwearable.h')
-rw-r--r--linden/indra/newview/llwearable.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llwearable.h b/linden/indra/newview/llwearable.h
index da259a0..aa4b3dd 100644
--- a/linden/indra/newview/llwearable.h
+++ b/linden/indra/newview/llwearable.h
@@ -33,7 +33,6 @@
33#define LL_LLWEARABLE_H 33#define LL_LLWEARABLE_H
34 34
35#include "lluuid.h" 35#include "lluuid.h"
36#include "llptrskipmap.h"
37#include "llstring.h" 36#include "llstring.h"
38#include "llpermissions.h" 37#include "llpermissions.h"
39#include "llsaleinfo.h" 38#include "llsaleinfo.h"
@@ -132,8 +131,10 @@ private:
132 LLTransactionID mTransactionID; 131 LLTransactionID mTransactionID;
133 EWearableType mType; 132 EWearableType mType;
134 133
135 LLPtrSkipMap<S32, F32*> mVisualParamMap; // maps visual param id to weight 134 typedef std::map<S32, F32> param_map_t;
136 LLPtrSkipMap<S32, LLUUID*> mTEMap; // maps TE to Image ID 135 param_map_t mVisualParamMap; // maps visual param id to weight
136 typedef std::map<S32, LLUUID> te_map_t;
137 te_map_t mTEMap; // maps TE to Image ID
137 138
138 static const char* sTypeName[ WT_COUNT ]; 139 static const char* sTypeName[ WT_COUNT ];
139 static const char* sTypeLabel[ WT_COUNT ]; 140 static const char* sTypeLabel[ WT_COUNT ];