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.cpp | |
| parent | 5ee461ab19ac86ef9712ad33435b821f9afe340c (diff) | |
| parent | e7a63cb356d49925131edfadb5a0e8d5368a9096 (diff) | |
Automated merge with https://bitbucket.org/VirLinden/sunshine
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index fabfde0526..c6f1be4483 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1450,6 +1450,18 @@ void LLViewerRegion::unpackRegionHandshake() mProductName = productName; } + + mCentralBakeVersion = (S32)gSavedSettings.getBOOL("UseServerTextureBaking"); + /* + if (msg->getSize("RegionInfo4", "CentralBakesVersion") > 0) + { + msg->getS32("RegionInfo4", "CentralBakesVersion", mCentralBakeVersion); + } + else + { + mCentralBakeVersion = 0; + } + */ LLVLComposition *compp = getComposition(); if (compp) { |