diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h index 68963e84eb1c87180b2430da8e872723db031b3e..73433b1232dfaf378675c2aef6d2807a4e5ad398 100644 --- a/indra/llcommon/llerror.h +++ b/indra/llcommon/llerror.h @@ -504,9 +504,6 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG; #define LL_VLOGS(level, ...) llvlog(level, false, ##__VA_ARGS__) #define LL_VLOGS_ONCE(level, ...) llvlog(level, true, ##__VA_ARGS__) -// used by LLERROR_CRASH -void crashdriver(void (*)(int*)); - /* // Check at run-time whether logging is enabled, without generating output. Resist the temptation to add a function like this because it incurs the @@ -532,4 +529,7 @@ LL_DEBUGS("SomeTag") performs the locking and map-searching ONCE, then caches the result in a static variable. */ +// used by LLERROR_CRASH +void crashdriver(void (*)(int*)); + #endif // LL_LLERROR_H diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index e0cd5d479a9e5ba2e2936c63fcd1f6b4c48c3a14..6d118441db5e441e5efa59c64f17d2568ce5551a 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -48,6 +48,8 @@ #include <array> +#include <array> + class LLVertexBuffer; class LLCubeMap; class LLImageGL; diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 66ce77b7ead5c03f8d614495285190635c0889d9..9fe9ff9d996b339374d1d060c6195ce7dbd53be7 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -7.0.0 +7.0.1