diff options
Diffstat (limited to 'linden/indra/newview/llassetuploadresponders.cpp')
-rw-r--r-- | linden/indra/newview/llassetuploadresponders.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp index c8b469a..b024fc2 100644 --- a/linden/indra/newview/llassetuploadresponders.cpp +++ b/linden/indra/newview/llassetuploadresponders.cpp | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -252,7 +252,6 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content) | |||
252 | if(view) | 252 | if(view) |
253 | { | 253 | { |
254 | LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus(); | 254 | LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus(); |
255 | LLFocusMgr::FocusLostCallback callback = gFocusMgr.getFocusCallback(); | ||
256 | 255 | ||
257 | view->getPanel()->setSelection(content["new_inventory_item"].asUUID(), TAKE_FOCUS_NO); | 256 | view->getPanel()->setSelection(content["new_inventory_item"].asUUID(), TAKE_FOCUS_NO); |
258 | if((LLAssetType::AT_TEXTURE == asset_type) | 257 | if((LLAssetType::AT_TEXTURE == asset_type) |
@@ -262,7 +261,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content) | |||
262 | } | 261 | } |
263 | //LLInventoryView::dumpSelectionInformation((void*)view); | 262 | //LLInventoryView::dumpSelectionInformation((void*)view); |
264 | // restore keyboard focus | 263 | // restore keyboard focus |
265 | gFocusMgr.setKeyboardFocus(focus_ctrl, callback); | 264 | gFocusMgr.setKeyboardFocus(focus_ctrl); |
266 | } | 265 | } |
267 | } | 266 | } |
268 | else | 267 | else |