diff options
author | Dave Parks <none@none> | 2010-06-07 23:05:22 -0500 |
---|---|---|
committer | Dave Parks <none@none> | 2010-06-07 23:05:22 -0500 |
commit | f461ae214c8c998f5a0e3661696a30d27ad2814e (patch) | |
tree | e9430d423ee46fad6cb8319575d37ec925b88e99 /indra/newview/llagentwearablesfetch.h | |
parent | 84e619a6dc9e5a5967c4ce035ac530a4588f72a5 (diff) | |
parent | 48809cb3a9350a0357a0fc710140e2437f3e068e (diff) |
Merge with render-pipeline
Diffstat (limited to 'indra/newview/llagentwearablesfetch.h')
-rw-r--r-- | indra/newview/llagentwearablesfetch.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llagentwearablesfetch.h b/indra/newview/llagentwearablesfetch.h index 6695727d46..faa5fbaa43 100644 --- a/indra/newview/llagentwearablesfetch.h +++ b/indra/newview/llagentwearablesfetch.h @@ -34,7 +34,7 @@ #define LL_LLAGENTWEARABLESINITIALFETCH_H #include "llinventoryobserver.h" -#include "llwearabledictionary.h" +#include "llwearabletype.h" #include "lluuid.h" //-------------------------------------------------------------------- @@ -53,10 +53,10 @@ public: struct InitialWearableData { - EWearableType mType; + LLWearableType::EType mType; LLUUID mItemID; LLUUID mAssetID; - InitialWearableData(EWearableType type, LLUUID& itemID, LLUUID& assetID) : + InitialWearableData(LLWearableType::EType type, LLUUID& itemID, LLUUID& assetID) : mType(type), mItemID(itemID), mAssetID(assetID) |