Auto detach Firestorm bridge

indra/newview/llvoavatarself.cpp

@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llvoavatar.cpp
  * @brief Implementation of LLVOAvatar class which is a derivation fo LLViewerObject
  *
@@ -1182,6 +1182,13 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view
 				gRlvAttachmentLocks.updateLockedHUD();
 		}
 // [/RLVa:KB]
+		bool detach_bridge = gSavedSettings.getBOOL("SGDetachBridge");
+		if (detach_bridge && RlvAttachPtLookup::getAttachPointIndex(viewer_object) == 127)
+		{
+			llinfos << "Bridge detected! detaching" << llendl;
+			LLAppearanceMgr::getInstance()->removeItemFromAvatar(attachment_id);
+		}
+
 	}
 
 	return attachment;