diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-06 19:13:08 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-06 19:13:08 -0500 |
| commit | 5cfc4764db10b91b5f34dc29d1505faaf597c7b7 (patch) | |
| tree | 9bdf3a47475f34d7459ad5108e72cc087e9b5f58 /indra/newview/llviewerregion.h | |
| parent | c4b7728f0ef19efcaef02ccabf7d98f5b340cfd3 (diff) | |
| parent | b3fbb12f155ae1acc6b4d258d1c383d5d8e47964 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rw-r--r-- | 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 d936277231..3811b989e7 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -276,6 +276,9 @@ public: void getInfo(LLSD& info); + bool meshRezEnabled() const; + bool meshUploadEnabled() const; + void getSimulatorFeatures(LLSD& info); void setSimulatorFeatures(const LLSD& info); |