Applied patch by Aleric Inglewood for VWR-12984: Water flickers and disappears in patches, part 1

1 files changed, 11 insertions, 7 deletions

diff --git a/linden/indra/newview/llfloatergodtools.cpp b/linden/indra/newview/llfloatergodtools.cpp
index 2bbbc65..461dfe2 100644
--- a/linden/indra/newview/llfloatergodtools.cpp
+++ b/linden/indra/newview/llfloatergodtools.cpp
@@ -252,13 +252,6 @@ void LLFloaterGodTools::onTabChanged(void* data, bool from_click)
 // static
 void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
 {
-        LLHost host = msg->getSender();
-        if (host != gAgent.getRegionHost())
-        {
-                // update is for a different region than the one we're in
-                return;
-        }
-
         //const S32 SIM_NAME_BUF = 256;
         U32 region_flags;
         U8 sim_access;
@@ -276,6 +269,8 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
         S32 redirect_grid_y;
         LLUUID cache_id;
 
+        LLHost host = msg->getSender();
+
         msg->getStringFast(_PREHASH_RegionInfo, _PREHASH_SimName, sim_name);
         msg->getU32Fast(_PREHASH_RegionInfo, _PREHASH_EstateID, estate_id);
         msg->getU32Fast(_PREHASH_RegionInfo, _PREHASH_ParentEstateID, parent_estate_id);
@@ -285,6 +280,15 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
         msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_ObjectBonusFactor, object_bonus_factor);
         msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_BillableFactor, billable_factor);
         msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_WaterHeight, water_height);
+
+        if (host != gAgent.getRegionHost())
+        {
+                // Update is for a different region than the one we're in.
+                // Just check for a waterheight change.
+                LLWorld::getInstance()->waterHeightRegionInfo(sim_name, water_height);
+                return;
+        }
+
         msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainRaiseLimit, terrain_raise_limit);
         msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainLowerLimit, terrain_lower_limit);
         msg->getS32Fast(_PREHASH_RegionInfo, _PREHASH_PricePerMeter, price_per_meter);