Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge in select parts of https://bitbucket.org/Kitty_Barnett/rlva-development @ 1adfc2cd210c4cf3a8800b31915d363bfe47d045

Browse Source
This commit is contained in:
Shyotl
2015-06-26 20:59:31 -05:00
parent 4d61305095
commit a380161283
27 changed files with 714 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/rlvhelper.h
View File

@@ -276,6 +276,15 @@ protected:
return std::find(m_remWearables.begin(), m_remWearables.end(), pWearable) != m_remWearables.end();
}
/*
* Pending attachments
*/
public:
static void updatePendingAttachments();
protected:
void addPendingAttachment(const LLUUID& idItem, U8 idxPoint);
void remPendingAttachment(const LLUUID& idItem);
protected:
typedef std::pair<LLWearableType::EType, LLInventoryModel::item_array_t> addwearable_pair_t;
typedef std::map<LLWearableType::EType, LLInventoryModel::item_array_t> addwearables_map_t;
@@ -288,6 +297,9 @@ protected:
std::list<const LLViewerWearable*> m_remWearables;
LLInventoryModel::item_array_t m_remGestures;
typedef std::map<LLUUID, U8> pendingattachments_map_t;
pendingattachments_map_t m_pendingAttachments;
private:
friend class LLSingleton<RlvForceWear>;
};