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

MAINT-3842 FIXED Using "Close Window" (Ctrl + W) shortcut while in Appearance mode doesn't visually revert any changes...

master
andreylproductengine 2014-03-21 04:55:55 +02:00
parent 4fdf1c34b4
commit 6bbb86811e
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloatersidepanelcontainer.cpp
View File

@ -57,7 +57,7 @@ void LLFloaterSidePanelContainer::onOpen(const LLSD& key)
getChild<LLPanel>(sMainPanelName)->onOpen(key);
}
void LLFloaterSidePanelContainer::onClickCloseBtn(bool)
void LLFloaterSidePanelContainer::closeFloater(bool app_quitting)
{
LLPanelOutfitEdit* panel_outfit_edit =
dynamic_cast<LLPanelOutfitEdit*>(LLFloaterSidePanelContainer::getPanel("appearance", "panel_outfit_edit"));
@ -75,7 +75,7 @@ void LLFloaterSidePanelContainer::onClickCloseBtn(bool)
}
}
LLFloater::onClickCloseBtn();
LLFloater::closeFloater(app_quitting);
}
LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_name, const LLSD& params)

2
indra/newview/llfloatersidepanelcontainer.h
View File

@ -51,7 +51,7 @@ public:
/*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void onClickCloseBtn(bool app_quitting = false);
/*virtual*/ void closeFloater(bool app_quitting = false);
LLPanel* openChildPanel(const std::string& panel_name, const LLSD& params);

6
indra/newview/llpaneleditwearable.cpp
View File

@ -859,10 +859,8 @@ void LLPanelEditWearable::draw()
void LLPanelEditWearable::onClose()
{
if ( isDirty() )
{
revertChanges();
}
// any unsaved changes should be reverted at this point
revertChanges();
}
void LLPanelEditWearable::setVisible(BOOL visible)