diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-08 20:44:59 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-08 20:44:59 -0500 |
| commit | 6d953e60b74538aa26b7bfe4ceeee44ac7eefead (patch) | |
| tree | fe9a7b68cb9b5bb9dde3e3035f37e77e303b6994 /indra/newview/llviewerregion.h | |
| parent | 66fdaf51350734d4d69ebcea548165decbb6526a (diff) | |
| parent | 875ce844af0f16c08726445353a6efc25710aef3 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rw-r--r-- | indra/newview/llviewerregion.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index a6e5c47b86..3811b989e7 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -276,6 +276,11 @@ public: void getInfo(LLSD& info); + bool meshRezEnabled() const; + bool meshUploadEnabled() const; + + void getSimulatorFeatures(LLSD& info); + void setSimulatorFeatures(const LLSD& info); typedef enum { @@ -401,6 +406,8 @@ private: bool mCapabilitiesReceived; BOOL mReleaseNotesRequested; + + LLSD mSimulatorFeatures; }; inline BOOL LLViewerRegion::getAllowDamage() const |