diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2016-06-03 16:06:10 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2016-06-03 16:06:10 +0300 |
| commit | e2e208898be7bcc3d3801bfd537a5d84201a1563 (patch) | |
| tree | a297165774ec04db59c0fdcf8b1ee244019ad014 /indra | |
| parent | 3959d7b83f1fdca7d8daf5494dbc02a645cb868f (diff) | |
mac build fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloateroutfitsnapshot.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llfloateroutfitsnapshot.cpp b/indra/newview/llfloateroutfitsnapshot.cpp index 4c4e9bcc48..c29c607449 100644 --- a/indra/newview/llfloateroutfitsnapshot.cpp +++ b/indra/newview/llfloateroutfitsnapshot.cpp @@ -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; diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 459397a0f7..54b12cae12 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -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; } |