summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-06-07 21:00:49 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-06-07 21:00:59 +0300
commit662370ddea5ad24af00b151ef9e42f19232f9260 (patch)
treec30b88eadda2fa6e954d0e51170e9e08f24e4646 /indra
parent480aa58d159f7874bf3b388b7ea836debc23ceb1 (diff)
SL-19823 Edit not active for items #4
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llinventorypanel.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 80f6ed7e32..c29638ee78 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1871,7 +1871,7 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
inventory_panel->setSelection(obj_id, take_keyboard_focus);
}
}
- else
+ else if (auto_open)
{
LLFloater* floater_inventory = LLFloaterReg::getInstance("inventory");
if (floater_inventory)
@@ -1880,6 +1880,11 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
}
active_panel->setSelection(obj_id, take_keyboard_focus);
}
+ else
+ {
+ // Created items are going to receive proper focus from callbacks
+ active_panel->setSelection(obj_id, take_keyboard_focus);
+ }
}
}