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

Innitial commit. Pulled minor changes out of bulk of changes comming for multi-wearables.

Browse Source
This commit is contained in:
Shyotl
2012-02-16 12:00:38 -06:00
parent 9f9a4cbaaf
commit a90d7bbb46
79 changed files with 1162 additions and 1292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/rlvlocks.cpp
View File

@@ -184,7 +184,7 @@ void RlvAttachmentLocks::addAttachmentLock(const LLUUID& idAttachObj, const LLUU
#endif // RLV_RELEASE
m_AttachObjRem.insert(std::pair<LLUUID, LLUUID>(idAttachObj, idRlvObj));
if(LLViewerObject *pObj = gObjectList.findObject(idAttachObj)) //OK
if(LLViewerObject *pObj = gObjectList.findObject(idAttachObj)) //Update labels to (locked)
{
gInventory.addChangedMask(LLInventoryObserver::LABEL, pObj->getAttachmentItemID());
gInventory.notifyObservers();
@@ -206,7 +206,7 @@ void RlvAttachmentLocks::addAttachmentPointLock(S32 idxAttachPt, const LLUUID& i
{
m_AttachPtRem.insert(std::pair<S32, LLUUID>(idxAttachPt, idRlvObj));
LLVOAvatar* pAvatar = gAgentAvatarp;
if (pAvatar)
if (pAvatar) //Update labels to (locked)
{
bool need_update = false;
LLVOAvatar::attachment_map_t::iterator iter = pAvatar->mAttachmentPoints.find(idxAttachPt);
@@ -343,7 +343,7 @@ void RlvAttachmentLocks::removeAttachmentLock(const LLUUID& idAttachObj, const L
if (idRlvObj == itAttachObj->second)
{
m_AttachObjRem.erase(itAttachObj);
if(LLViewerObject *pObj = gObjectList.findObject(idAttachObj)) //OK
if(LLViewerObject *pObj = gObjectList.findObject(idAttachObj)) //Update labels to (locked)
{
gInventory.addChangedMask(LLInventoryObserver::LABEL, pObj->getAttachmentItemID());
gInventory.notifyObservers();
@@ -378,7 +378,7 @@ void RlvAttachmentLocks::removeAttachmentPointLock(S32 idxAttachPt, const LLUUID
break;
}
}
if(removed_entry)
if(removed_entry) //Update labels to (locked)
{
if(m_AttachPtRem.find(idxAttachPt) == m_AttachPtRem.end())
{
@@ -880,7 +880,7 @@ void RlvWearableLocks::addWearableTypeLock(LLWearableType::EType eType, const LL
{
m_WearableTypeRem.insert(std::pair<LLWearableType::EType, LLUUID>(eType, idRlvObj));
LLUUID item_id = gAgentWearables.getWearableItemID(eType, 0); // TODO: MULTI-WEARABLE
if(item_id.notNull())
if(item_id.notNull()) //Update labels to (locked)
{
gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id);
gInventory.notifyObservers();
@@ -971,7 +971,7 @@ void RlvWearableLocks::removeWearableTypeLock(LLWearableType::EType eType, const
break;
}
}
if(removed_entry)
if(removed_entry) //Update labels to (locked)
{
if(m_WearableTypeRem.find(eType) == m_WearableTypeRem.end())
{