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

Remove ze gestures

Browse Source
This commit is contained in:
Lirusaito
2019-03-22 18:02:33 -04:00
parent aaeb90436c
commit 3d8e05fa2a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llinventorybridge.cpp
View File

@@ -128,7 +128,7 @@ bool isAddAction(const std::string& action)
bool isRemoveAction(const std::string& action) bool isRemoveAction(const std::string& action)
{ {
return ("take_off" == action || "detach" == action || "deactivate" == action); return ("take_off" == action || "detach" == action);
} }
// Used by LLFolderBridge as callback for directory fetching recursion // Used by LLFolderBridge as callback for directory fetching recursion
@@ -5654,7 +5654,7 @@ void LLGestureBridge::performAction(LLInventoryModel* model, std::string action)
// we need to inform server about gesture activating to be consistent with LLPreviewGesture and LLGestureComboList. // we need to inform server about gesture activating to be consistent with LLPreviewGesture and LLGestureComboList.
BOOL inform_server = TRUE; BOOL inform_server = TRUE;
BOOL deactivate_similar = FALSE; BOOL deactivate_similar = FALSE;
LLGestureMgr::instance().setGestureLoadedCallback(mUUID, boost::bind(&LLGestureBridge::playGesture, mUUID)); LLGestureMgr::instance().setGestureLoadedCallback(mUUID, std::bind(&LLGestureBridge::playGesture, mUUID));
LLViewerInventoryItem* item = gInventory.getItem(mUUID); LLViewerInventoryItem* item = gInventory.getItem(mUUID);
llassert(item); llassert(item);
if (item) if (item)