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

mac build fix

meow-7.2.2
Mnikolenko ProductEngine 2016-06-03 16:06:10 +03:00
parent 3959d7b83f
commit e2e208898b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloateroutfitsnapshot.cpp
View File

@ -53,8 +53,6 @@
///----------------------------------------------------------------------------
LLOutfitSnapshotFloaterView* gOutfitSnapshotFloaterView = NULL;
const F32 AUTO_SNAPSHOT_TIME_DELAY = 1.f;
const S32 OUTFIT_SNAPSHOT_WIDTH = 256;
const S32 OUTFIT_SNAPSHOT_HEIGHT = 256;

4
indra/newview/llviewermenufile.cpp
View File

@ -510,8 +510,8 @@ class LLFileEnableCloseAllWindows : public view_listener_t
{
LLFloaterSnapshot* floater_snapshot = LLFloaterSnapshot::getInstance();
LLFloaterOutfitSnapshot* floater_outfit_snapshot = LLFloaterOutfitSnapshot::getInstance();
bool is_floaters_snapshot_opened = floater_snapshot && floater_snapshot->isInVisibleChain()
|| floater_outfit_snapshot && floater_outfit_snapshot->isInVisibleChain();
bool is_floaters_snapshot_opened = (floater_snapshot && floater_snapshot->isInVisibleChain())
|| (floater_outfit_snapshot && floater_outfit_snapshot->isInVisibleChain());
bool open_children = gFloaterView->allChildrenClosed() && !is_floaters_snapshot_opened;
return !open_children;
}