diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-18 10:58:18 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-18 10:58:18 +0100 |
| commit | 478c28539b64925526e79844c829cdd012c0b8ec (patch) | |
| tree | 6e580ae150bc6942b393ad4bb73213c9f81fe909 /indra/newview/llsidepanelappearance.h | |
| parent | ff7e83c3aa26bbaa380305a97dffbf22c0f7a747 (diff) | |
| parent | b6ed10e8285e4abef4f14c618186984ef4b2cf7f (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llsidepanelappearance.h')
| -rw-r--r-- | indra/newview/llsidepanelappearance.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h index 2900831099..a919b07ed6 100644 --- a/indra/newview/llsidepanelappearance.h +++ b/indra/newview/llsidepanelappearance.h @@ -60,11 +60,10 @@ public: void fetchInventory(); void inventoryFetched(); - void updateVerbs(); void onNewOutfitButtonClicked(); void showOutfitsInventoryPanel(); - void showOutfitEditPanel(); + void showOutfitEditPanel(bool update); void setWearablesLoading(bool val); private: @@ -73,12 +72,11 @@ private: void onOpenOutfitButtonClicked(); void onEditAppearanceButtonClicked(); void onEditOutfitButtonClicked(); - void onEditButtonClicked(); void onEditWearBackClicked(); //@deprecated use showXXX() methods instead void toggleOutfitEditPanel(BOOL visible); - void toggleWearableEditPanel(BOOL visible, LLWearable* wearable); + void toggleWearableEditPanel(BOOL visible, LLWearable* wearable = NULL); LLFilterEditor* mFilterEditor; LLPanelOutfitsInventory* mPanelOutfitsInventory; @@ -87,7 +85,6 @@ private: LLButton* mOpenOutfitBtn; LLButton* mEditAppearanceBtn; - LLButton* mEditBtn; LLButton* mNewOutfitBtn; LLPanel* mCurrOutfitPanel; @@ -103,10 +100,6 @@ private: // Search string for filtering landmarks and teleport // history locations std::string mFilterSubString; - - // Information type currently shown in Look Information panel - std::string mLookInfoType; - }; #endif //LL_LLSIDEPANELAPPEARANCE_H |