From cd138869d5bfcf40d3d13d7b887e36263e2919d9 Mon Sep 17 00:00:00 2001
From: Palmer Truelson <palmer@lindenlab.com>
Date: Mon, 7 Dec 2009 17:38:45 -0800
Subject: [PATCH] fix of another merge borkasaurus

---
 indra/newview/llassetuploadresponders.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index bc606c04a96..f5d5559bda5 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -380,7 +380,6 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
 		mPostData["description"],
 		content,
 		expected_upload_cost);
-			LLFocusableElement* focus = gFocusMgr.getKeyboardFocus();
 
 	// continue uploading for bulk uploads
 
-- 
GitLab