diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-07 14:42:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-07 14:42:54 -0500 |
| commit | f1784209d5fc4e3f9402fbc8fa66de5a67a73f70 (patch) | |
| tree | 56922332d7fce623e1ad973e09f72d9dd982b289 /indra/newview/llviewerregion.h | |
| parent | 690f18c948003c9d14524da8cdf5b82da8227758 (diff) | |
| parent | 81af06c95490a54e69b6bbf01ae2ef98adb66a02 (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 |