diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-02 23:16:20 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-02 23:16:20 +0300 |
| commit | 38a2b3db2be5262a3b4c6e505fc89118f858ba04 (patch) | |
| tree | 2699b3a9b1c9ef1ec0791f50b016f93a06480b02 /indra/newview/llviewerwindow.h | |
| parent | 47e474244f42f0e28c8a041d5d34d6656c27db85 (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
Merge branch 'master' into DRTVWR-513-maint
Diffstat (limited to 'indra/newview/llviewerwindow.h')
| -rw-r--r-- | indra/newview/llviewerwindow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index 601140d9d2..299d82d3b2 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -303,6 +303,7 @@ public: BOOL getCursorHidden() { return mCursorHidden; } void moveCursorToCenter(); // move to center of window + void initTextures(S32 location_id); void setShowProgress(const BOOL show); BOOL getShowProgress() const; void setProgressString(const std::string& string); |