1 files changed, 49 insertions, 99 deletions

diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 0f20fd8..0a21e45 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -202,8 +202,9 @@ void LLViewerRegion::loadCache()
         }
 
         U32 zero;
-        fread(&zero, 1, sizeof(U32), fp);
-        if (zero)
+        size_t nread;
+        nread = fread(&zero, sizeof(U32), 1, fp);
+        if (nread != 1 || zero)
         {
                 // a non-zero value here means bad things!
                 // skip reading the cached values
@@ -213,8 +214,8 @@ void LLViewerRegion::loadCache()
         }
 
         U32 version;
-        fread(&version, 1, sizeof(U32), fp);
-        if (version != INDRA_OBJECT_CACHE_VERSION)
+        nread = fread(&version, sizeof(U32), 1, fp);
+        if (nread != 1 || version != INDRA_OBJECT_CACHE_VERSION)
         {
                 // a version mismatch here means we've changed the binary format!
                 // skip reading the cached values
@@ -224,8 +225,8 @@ void LLViewerRegion::loadCache()
         }
 
         LLUUID cache_id;
-        fread(&cache_id.mData, UUID_BYTES, sizeof(U8), fp);
-        if (mCacheID != cache_id)
+        nread = fread(&cache_id.mData, 1, UUID_BYTES, fp);
+        if (nread != UUID_BYTES || mCacheID != cache_id)
         {
                 llinfos << "Cache ID doesn't match for this region, discarding"
                         << llendl;
@@ -234,7 +235,14 @@ void LLViewerRegion::loadCache()
         }
 
         S32 num_entries;
-        fread(&num_entries, 1, sizeof(S32), fp);
+        nread = fread(&num_entries, sizeof(S32), 1, fp);
+        if (nread != 1)
+        {
+                llinfos << "Short read, discarding" << llendl;
+                fclose(fp);
+                return;
+        }
+        
         S32 i;
         for (i = 0; i < num_entries; i++)
         {
@@ -284,16 +292,28 @@ void LLViewerRegion::saveCache()
 
         // write out zero to indicate a version cache file
         U32 zero = 0;
-        fwrite(&zero, 1, sizeof(U32), fp);
+        if (fwrite(&zero, sizeof(U32), 1, fp) != 1)
+        {
+                llwarns << "Short write" << llendl;
+        }
 
         // write out version number
         U32 version = INDRA_OBJECT_CACHE_VERSION;
-        fwrite(&version, 1, sizeof(U32), fp);
+        if (fwrite(&version, sizeof(U32), 1, fp) != 1)
+        {
+                llwarns << "Short write" << llendl;
+        }
 
         // write the cache id for this sim
-        fwrite(&mCacheID.mData, UUID_BYTES, sizeof(U8), fp);
+        if (fwrite(&mCacheID.mData, 1, UUID_BYTES, fp) != UUID_BYTES)
+        {
+                llwarns << "Short write" << llendl;
+        }
 
-        fwrite(&num_entries, 1, sizeof(S32), fp);
+        if (fwrite(&num_entries, sizeof(S32), 1, fp) != 1)
+        {
+                llwarns << "Short write" << llendl;
+        }
 
         LLVOCacheEntry *entry;
 
@@ -321,89 +341,15 @@ void LLViewerRegion::sendReliableMessage()
         gMessageSystem->sendReliable(mHost);
 }
 
-
-void LLViewerRegion::setAllowDamage(BOOL b)
-{
-        if (b)
-        {
-                mRegionFlags |=  REGION_FLAGS_ALLOW_DAMAGE;
-        }
-        else
-        {
-                mRegionFlags &= ~REGION_FLAGS_ALLOW_DAMAGE;
-        }
-}
-
-
-void LLViewerRegion::setAllowLandmark(BOOL b)
-{
-        if (b)
-        {
-                mRegionFlags |=  REGION_FLAGS_ALLOW_LANDMARK;
-        }
-        else
-        {
-                mRegionFlags &= ~REGION_FLAGS_ALLOW_LANDMARK;
-        }
-}
-
-void LLViewerRegion::setAllowSetHome(BOOL b)
-{
-        if (b)
-        {
-                mRegionFlags |=  REGION_FLAGS_ALLOW_SET_HOME;
-        }
-        else
-        {
-                mRegionFlags &= ~REGION_FLAGS_ALLOW_SET_HOME;
-        }
-}
-
-void LLViewerRegion::setResetHomeOnTeleport(BOOL b)
+void LLViewerRegion::setFlags(BOOL b, U32 flags)
 {
         if (b)
         {
-                mRegionFlags |=  REGION_FLAGS_RESET_HOME_ON_TELEPORT;
+                mRegionFlags |=  flags;
         }
         else
         {
-                mRegionFlags &= ~REGION_FLAGS_RESET_HOME_ON_TELEPORT;
-        }
-}
-
-void LLViewerRegion::setSunFixed(BOOL b)
-{
-        if (b)
-        {
-                mRegionFlags |=  REGION_FLAGS_SUN_FIXED;
-        }
-        else
-        {
-                mRegionFlags &= ~REGION_FLAGS_SUN_FIXED;
-        }
-}
-
-void LLViewerRegion::setBlockFly(BOOL b)
-{
-        if (b)
-        {
-                mRegionFlags |= REGION_FLAGS_BLOCK_FLY;
-        }
-        else
-        {
-                mRegionFlags &= ~REGION_FLAGS_BLOCK_FLY;
-        }
-}
-
-void LLViewerRegion::setAllowDirectTeleport(BOOL b)
-{
-        if (b)
-        {
-                mRegionFlags |= REGION_FLAGS_ALLOW_DIRECT_TELEPORT;
-        }
-        else
-        {
-                mRegionFlags &= ~REGION_FLAGS_ALLOW_DIRECT_TELEPORT;
+                mRegionFlags &= ~flags;
         }
 }
 
@@ -737,14 +683,7 @@ void LLViewerRegion::calculateCenterGlobal()
         mCenterGlobal = mOriginGlobal;
         mCenterGlobal.mdV[VX] += 0.5 * mWidth;
         mCenterGlobal.mdV[VY] += 0.5 * mWidth;
-        if (mLandp)
-        {
-                mCenterGlobal.mdV[VZ] = 0.5*mLandp->getMinZ() + mLandp->getMaxZ();
-        }
-        else
-        {
-                mCenterGlobal.mdV[VZ] = F64( getWaterHeight() );
-        }
+        mCenterGlobal.mdV[VZ] = 0.5*mLandp->getMinZ() + mLandp->getMaxZ();
 }
 
 void LLViewerRegion::calculateCameraDistance()
@@ -867,13 +806,23 @@ F32 LLViewerRegion::getLandHeightRegion(const LLVector3& region_pos)
 
 BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos)
 {
-        return mParcelOverlay->isOwnedSelf(pos);
+        if (mParcelOverlay)
+        {
+                return mParcelOverlay->isOwnedSelf(pos);
+        } else {
+                return FALSE;
+        }
 }
 
 // Owned by a group you belong to?  (officer or member)
 BOOL LLViewerRegion::isOwnedGroup(const LLVector3& pos)
 {
-        return mParcelOverlay->isOwnedGroup(pos);
+        if (mParcelOverlay)
+        {
+                return mParcelOverlay->isOwnedGroup(pos);
+        } else {
+                return FALSE;
+        }
 }
 
 void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
@@ -1325,9 +1274,10 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         capabilityNames.append("UntrustedSimulatorMessage");
         capabilityNames.append("ParcelVoiceInfoRequest");
         capabilityNames.append("ChatSessionRequest");
+        capabilityNames.append("ProvisionVoiceAccountRequest");
 
         llinfos << "posting to seed " << url << llendl;
-        
+
         LLHTTPClient::post(url, capabilityNames, BaseCapabilitiesComplete::build(this));
 }