diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-18 11:48:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-18 11:48:37 -0700 |
| commit | 4e593dcded0ab1cc033a9be4d0489d12a8305a7e (patch) | |
| tree | eb12b6af64b6da0444776034025fec9141ce41ce /indra/llwindow/llwindow.h | |
| parent | 3da16d1899324b358ac0d27ddd99bf8214f6fb54 (diff) | |
| parent | 7342ebf43aa7500afe7410b49689a3aefa669e58 (diff) | |
Merge pull request #1797 from secondlife/release/maint-a
merge release/maint-a into develop and close maint-a
Diffstat (limited to 'indra/llwindow/llwindow.h')
| -rw-r--r-- | indra/llwindow/llwindow.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index b7bb426654..5e06e665f3 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -164,8 +164,6 @@ public: virtual F32 getPixelAspectRatio() = 0; virtual void setNativeAspectRatio(F32 aspect) = 0; - virtual void setMaxVRAMMegabytes(U32 max_vram) = 0; - virtual void beforeDialog() {}; // prepare to put up an OS dialog (if special measures are required, such as in fullscreen mode) virtual void afterDialog() {}; // undo whatever was done in beforeDialog() @@ -286,14 +284,14 @@ protected: // Platform-neutral for accessing the platform specific message box S32 OSMessageBox(const std::string& text, const std::string& caption, U32 type); -const U32 OSMB_OK = 0; -const U32 OSMB_OKCANCEL = 1; -const U32 OSMB_YESNO = 2; +constexpr U32 OSMB_OK = 0; +constexpr U32 OSMB_OKCANCEL = 1; +constexpr U32 OSMB_YESNO = 2; -const S32 OSBTN_YES = 0; -const S32 OSBTN_NO = 1; -const S32 OSBTN_OK = 2; -const S32 OSBTN_CANCEL = 3; +constexpr S32 OSBTN_YES = 0; +constexpr S32 OSBTN_NO = 1; +constexpr S32 OSBTN_OK = 2; +constexpr S32 OSBTN_CANCEL = 3; // // LLWindowManager @@ -313,7 +311,6 @@ public: bool ignore_pixel_depth = false, U32 fsaa_samples = 0, U32 max_cores = 0, - U32 max_vram = 0, F32 max_gl_version = 4.6f); static bool destroyWindow(LLWindow* window); static bool isWindowValid(LLWindow *window); @@ -329,6 +326,4 @@ extern const S32 gURLProtocolWhitelistCount; extern const std::string gURLProtocolWhitelist[]; //extern const std::string gURLProtocolWhitelistHandler[]; -void simpleEscapeString ( std::string& stringIn ); - #endif // _LL_window_h_ |