diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-05 08:40:49 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-05 08:40:49 -0400 |
| commit | 22a47eee84dbaa5c731c000c6013ca558bd15892 (patch) | |
| tree | 8b3128fdb91731d95025b86701431826c441c5ba /indra/newview/llappviewer.h | |
| parent | a6b85244a6f943a4598ff9b7b8a3343eb1e0d11e (diff) | |
| parent | 7ac4c3b56e5246fceaa73e7c9c665d3c04827d6c (diff) | |
Merge branch 'release/luau-scripting' into lua-resultset
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 27e1d32a38..08fbbaa390 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -43,6 +43,7 @@ #ifndef LL_LLAPPVIEWER_H #define LL_LLAPPVIEWER_H +#include "llapp.h" #include "llallocator.h" #include "llapr.h" #include "llcontrol.h" @@ -226,6 +227,9 @@ public: void updateNameLookupUrl(const LLViewerRegion* regionp); + // post given work to the "mainloop" work queue for handling on the main thread + void postToMainCoro(const LL::WorkQueue::Work& work); + protected: virtual bool initWindow(); // Initialize the viewer's window. virtual void initLoggingAndGetLastDuration(); // Initialize log files, logging system @@ -343,7 +347,7 @@ const S32 AGENT_FORCE_UPDATES_PER_SECOND = 1; // "// llstartup" indicates that llstartup is the only client for this global. extern LLSD gDebugInfo; -extern BOOL gShowObjectUpdates; +extern bool gShowObjectUpdates; typedef enum { @@ -384,10 +388,10 @@ extern S32 gPendingMetricsUploads; extern F32 gSimLastTime; extern F32 gSimFrames; -extern BOOL gDisconnected; +extern bool gDisconnected; extern LLFrameTimer gRestoreGLTimer; -extern BOOL gRestoreGL; +extern bool gRestoreGL; extern bool gUseWireframe; extern LLMemoryInfo gSysMemory; @@ -398,13 +402,13 @@ extern std::string gLastVersionChannel; extern LLVector3 gWindVec; extern LLVector3 gRelativeWindVec; extern U32 gPacketsIn; -extern BOOL gPrintMessagesThisFrame; +extern bool gPrintMessagesThisFrame; extern LLUUID gBlackSquareID; -extern BOOL gRandomizeFramerate; -extern BOOL gPeriodicSlowFrame; +extern bool gRandomizeFramerate; +extern bool gPeriodicSlowFrame; -extern BOOL gSimulateMemLeak; +extern bool gSimulateMemLeak; #endif // LL_LLAPPVIEWER_H |