diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-02-02 06:16:53 +0000 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-02-02 06:16:53 +0000 |
commit | 7af677ab442b4bb28f009f3715b8913aecd565fa (patch) | |
tree | 108e7d0dcb12f6f827d78a0a30b28e33a8cb95f0 /indra/llrender/llgl.h | |
parent | baa81473149b9d5a6718529c4de08393e8a02b92 (diff) | |
parent | 033d16747c7aab02e67001c210ecdb1cf953e327 (diff) |
Merged in DV525-merge-6.4.13 (pull request #459)
DRTVWR-525, merge up to 6.4.13
Diffstat (limited to 'indra/llrender/llgl.h')
-rw-r--r-- | indra/llrender/llgl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index 3d597a23fe..a07e2d9bb0 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -162,6 +162,8 @@ public: void printGLInfoString(); void getGLInfo(LLSD& info); + void asLLSD(LLSD& info); + // In ALL CAPS std::string mGLVendor; std::string mGLVendorShort; |