summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-10-03 15:36:23 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-10-03 15:36:23 -0600
commiteeb5fb6d35fbc1782dc927ce9fa7357d93b8cc54 (patch)
tree6e0deedde746c7f4a7dd19f5bfcb536cc2c6bd86
parent3fa868e9d65f221a8080b281ec836acc1aa5fd48 (diff)
Make the region hand shake flag bit of empry cache independent.
-rwxr-xr-xindra/newview/llviewerregion.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 99db71c2ee..6e9f649d23 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -2483,11 +2483,11 @@ void LLViewerRegion::unpackRegionHandshake()
U32 flags = 0;
if(sVOCacheCullingEnabled)
{
- flags = 0x00000001; //set the bit 0 to be 1 to ask sim to send all cacheable objects.
- if(mImpl->mCacheMap.empty())
- {
- flags |= 0x00000002; //set the bit 1 to be 1 to tell sim the cache file is empty, no need to send cache probes.
- }
+ flags |= 0x00000001; //set the bit 0 to be 1 to ask sim to send all cacheable objects.
+ }
+ if(mImpl->mCacheMap.empty())
+ {
+ flags |= 0x00000002; //set the bit 1 to be 1 to tell sim the cache file is empty, no need to send cache probes.
}
msg->addU32("Flags", flags );
msg->sendReliable(host);