From eeb5fb6d35fbc1782dc927ce9fa7357d93b8cc54 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Thu, 3 Oct 2013 15:36:23 -0600
Subject: [PATCH] Make the region hand shake flag bit of empry cache
 independent.

---
 indra/newview/llviewerregion.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 99db71c2eef..6e9f649d232 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);
-- 
GitLab