summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPalmer Truelson <palmer@lindenlab.com>2009-12-07 17:38:45 -0800
committerPalmer Truelson <palmer@lindenlab.com>2009-12-07 17:38:45 -0800
commitcd138869d5bfcf40d3d13d7b887e36263e2919d9 (patch)
treeb5eb821141c486b179618b0157d580c7f346a9d5
parent1590f187cf4e33bbb44215ea65fdc291eefd7971 (diff)
fix of another merge borkasaurus
-rw-r--r--indra/newview/llassetuploadresponders.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index bc606c04a9..f5d5559bda 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