diff options
author | McCabe Maxsted | 2010-10-09 03:27:47 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-10-09 03:27:47 -0700 |
commit | 1866bc2af39189c17b636970d4df7edc983c1830 (patch) | |
tree | e60963a49832280cf3d2d9b5a8b589853469caee /linden/indra/newview/llinventorybridge.h | |
parent | Use all those cores for compile (diff) | |
download | meta-impy-1866bc2af39189c17b636970d4df7edc983c1830.zip meta-impy-1866bc2af39189c17b636970d4df7edc983c1830.tar.gz meta-impy-1866bc2af39189c17b636970d4df7edc983c1830.tar.bz2 meta-impy-1866bc2af39189c17b636970d4df7edc983c1830.tar.xz |
Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett
Diffstat (limited to 'linden/indra/newview/llinventorybridge.h')
-rw-r--r-- | linden/indra/newview/llinventorybridge.h | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h index d6001b7..45486ed 100644 --- a/linden/indra/newview/llinventorybridge.h +++ b/linden/indra/newview/llinventorybridge.h | |||
@@ -94,6 +94,41 @@ struct LLAttachmentRezAction | |||
94 | S32 mAttachPt; | 94 | S32 mAttachPt; |
95 | }; | 95 | }; |
96 | 96 | ||
97 | // [RLVa:KB] - Checked: 2009-12-18 (RLVa-1.1.0i) | Added: RLVa-1.1.0i | ||
98 | // Moved from llinventorybridge.cpp because we need it in RlvForceWear | ||
99 | struct LLFoundData | ||
100 | { | ||
101 | LLFoundData(const LLUUID& item_id, | ||
102 | const LLUUID& asset_id, | ||
103 | const std::string& name, | ||
104 | LLAssetType::EType asset_type) : | ||
105 | mItemID(item_id), | ||
106 | mAssetID(asset_id), | ||
107 | mName(name), | ||
108 | mAssetType(asset_type), | ||
109 | mWearable( NULL ) {} | ||
110 | |||
111 | LLUUID mItemID; | ||
112 | LLUUID mAssetID; | ||
113 | std::string mName; | ||
114 | LLAssetType::EType mAssetType; | ||
115 | LLWearable* mWearable; | ||
116 | }; | ||
117 | |||
118 | struct LLWearableHoldingPattern | ||
119 | { | ||
120 | LLWearableHoldingPattern(BOOL fAddToOutfit) : mResolved(0), mAddToOutfit(fAddToOutfit) {} | ||
121 | ~LLWearableHoldingPattern() | ||
122 | { | ||
123 | for_each(mFoundList.begin(), mFoundList.end(), DeletePointer()); | ||
124 | mFoundList.clear(); | ||
125 | } | ||
126 | typedef std::list<LLFoundData*> found_list_t; | ||
127 | found_list_t mFoundList; | ||
128 | S32 mResolved; | ||
129 | BOOL mAddToOutfit; | ||
130 | }; | ||
131 | // [/RLVa:KB] | ||
97 | 132 | ||
98 | //helper functions | 133 | //helper functions |
99 | class LLShowProps | 134 | class LLShowProps |