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

Yet another attempt to solve Issue 929, bridge autodetach

Browse Source 
This time we go through with the bridge attach but we setup a callback to detach once attachment process has gone through
This commit is contained in:
Inusaito Sayori
2013-08-24 21:24:23 -04:00
parent 8fc74855da
commit 74698fa3d8
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llvoavatar.cpp
View File

@@ -6191,6 +6191,17 @@ void LLVOAvatar::removeChild(LLViewerObject *childp)
} }
} }
namespace
{
boost::signals2::connection sDetachBridgeConnection;
void detach_bridge(const LLViewerObject* obj, const LLViewerObject* bridge)
{
if (obj != bridge) return;
sDetachBridgeConnection.disconnect();
LLVOAvatarSelf::detachAttachmentIntoInventory(obj->getAttachmentItemID());
}
}
LLViewerJointAttachment* LLVOAvatar::getTargetAttachmentPoint(LLViewerObject* viewer_object) LLViewerJointAttachment* LLVOAvatar::getTargetAttachmentPoint(LLViewerObject* viewer_object)
{ {
S32 attachmentID = ATTACHMENT_ID_FROM_STATE(viewer_object->getState()); S32 attachmentID = ATTACHMENT_ID_FROM_STATE(viewer_object->getState());
@@ -6211,8 +6222,7 @@ LLViewerJointAttachment* LLVOAvatar::getTargetAttachmentPoint(LLViewerObject* vi
if (isSelf() && attachmentID == 127 && gSavedSettings.getBOOL("SGDetachBridge")) if (isSelf() && attachmentID == 127 && gSavedSettings.getBOOL("SGDetachBridge"))
{ {
llinfos << "Bridge detected! detaching" << llendl; llinfos << "Bridge detected! detaching" << llendl;
LLVOAvatarSelf::detachAttachmentIntoInventory(viewer_object->getAttachmentItemID()); sDetachBridgeConnection = gAgentAvatarp->setAttachmentCallback(boost::bind(detach_bridge, _1, viewer_object));
return 0;
} }
// attachment = get_if_there(mAttachmentPoints, 1, (LLViewerJointAttachment*)NULL); // Arbitrary using 1 (chest) // attachment = get_if_there(mAttachmentPoints, 1, (LLViewerJointAttachment*)NULL); // Arbitrary using 1 (chest)
// [SL:KB] - Patch: Appearance-LegacyMultiAttachment | Checked: 2010-08-28 (Catznip-2.2.0a) | Added: Catznip2.1.2a // [SL:KB] - Patch: Appearance-LegacyMultiAttachment | Checked: 2010-08-28 (Catznip-2.2.0a) | Added: Catznip2.1.2a