diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-06-24 14:11:45 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-06-24 14:11:45 -0600 |
| commit | 9127fe2978f9b29a96034b5a55ac33b873e22159 (patch) | |
| tree | 442eb88e9bb9a3bdf7db457273f0e27ba6c86a46 /indra/newview/llsidepanelappearance.h | |
| parent | b854eceee3a867d64b20de18d6b7ce91b33abed0 (diff) | |
| parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) | |
Merge branch 'master' v 6.4.21 into DRTVWR-528
Diffstat (limited to 'indra/newview/llsidepanelappearance.h')
| -rw-r--r-- | indra/newview/llsidepanelappearance.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h index 7817fd317c..bb9709a2b8 100644 --- a/indra/newview/llsidepanelappearance.h +++ b/indra/newview/llsidepanelappearance.h @@ -56,7 +56,8 @@ public: void fetchInventory(); void inventoryFetched(); - void showOutfitsInventoryPanel(); + void showOutfitsInventoryPanel(); // last selected + void showOutfitsInventoryPanel(const std::string& tab_name); void showOutfitEditPanel(); void showWearableEditPanel(LLViewerWearable *wearable = NULL, BOOL disable_camera_switch = FALSE); void setWearablesLoading(bool val); @@ -72,7 +73,7 @@ private: void onOpenOutfitButtonClicked(); void onEditAppearanceButtonClicked(); - void toggleMyOutfitsPanel(BOOL visible); + void toggleMyOutfitsPanel(BOOL visible, const std::string& tab_name); void toggleOutfitEditPanel(BOOL visible, BOOL disable_camera_switch = FALSE); void toggleWearableEditPanel(BOOL visible, LLViewerWearable* wearable = NULL, BOOL disable_camera_switch = FALSE); |