merg
This commit is contained in:
@@ -243,6 +243,7 @@ function AtlasLoot_AdvancedSearchClose()
|
||||
AtlasLootDefaultFrame_AdvancedSearchPanel:Hide();
|
||||
|
||||
if (SearchPrevData[1] ~= "") then
|
||||
AtlasLootDefaultFrame_SubTableScrollFrameUpdate(SearchPrevData[1], SearchPrevData[2], SearchPrevData[4], SearchPrevData[5]);
|
||||
AtlasLoot_ShowItemsFrame(SearchPrevData[1], SearchPrevData[2], SearchPrevData[3], SearchPrevData[4], SearchPrevData[5]);
|
||||
end
|
||||
end
|
||||
|
||||
@@ -292,15 +292,12 @@ function AtlasLoot_SetNewStyle(style)
|
||||
"AtlasLootDefaultFrameLastResultButton",
|
||||
"AtlasLootDefaultFrameWishListButton",
|
||||
"AtlasLootDefaultFrameAdvancedSearchButton",
|
||||
<<<<<<< Updated upstream
|
||||
"AtlasLootDefaultFrame_AdvancedSearchPanel_EquipButton",
|
||||
"AtlasLootDefaultFrame_AdvancedSearchPanel_EquipSubButton",
|
||||
"AtlasLootDefaultFrame_AdvancedSearchPanel_QualityButton",
|
||||
"AtlasLootDefaultFrame_AdvancedSearchPanel_SearchButton",
|
||||
"AtlasLootDefaultFrame_AdvancedSearchPanel_ClearButton",
|
||||
=======
|
||||
"AtlasLootDefaultFrame_MapButton",
|
||||
>>>>>>> Stashed changes
|
||||
}
|
||||
|
||||
if style == "new" then
|
||||
|
||||
Reference in New Issue
Block a user