diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-05-24 18:38:03 +0000 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-05-24 18:38:03 +0000 |
| commit | 7fb07008fc1ab2b7a6d8da3d7079cf0fafda9928 (patch) | |
| tree | 311d04d5aca4a4ab6d0660a6bd5af2fb7bd5e45b /indra/llwindow/llwindowwin32.h | |
| parent | 3365a39080744af0566adb7b6efd8e53fc6b3339 (diff) | |
| parent | 9f9465f5bd2160f0245805e32644ce37f8c6cca6 (diff) | |
Merged in SL-17219 (pull request #992)
SL-17219
Diffstat (limited to 'indra/llwindow/llwindowwin32.h')
| -rw-r--r-- | indra/llwindow/llwindowwin32.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index b391acc12d..bd53b3e92a 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -108,7 +108,9 @@ public: /*virtual*/ F32 getPixelAspectRatio(); /*virtual*/ void setNativeAspectRatio(F32 ratio) { mOverrideAspectRatio = ratio; } - /*virtual*/ BOOL dialogColorPicker(F32 *r, F32 *g, F32 *b ); + U32 getAvailableVRAMMegabytes() override; + + /*virtual*/ BOOL dialogColorPicker(F32 *r, F32 *g, F32 *b ); /*virtual*/ void *getPlatformWindow(); /*virtual*/ void bringToFront(); |