Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix "Save As doesn't enable if File Menu is torn off"

Browse Source 
SV-2005 #close Fixfixed
This commit is contained in:
Lirusaito
2016-02-05 23:38:58 -05:00
parent 07302b45fd
commit 710b75b3a9
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llviewermenufile.cpp
View File

@@ -95,9 +95,26 @@ class LLFileEnableSaveAs : public view_listener_t
{ {
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{ {
bool new_value = gFloaterView->getFrontmost() && LLFloater* frontmost = gFloaterView->getFrontmost();
gFloaterView->getFrontmost()->canSaveAs(); if (frontmost && frontmost->hasChild("Save Preview As...", true)) // If we're the tearoff.
gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value); {
// Get the next frontmost sibling.
const LLView::child_list_const_iter_t kids_end = gFloaterView->endChild();
LLView::child_list_const_iter_t kid = std::find(gFloaterView->beginChild(), kids_end, frontmost);
if (kids_end != kid)
{
for (++kid; kid != kids_end; ++kid)
{
LLView* viewp = *kid;
if (viewp->getVisible() && !viewp->isDead())
{
frontmost = static_cast<LLFloater*>(viewp);
break;
}
}
}
}
gMenuHolder->findControl(userdata["control"].asString())->setValue(frontmost && frontmost->canSaveAs());
return true; return true;
} }
}; };