diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-06-17 11:12:27 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-06-17 11:12:27 -0700 |
| commit | c4c8debfc230b4ec6d28c7a84cd2a9bb81d6c894 (patch) | |
| tree | d01f663d3fc1562d773a229e943addb02d14089f /indra/newview/llviewerregion.h | |
| parent | 51865f4e94885471dba0402b33f0b11b72bbdb30 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rwxr-xr-x | indra/newview/llviewerregion.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 00d3900a88..1e225553b8 100755 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -48,6 +48,8 @@ #define WATER 2 const U32 MAX_OBJECT_CACHE_ENTRIES = 50000; +// Region handshake flags +const U32 REGION_HANDSHAKE_SUPPORTS_SELF_APPEARANCE = 1U << 2; class LLEventPoll; class LLVLComposition; @@ -255,6 +257,7 @@ public: S32 getNumSeedCapRetries(); void setCapability(const std::string& name, const std::string& url); void setCapabilityDebug(const std::string& name, const std::string& url); + bool isCapabilityAvailable(const std::string& name) const; // implements LLCapabilityProvider virtual std::string getCapability(const std::string& name) const; |