From a4b2ecc4f75c5f78a17cb4605976d5cb2bde76a1 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Sat, 28 Dec 2013 18:59:20 +0100
Subject: [PATCH] Fix issue 1113, "detaching editted attachment does not
 unfreeze avatar"

Detaching an attachment didn't reset the select managers pause request
for the avatar.
---
 indra/newview/llviewerobject.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index b81deb190..d7735edc2 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -358,6 +358,14 @@ void LLViewerObject::markDead()
 	{
 		//llinfos << "Marking self " << mLocalID << " as dead." << llendl;
 		
+		//<singu>
+		if (isSelected())
+		{
+			// This is needed in order to reset mPauseRequest in case this is an attachment.
+			LLSelectMgr::getInstance()->deselectObjectAndFamily(this);
+		}
+		//</singu>
+
 		// Root object of this hierarchy unlinks itself.
 		if (getParent())
 		{