diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-02-01 22:14:56 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-02-01 22:14:56 +0200 |
| commit | f047e2236c240aab0a633b147818b79b6746b2c5 (patch) | |
| tree | ac67c13356c08300df9e7c61bab700ab73e25a3b /indra/newview/llviewerregion.h | |
| parent | 0d324bb24db49f6f28d7e7f14fd69e7676de8fe6 (diff) | |
| parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) | |
Merge branch 'master' into DRTVWR-522-maint
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: |