livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-19823 Additional logging

meow-7.2.2
Andrey Kleshchev 2023-06-12 23:19:02 +03:00
parent 546c6a09d8
commit 7f6ad82a2a
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llui/llfolderview.cpp
View File

@ -702,6 +702,7 @@ void LLFolderView::draw()
{
// renamer is not connected to the item we are renaming in any form so manage it manually
// TODO: consider stopping on any scroll action instead of when out of visible area
LL_DEBUGS("Inventory") << "Renamer out of bounds, hiding" << LL_ENDL;
finishRenamingItem();
}
@ -1046,6 +1047,8 @@ void LLFolderView::paste()
// public rename functionality - can only start the process
void LLFolderView::startRenamingSelectedItem( void )
{
LL_DEBUGS("Inventory") << "Starting inventory renamer" << LL_ENDL;
// make sure selection is visible
scrollToShowSelection();

8
indra/newview/llinventorypanel.cpp
View File

@ -1486,6 +1486,10 @@ void LLInventoryPanel::onSelectionChange(const std::deque<LLFolderViewItem*>& it
{
fv->startRenamingSelectedItem();
}
else
{
LL_DEBUGS("Inventory") << "Failed to start renemr, no items selected" << LL_ENDL;
}
}
std::set<LLFolderViewItem*> selected_items = mFolderRoot.get()->getSelectionList();
@ -1838,6 +1842,7 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
LLPanelMainInventory* main_panel = inventory_panel->getMainInventoryPanel();
if(main_panel->isSingleFolderMode() && main_panel->isGalleryViewMode())
{
LL_DEBUGS("Inventory") << "Opening gallery panel for item" << obj_id << LL_ENDL;
main_panel->setGallerySelection(obj_id);
return;
}
@ -1850,6 +1855,7 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
const LLInventoryObject *obj = gInventory.getObject(obj_id);
if (obj)
{
LL_DEBUGS("Inventory") << "Opening main inventory panel for item" << obj_id << LL_ENDL;
main_inventory->setSingleFolderViewRoot(obj->getParentUUID(), false);
main_inventory->setGallerySelection(obj_id);
return;
@ -1859,7 +1865,7 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
if (active_panel)
{
LL_DEBUGS("Messaging") << "Highlighting" << obj_id << LL_ENDL;
LL_DEBUGS("Messaging", "Inventory") << "Highlighting" << obj_id << LL_ENDL;
if (reset_filter)
{

12
indra/newview/llpanelmaininventory.cpp
View File

@ -199,7 +199,7 @@ BOOL LLPanelMainInventory::postBuild()
}
// Now load the stored settings from disk, if available.
std::string filterSaveName(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, FILTERS_FILENAME));
LL_INFOS() << "LLPanelMainInventory::init: reading from " << filterSaveName << LL_ENDL;
LL_INFOS("Inventory") << "LLPanelMainInventory::init: reading from " << filterSaveName << LL_ENDL;
llifstream file(filterSaveName.c_str());
LLSD savedFilterState;
if (file.is_open())
@ -510,8 +510,6 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
{
if(isCombinationViewMode())
{
//show layout and inventory panel before adding the item
//to avoid wrong position of the 'renamer'
mForceShowInvLayout = true;
}
@ -524,6 +522,13 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
{
// might need to refresh visibility, delay rename
panel->mCombInvUUIDNeedsRename = new_id;
if (panel->isCombinationViewMode())
{
panel->mForceShowInvLayout = true;
}
LL_DEBUGS("Inventory") << "Done creating inventory: " << new_id << LL_ENDL;
}
};
menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata, LLUUID::null, callback_created);
@ -541,6 +546,7 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
if (panel)
{
panel->setGallerySelection(new_id);
LL_DEBUGS("Inventory") << "Done creating inventory: " << new_id << LL_ENDL;
}
}
};

1
indra/newview/llviewerinventory.cpp
View File

@ -1774,6 +1774,7 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
{
panel->setSelectionByID(new_category_id, TRUE);
}
LL_DEBUGS(LOG_INV) << "Done creating inventory: " << new_category_id << LL_ENDL;
};
}
else if (created_cb != NULL)