summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelappearance.h
diff options
context:
space:
mode:
authorprep@lindenlab.com <prep@lindenlab.com>2013-05-28 11:51:11 -0500
committerprep@lindenlab.com <prep@lindenlab.com>2013-05-28 11:51:11 -0500
commitc498f53d9ab02a41886b55762883d116801fd39b (patch)
tree027fd1825c5837e51fa8c460d0735a6a19c2b9da /indra/newview/llsidepanelappearance.h
parent34d2cd03765b6b9b582035a933f4ec11fb262ff4 (diff)
Sh-4035: Updated implementation according to new specs. Fixed a couple of outstanding bugs.
Diffstat (limited to 'indra/newview/llsidepanelappearance.h')
-rwxr-xr-xindra/newview/llsidepanelappearance.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h
index caf5be62e9..5042e92f4b 100755
--- a/indra/newview/llsidepanelappearance.h
+++ b/indra/newview/llsidepanelappearance.h
@@ -50,7 +50,8 @@ public:
/*virtual*/ BOOL postBuild();
/*virtual*/ void onOpen(const LLSD& key);
- void onClose(LLFloaterSidePanelContainer* obj);
+ /*virtual*/ void onClose(LLFloaterSidePanelContainer* obj);
+
void onClickCloseBtn();
void refreshCurrentOutfitName(const std::string& name = "");
@@ -72,10 +73,9 @@ public:
bool callBackExitWithoutSaveViaBack(const LLSD& notification, const LLSD& response);
void onClickConfirmExitWithoutSaveViaBack();
bool callBackExitWithoutSaveViaClose(const LLSD& notification, const LLSD& response);
- void onClickConfirmExitWithoutSaveViaClose();
bool checkForDirtyEdits();
- bool callBackExitWithoutSaveIntoAppearance(const LLSD& notification, const LLSD& response);
- void onClickConfirmExitWithoutSaveIntoAppearance();
+ void onClickConfirmExitWithoutSaveIntoAppearance(LLFloaterSidePanelContainer* obj);
+ void onCloseFromAppearance(LLFloaterSidePanelContainer* obj);
private:
void onFilterEdit(const std::string& search_string);
@@ -88,6 +88,9 @@ private:
void toggleOutfitEditPanel(BOOL visible, BOOL disable_camera_switch = FALSE);
void toggleWearableEditPanel(BOOL visible, LLViewerWearable* wearable = NULL, BOOL disable_camera_switch = FALSE);
+
+ bool onSaveCommit(const LLSD& notification, const LLSD& response);
+
LLFilterEditor* mFilterEditor;
LLPanelOutfitsInventory* mPanelOutfitsInventory;
LLPanelOutfitEdit* mOutfitEdit;
@@ -115,6 +118,9 @@ private:
bool mSidePanelJustOpened;
LLFloaterSidePanelContainer* mLLFloaterSidePanelContainer;
+public:
+
+ bool mRevertSet;
};
#endif //LL_LLSIDEPANELAPPEARANCE_H