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

Merge remote-tracking branch 'singu/master'

Browse Source
This commit is contained in:
Aleric Inglewood
2013-07-29 00:08:05 +02:00
parent 694085ab78 6088ed50a8
commit e88a0d2f9f
86 changed files with 2446 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llvoavatar.cpp
View File

@@ -6211,7 +6211,7 @@ LLViewerJointAttachment* LLVOAvatar::getTargetAttachmentPoint(LLViewerObject* vi
if (isSelf() && attachmentID == 127 && gSavedSettings.getBOOL("SGDetachBridge"))
{
llinfos << "Bridge detected! detaching" << llendl;
LLAppearanceMgr::getInstance()->removeItemFromAvatar(viewer_object->getAttachmentItemID());
LLVOAvatarSelf::detachAttachmentIntoInventory(viewer_object->getAttachmentItemID());
return 0;
}
// attachment = get_if_there(mAttachmentPoints, 1, (LLViewerJointAttachment*)NULL); // Arbitrary using 1 (chest)