diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-02-01 15:59:08 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-02-01 15:59:08 -0700 |
commit | f07b332ef0aafd1ecb82b6077309a5292c9cddc1 (patch) | |
tree | a76fabd4f71bdbb86b7fe6efb9a6acc0529a429c /indra/llrender/llgl.h | |
parent | baa81473149b9d5a6718529c4de08393e8a02b92 (diff) | |
parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) |
Merge branch 'master' into DV525-merge-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; |