1 files changed, 3 insertions, 2 deletions

diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index aff1fb8..b9ec9a0 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -287,7 +287,8 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
                 LLInventoryView* view = LLInventoryView::getActiveInventory();
                 if(view)
                 {
-                        LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
+                        LLFocusableElement* focus = gFocusMgr.getKeyboardFocus();
+
                         view->getPanel()->setSelection(content["new_inventory_item"].asUUID(), TAKE_FOCUS_NO);
                         if((LLAssetType::AT_TEXTURE == asset_type || LLAssetType::AT_SOUND == asset_type)
                                 && LLFilePicker::instance().getFileCount() <= FILE_COUNT_DISPLAY_THRESHOLD)
@@ -296,7 +297,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
                         }
                         //LLInventoryView::dumpSelectionInformation((void*)view);
                         // restore keyboard focus
-                        gFocusMgr.setKeyboardFocus(focus_ctrl);
+                        gFocusMgr.setKeyboardFocus(focus);
                 }
         }
         else