summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-03-13 22:38:00 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-03-13 22:38:00 -0600
commitbdf562036a8ce864bf211b7696b1d74334030f4b (patch)
tree83ba9c8437cd0fbcf0334b2a7b5d394d82f3a8d4 /indra
parent4624848a6894be669cdb19a82101ea168c407ecd (diff)
for SH-3913: the viewer should notify the region at connect time if it does not have a cache file
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerregion.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index bf4bff60d7..bca2108964 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -2164,7 +2164,13 @@ void LLViewerRegion::unpackRegionHandshake()
msg->addUUID("AgentID", gAgent.getID());
msg->addUUID("SessionID", gAgent.getSessionID());
msg->nextBlock("RegionInfo");
- msg->addU32("Flags", 0x0 );
+
+ U32 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);
}