From 0a5d7650bd8219998f8a4a3c0548d15c97291c2b Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 5 Dec 2016 18:16:57 +0100
Subject: [PATCH] FIRE-20461: Ctrl+W does not close the Conversations floater
 while it has focus

---
 indra/newview/fsfloatercontacts.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp
index 9c00991bd0..cf2965b17f 100644
--- a/indra/newview/fsfloatercontacts.cpp
+++ b/indra/newview/fsfloatercontacts.cpp
@@ -198,6 +198,12 @@ BOOL FSFloaterContacts::handleKeyHere(KEY key, MASK mask)
 		return TRUE;
 	}
 
+	if (mask == MASK_CONTROL && key == 'W' && getHost())
+	{
+		getHost()->closeFloater();
+		return TRUE;
+	}
+
 	return LLFloater::handleKeyHere(key, mask);
 }