diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-08-14 17:13:46 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-08-14 17:13:46 -0400 |
| commit | 48b7eff75835058f144bbc27a5b2ef2997be2be4 (patch) | |
| tree | 53cc38357834b0f1b12e9689b77c99c85ed70a64 /indra/newview/llviewerregion.h | |
| parent | 5ee461ab19ac86ef9712ad33435b821f9afe340c (diff) | |
| parent | e7a63cb356d49925131edfadb5a0e8d5368a9096 (diff) | |
Automated merge with https://bitbucket.org/VirLinden/sunshine
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 c9fffaf30e..2ddb17f171 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -278,6 +278,8 @@ public: F32 getLandHeightRegion(const LLVector3& region_pos); + U8 getCentralBakeVersion() { return mCentralBakeVersion; } + void getInfo(LLSD& info); bool meshRezEnabled() const; @@ -395,6 +397,7 @@ private: F32 mBillableFactor; U32 mMaxTasks; // max prim count F32 mCameraDistanceSquared; // updated once per frame + U8 mCentralBakeVersion; // Information for Homestead / CR-53 S32 mClassID; |