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

LLGestureManager renamed to LLGestureMgr. Also, derived from LLSingleton.

Browse Source
This commit is contained in:
Shyotl
2011-09-03 06:46:47 -05:00
parent 39b8abc4cf
commit 7b2aa741aa
14 changed files with 132 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/rlvhelper.cpp
View File

@@ -335,7 +335,7 @@ bool RlvForceWear::isWearingItem(const LLInventoryItem* pItem)
case LLAssetType::AT_OBJECT:
return (gAgent.getAvatarObject()) && (gAgent.getAvatarObject()->isWearingAttachment(pItem->getUUID()));
case LLAssetType::AT_GESTURE:
return gGestureManager.isGestureActive(pItem->getUUID());
return LLGestureMgr::instance().isGestureActive(pItem->getUUID());
case LLAssetType::AT_LINK:
return isWearingItem(gInventory.getItem(pItem->getLinkedUUID()));
default:
@@ -784,7 +784,7 @@ void RlvForceWear::done()
for (S32 idxGesture = 0, cntGesture = m_remGestures.count(); idxGesture < cntGesture; idxGesture++)
{
LLViewerInventoryItem* pItem = m_remGestures.get(idxGesture);
gGestureManager.deactivateGesture(pItem->getUUID());
LLGestureMgr::instance().deactivateGesture(pItem->getUUID());
gInventory.updateItem(pItem);
gInventory.notifyObservers();
}
@@ -877,7 +877,7 @@ void RlvForceWear::done()
// Process gestures
if (m_addGestures.size())
{
gGestureManager.activateGestures(m_addGestures);
LLGestureMgr::instance().activateGestures(m_addGestures);
for (S32 idxGesture = 0, cntGesture = m_addGestures.count(); idxGesture < cntGesture; idxGesture++)
gInventory.updateItem(m_addGestures.get(idxGesture));
gInventory.notifyObservers();