diff options
| author | Callum Prentice <callum@gmail.com> | 2020-06-02 13:13:53 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-06-02 13:13:53 -0700 |
| commit | d4a38abdf593a2f1f3cdf1de9bdbf043118cea3a (patch) | |
| tree | 6ec2f986f1f988f60cc0282136277fd046d05975 /indra/newview/llviewerwindow.h | |
| parent | a01f29761263314c21dd4905f05124f4c15df502 (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512
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 385bbd57e5..44c1fbd066 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); |