diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-02-02 06:16:53 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-02-02 06:16:53 +0000 |
| commit | 7af677ab442b4bb28f009f3715b8913aecd565fa (patch) | |
| tree | 108e7d0dcb12f6f827d78a0a30b28e33a8cb95f0 /indra/newview/llviewerregion.h | |
| parent | baa81473149b9d5a6718529c4de08393e8a02b92 (diff) | |
| parent | 033d16747c7aab02e67001c210ecdb1cf953e327 (diff) | |
Merged in DV525-merge-6.4.13 (pull request #459)
DRTVWR-525, merge up to 6.4.13
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rw-r--r-- | indra/newview/llviewerregion.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 477aabb971..dfd8c64f76 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -393,6 +393,8 @@ public: BOOL isPaused() const {return mPaused;} S32 getLastUpdate() const {return mLastUpdate;} + std::string getSimHostName(); + static BOOL isNewObjectCreationThrottleDisabled() {return sNewObjectCreationThrottle < 0;} private: |