SL-3136 Logout crash fixes from Ansariel Hiller

doc/contributions.txt

@@ -226,6 +226,7 @@ Ansariel Hiller
 	SL-13364
 	SL-13858
 	SL-13697
+	SL-3136
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191

indra/newview/llattachmentsmgr.cpp

@@ -248,6 +248,7 @@ void LLAttachmentsMgr::linkRecentlyArrivedAttachments()
         {
             if (isAgentAvatarValid() &&
                 gAgentAvatarp->isWearingAttachment(*it) &&
+                !gAgentAvatarp->getWornAttachment(*it)->isTempAttachment() && // Don't link temp attachments in COF!
                 !LLAppearanceMgr::instance().isLinkedInCOF(*it))
             {
                 LLUUID item_id = *it;

indra/newview/llvoiceclient.cpp

@@ -181,6 +181,12 @@ void LLVoiceClient::terminate()
 	if (mVoiceModule) mVoiceModule->terminate();
 	mVoiceModule = NULL;
     m_servicePump = NULL;
+
+    // Shutdown speaker volume storage before LLSingletonBase::deleteAll() does it
+    if (LLSpeakerVolumeStorage::instanceExists())
+    {
+        LLSpeakerVolumeStorage::deleteSingleton();
+    }
 }
 
 const LLVoiceVersionInfo LLVoiceClient::getVersion()