diff options
author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2024-10-08 17:06:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-08 17:06:20 +0300 |
commit | 6ccae2d0ae977965202ecb45de77e46f8d0312b3 (patch) | |
tree | 0819595c2a50aa7066b0c75b49d3b6c31f5636b9 /indra/newview/tests/llversioninfo_test.cpp | |
parent | ccc7fffb22b347149bf807b9d92677e5616c5017 (diff) | |
parent | 3dca9fc377e855b74a78a5c30464b468dcc82644 (diff) |
Merge branch 'develop' into maxim/lua-nearby-avatars
Diffstat (limited to 'indra/newview/tests/llversioninfo_test.cpp')
-rw-r--r-- | indra/newview/tests/llversioninfo_test.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/tests/llversioninfo_test.cpp b/indra/newview/tests/llversioninfo_test.cpp index 8049e67fc5..b07800cdcd 100644 --- a/indra/newview/tests/llversioninfo_test.cpp +++ b/indra/newview/tests/llversioninfo_test.cpp @@ -29,7 +29,10 @@ #include "../llversioninfo.h" - #include <iostream> +#include <iostream> + +//#include "llgamecontrol_stub.cpp" + // LL_VIEWER_CHANNEL is a macro defined on the compiler command line. The // macro expands to the string name of the channel, but without quotes. We |