diff options
author | Rider Linden <rider@lindenlab.com> | 2016-09-26 10:39:21 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-09-26 10:39:21 -0700 |
commit | 42dce6766435da1deaea19e837629fdf38c0018d (patch) | |
tree | 063491157df3319f70c811b2b4555806fcd681f8 /indra/newview/llappviewer.cpp | |
parent | d258fe40353642b20524ef320b70e6b9bf0f8ec4 (diff) | |
parent | 51bb369a39142ff5049f753099f9638ce68b95dc (diff) |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 6bc1f67e32..721a7cc00b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -201,6 +201,7 @@ #include "llcommandlineparser.h" #include "llfloatermemleak.h" #include "llfloaterreg.h" +#include "llfloateroutfitsnapshot.h" #include "llfloatersnapshot.h" #include "llfloaterinventory.h" @@ -1447,6 +1448,7 @@ bool LLAppViewer::mainLoop() display(); pingMainloopTimeout("Main:Snapshot"); LLFloaterSnapshot::update(); // take snapshots + LLFloaterOutfitSnapshot::update(); gGLActive = FALSE; } } |