1 files changed, 91 insertions, 101 deletions

diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 165fb5ef88..ac3e942e15 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -148,40 +148,6 @@ public:
     static LLSD getIDs( sparam_t::const_iterator it, sparam_t::const_iterator end, S32 count );
 };
 
-
-/*
-void unpack_request_params(
-    LLMessageSystem* msg,
-    LLDispatcher::sparam_t& strings,
-    LLDispatcher::iparam_t& integers)
-{
-    char str_buf[MAX_STRING];
-    S32 str_count = msg->getNumberOfBlocksFast(_PREHASH_StringData);
-    S32 i;
-    for (i = 0; i < str_count; ++i)
-    {
-        // we treat the SParam as binary data (since it might be an
-        // LLUUID in compressed form which may have embedded \0's,)
-        str_buf[0] = '\0';
-        S32 data_size = msg->getSizeFast(_PREHASH_StringData, i, _PREHASH_SParam);
-        if (data_size >= 0)
-        {
-            msg->getBinaryDataFast(_PREHASH_StringData, _PREHASH_SParam,
-                                   str_buf, data_size, i, MAX_STRING - 1);
-            strings.push_back(std::string(str_buf, data_size));
-        }
-    }
-
-    U32 int_buf;
-    S32 int_count = msg->getNumberOfBlocksFast(_PREHASH_IntegerData);
-    for (i = 0; i < int_count; ++i)
-    {
-        msg->getU32("IntegerData", "IParam", int_buf, i);
-        integers.push_back(int_buf);
-    }
-}
-*/
-
 class LLPanelRegionEnvironment : public LLPanelEnvironmentInfo
 {
 public:
@@ -326,8 +292,8 @@ void LLFloaterRegionInfo::onOpen(const LLSD& key)
         disableTabCtrls();
         return;
     }
-    refreshFromRegion(gAgent.getRegion());
-    requestRegionInfo();
+    refreshFromRegion(gAgent.getRegion(), ERefreshFromRegionPhase::BeforeRequestRegionInfo);
+    requestRegionInfo(true);
 
     if (!mGodLevelChangeSlot.connected())
     {
@@ -347,12 +313,14 @@ void LLFloaterRegionInfo::onRegionChanged()
 {
     if (getVisible()) //otherwise onOpen will do request
     {
-        requestRegionInfo();
+        requestRegionInfo(false);
     }
 }
 
-void LLFloaterRegionInfo::requestRegionInfo()
+void LLFloaterRegionInfo::requestRegionInfo(bool is_opening)
 {
+    mIsRegionInfoRequestedFromOpening = is_opening;
+
     LLTabContainer* tab = findChild<LLTabContainer>("region_panels");
     if (tab)
     {
@@ -523,8 +491,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
 
     panel->getChild<LLSpinCtrl>("agent_limit_spin")->setMaxValue((F32)hard_agent_limit);
 
-    LLPanelRegionGeneralInfo* panel_general = LLFloaterRegionInfo::getPanelGeneral();
-    if (panel)
+    if (LLPanelRegionGeneralInfo* panel_general = LLFloaterRegionInfo::getPanelGeneral())
     {
         panel_general->setObjBonusFactor(object_bonus_factor);
     }
@@ -537,6 +504,18 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
     panel->getChildView("access_combo")->setEnabled(gAgent.isGodlike() || (region && region->canManageEstate() && !teen_grid));
     panel->setCtrlsEnabled(allow_modify);
 
+    panel->getChild<LLLineEditor>("estate_id")->setValue((S32)region_info.mEstateID);
+
+    if (region)
+    {
+        panel->getChild<LLLineEditor>("grid_position_x")->setValue((S32)(region->getOriginGlobal()[VX] / 256));
+        panel->getChild<LLLineEditor>("grid_position_y")->setValue((S32)(region->getOriginGlobal()[VY] / 256));
+    }
+    else
+    {
+        panel->getChild<LLLineEditor>("grid_position_x")->setDefaultText();
+        panel->getChild<LLLineEditor>("grid_position_y")->setDefaultText();
+    }
 
     // DEBUG PANEL
     panel = tab->getChild<LLPanel>("Debug");
@@ -561,21 +540,25 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
     {
         // Note: region info also causes LLRegionInfoModel::instance().update(msg); -> requestRegion(); -> changed message
         // we need to know env version here and in update(msg) to know when to request and when not to, when to filter 'changed'
-        floater->refreshFromRegion(gAgent.getRegion());
+        ERefreshFromRegionPhase phase = floater->mIsRegionInfoRequestedFromOpening ?
+            ERefreshFromRegionPhase::AfterRequestRegionInfo :
+            ERefreshFromRegionPhase::NotFromFloaterOpening;
+        floater->refreshFromRegion(gAgent.getRegion(), phase);
     } // else will rerequest on onOpen either way
 }
 
 // static
-void LLFloaterRegionInfo::sRefreshFromRegion(LLViewerRegion* region)
+void LLFloaterRegionInfo::refreshFromRegion(LLViewerRegion* region)
 {
-    if (region != gAgent.getRegion()) { return; }
-
-    LLFloaterRegionInfo* floater = LLFloaterReg::getTypedInstance<LLFloaterRegionInfo>("region_info");
-    if (!floater) { return; }
+    if (region != gAgent.getRegion())
+        return;
 
-    if (floater->getVisible() && region == gAgent.getRegion())
+    if (LLFloaterRegionInfo* floater = LLFloaterReg::getTypedInstance<LLFloaterRegionInfo>("region_info"))
     {
-        floater->refreshFromRegion(region);
+        if (floater->getVisible() && region == gAgent.getRegion())
+        {
+            floater->refreshFromRegion(region, ERefreshFromRegionPhase::NotFromFloaterOpening);
+        }
     }
 }
 
@@ -682,7 +665,7 @@ void LLFloaterRegionInfo::onTabSelected(const LLSD& param)
     active_panel->onOpen(LLSD());
 }
 
-void LLFloaterRegionInfo::refreshFromRegion(LLViewerRegion* region)
+void LLFloaterRegionInfo::refreshFromRegion(LLViewerRegion* region, ERefreshFromRegionPhase phase)
 {
     if (!region)
     {
@@ -692,7 +675,7 @@ void LLFloaterRegionInfo::refreshFromRegion(LLViewerRegion* region)
     // call refresh from region on all panels
     for (const auto& infoPanel : mInfoPanels)
     {
-        infoPanel->refreshFromRegion(region);
+        infoPanel->refreshFromRegion(region, phase);
     }
     mEnvironmentPanel->refreshFromRegion(region);
 }
@@ -725,7 +708,7 @@ void LLFloaterRegionInfo::onGodLevelChange(U8 god_level)
     LLFloaterRegionInfo* floater = LLFloaterReg::getTypedInstance<LLFloaterRegionInfo>("region_info");
     if (floater && floater->getVisible())
     {
-        refreshFromRegion(gAgent.getRegion());
+        refreshFromRegion(gAgent.getRegion(), ERefreshFromRegionPhase::NotFromFloaterOpening);
     }
 }
 
@@ -795,7 +778,7 @@ void LLPanelRegionInfo::updateChild(LLUICtrl* child_ctr)
 }
 
 // virtual
-bool LLPanelRegionInfo::refreshFromRegion(LLViewerRegion* region)
+bool LLPanelRegionInfo::refreshFromRegion(LLViewerRegion* region, ERefreshFromRegionPhase phase)
 {
     if (region) mHost = region->getHost();
     return true;
@@ -823,12 +806,10 @@ void LLPanelRegionInfo::sendEstateOwnerMessage(
     }
     else
     {
-        strings_t::const_iterator it = strings.begin();
-        strings_t::const_iterator end = strings.end();
-        for(; it != end; ++it)
+        for (const std::string& string : strings)
         {
             msg->nextBlock("ParamList");
-            msg->addString("Parameter", *it);
+            msg->addString("Parameter", string);
         }
     }
     msg->sendReliable(mHost);
@@ -887,13 +868,16 @@ void LLPanelRegionInfo::onClickManageRestartSchedule()
 /////////////////////////////////////////////////////////////////////////////
 // LLPanelRegionGeneralInfo
 //
-bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region)
+bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region, ERefreshFromRegionPhase phase)
 {
     bool allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
     setCtrlsEnabled(allow_modify);
     getChildView("apply_btn")->setEnabled(false);
     getChildView("access_text")->setEnabled(allow_modify);
     // getChildView("access_combo")->setEnabled(allow_modify);
+    getChildView("estate_id")->setEnabled(false);
+    getChildView("grid_position_x")->setEnabled(false);
+    getChildView("grid_position_y")->setEnabled(false);
     // now set in processRegionInfo for teen grid detection
     getChildView("kick_btn")->setEnabled(allow_modify);
     getChildView("kick_all_btn")->setEnabled(allow_modify);
@@ -904,7 +888,7 @@ bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region)
 
     // Data gets filled in by processRegionInfo
 
-    return LLPanelRegionInfo::refreshFromRegion(region);
+    return LLPanelRegionInfo::refreshFromRegion(region, phase);
 }
 
 bool LLPanelRegionGeneralInfo::postBuild()
@@ -1173,7 +1157,7 @@ bool LLPanelRegionDebugInfo::postBuild()
 }
 
 // virtual
-bool LLPanelRegionDebugInfo::refreshFromRegion(LLViewerRegion* region)
+bool LLPanelRegionDebugInfo::refreshFromRegion(LLViewerRegion* region, ERefreshFromRegionPhase phase)
 {
     bool allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
     setCtrlsEnabled(allow_modify);
@@ -1191,7 +1175,7 @@ bool LLPanelRegionDebugInfo::refreshFromRegion(LLViewerRegion* region)
     getChildView("cancel_restart_btn")->setEnabled(allow_modify);
     getChildView("region_debug_console_btn")->setEnabled(allow_modify);
 
-    return LLPanelRegionInfo::refreshFromRegion(region);
+    return LLPanelRegionInfo::refreshFromRegion(region, phase);
 }
 
 // virtual
@@ -1233,7 +1217,7 @@ void LLPanelRegionDebugInfo::callbackAvatarID(const uuid_vec_t& ids, const std::
     if (ids.empty() || names.empty()) return;
     mTargetAvatar = ids[0];
     getChild<LLUICtrl>("target_avatar_name")->setValue(LLSD(names[0].getCompleteName()));
-    refreshFromRegion( gAgent.getRegion() );
+    refreshFromRegion(gAgent.getRegion(), ERefreshFromRegionPhase::NotFromFloaterOpening);
 }
 
 // static
@@ -1675,7 +1659,7 @@ void LLPanelRegionTerrainInfo::updateForMaterialType()
 }
 
 // virtual
-bool LLPanelRegionTerrainInfo::refreshFromRegion(LLViewerRegion* region)
+bool LLPanelRegionTerrainInfo::refreshFromRegion(LLViewerRegion* region, ERefreshFromRegionPhase phase)
 {
     bool owner_or_god = gAgent.isGodlike()
                         || (region && (region->getOwner() == gAgent.getID()));
@@ -1819,7 +1803,7 @@ bool LLPanelRegionTerrainInfo::refreshFromRegion(LLViewerRegion* region)
     getChildView("upload_raw_btn")->setEnabled(owner_or_god);
     getChildView("bake_terrain_btn")->setEnabled(owner_or_god);
 
-    return LLPanelRegionInfo::refreshFromRegion(region);
+    return LLPanelRegionInfo::refreshFromRegion(region, phase);
 }
 
 
@@ -2289,25 +2273,27 @@ void LLPanelEstateInfo::updateControls(LLViewerRegion* region)
     refresh();
 }
 
-bool LLPanelEstateInfo::refreshFromRegion(LLViewerRegion* region)
+bool LLPanelEstateInfo::refreshFromRegion(LLViewerRegion* region, ERefreshFromRegionPhase phase)
 {
     updateControls(region);
 
     // let the parent class handle the general data collection.
-    bool rv = LLPanelRegionInfo::refreshFromRegion(region);
-
-    // We want estate info. To make sure it works across region
-    // boundaries and multiple packets, we add a serial number to the
-    // integers and track against that on update.
-    strings_t strings;
-    //integers_t integers;
-    //LLFloaterRegionInfo::incrementSerial();
-    LLFloaterRegionInfo::nextInvoice();
-    LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-    //integers.push_back(LLFloaterRegionInfo::());::getPanelEstate();
+    bool rv = LLPanelRegionInfo::refreshFromRegion(region, phase);
 
+    if (phase != ERefreshFromRegionPhase::BeforeRequestRegionInfo)
+    {
+        // We want estate info. To make sure it works across region
+        // boundaries and multiple packets, we add a serial number to the
+        // integers and track against that on update.
+        strings_t strings;
+        //integers_t integers;
+        //LLFloaterRegionInfo::incrementSerial();
+        LLFloaterRegionInfo::nextInvoice();
+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+        //integers.push_back(LLFloaterRegionInfo::());::getPanelEstate();
 
-    sendEstateOwnerMessage(gMessageSystem, "getinfo", invoice, strings);
+        sendEstateOwnerMessage(gMessageSystem, "getinfo", invoice, strings);
+    }
 
     refresh();
 
@@ -2528,7 +2514,7 @@ LLPanelEstateCovenant::LLPanelEstateCovenant()
 }
 
 // virtual
-bool LLPanelEstateCovenant::refreshFromRegion(LLViewerRegion* region)
+bool LLPanelEstateCovenant::refreshFromRegion(LLViewerRegion* region, ERefreshFromRegionPhase phase)
 {
     LLTextBox* region_name = getChild<LLTextBox>("region_name_text");
     if (region_name)
@@ -2574,13 +2560,17 @@ bool LLPanelEstateCovenant::refreshFromRegion(LLViewerRegion* region)
     getChild<LLButton>("reset_covenant")->setEnabled(gAgent.isGodlike() || (region && region->canManageEstate()));
 
     // let the parent class handle the general data collection.
-    bool rv = LLPanelRegionInfo::refreshFromRegion(region);
-    LLMessageSystem *msg = gMessageSystem;
-    msg->newMessage("EstateCovenantRequest");
-    msg->nextBlockFast(_PREHASH_AgentData);
-    msg->addUUIDFast(_PREHASH_AgentID,  gAgent.getID());
-    msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
-    msg->sendReliable(region->getHost());
+    bool rv = LLPanelRegionInfo::refreshFromRegion(region, phase);
+
+    if (phase != ERefreshFromRegionPhase::AfterRequestRegionInfo)
+    {
+        gMessageSystem->newMessage("EstateCovenantRequest");
+        gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+        gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        gMessageSystem->sendReliable(region->getHost());
+    }
+
     return rv;
 }
 
@@ -3128,7 +3118,7 @@ std::string LLPanelRegionExperiences::regionCapabilityQuery(LLViewerRegion* regi
     return region->getCapability(cap);
 }
 
-bool LLPanelRegionExperiences::refreshFromRegion(LLViewerRegion* region)
+bool LLPanelRegionExperiences::refreshFromRegion(LLViewerRegion* region, ERefreshFromRegionPhase phase)
 {
     bool allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
 
@@ -3151,10 +3141,13 @@ bool LLPanelRegionExperiences::refreshFromRegion(LLViewerRegion* region)
     mTrusted->loading();
     mTrusted->setReadonly(!allow_modify);
 
-    LLExperienceCache::instance().getRegionExperiences(boost::bind(&LLPanelRegionExperiences::regionCapabilityQuery, region, _1),
-        boost::bind(&LLPanelRegionExperiences::infoCallback, getDerivedHandle<LLPanelRegionExperiences>(), _1));
+    if (phase != ERefreshFromRegionPhase::AfterRequestRegionInfo)
+    {
+        LLExperienceCache::instance().getRegionExperiences(boost::bind(&LLPanelRegionExperiences::regionCapabilityQuery, region, _1),
+            boost::bind(&LLPanelRegionExperiences::infoCallback, getDerivedHandle<LLPanelRegionExperiences>(), _1));
+    }
 
-    return LLPanelRegionInfo::refreshFromRegion(region);
+    return LLPanelRegionInfo::refreshFromRegion(region, phase);
 }
 
 LLSD LLPanelRegionExperiences::addIds(LLPanelExperienceListEditor* panel)
@@ -4181,35 +4174,32 @@ void LLPanelEstateAccess::copyListToClipboard(std::string list_name)
 {
     LLPanelEstateAccess* panel = LLFloaterRegionInfo::getPanelAccess();
     if (!panel) return;
-    LLNameListCtrl* name_list = panel->getChild<LLNameListCtrl>(list_name);
-    if (!name_list) return;
 
+    LLNameListCtrl* name_list = panel->getChild<LLNameListCtrl>(list_name);
     std::vector<LLScrollListItem*> list_vector = name_list->getAllData();
-    if (list_vector.size() == 0) return;
+    if (list_vector.empty())
+        return;
 
     LLSD::String list_to_copy;
-    for (std::vector<LLScrollListItem*>::const_iterator iter = list_vector.begin();
-         iter != list_vector.end();
-         iter++)
+    for (LLScrollListItem* item : list_vector)
     {
-        LLScrollListItem *item = (*iter);
         if (item)
         {
+            if (!list_to_copy.empty())
+            {
+                list_to_copy += "\n";
+            }
             list_to_copy += item->getColumn(0)->getValue().asString();
         }
-        if (std::next(iter) != list_vector.end())
-        {
-            list_to_copy += "\n";
-        }
     }
 
     LLClipboard::instance().copyToClipboard(utf8str_to_wstring(list_to_copy), 0, static_cast<S32>(list_to_copy.length()));
 }
 
-bool LLPanelEstateAccess::refreshFromRegion(LLViewerRegion* region)
+bool LLPanelEstateAccess::refreshFromRegion(LLViewerRegion* region, ERefreshFromRegionPhase phase)
 {
     updateLists();
-    return LLPanelRegionInfo::refreshFromRegion(region);
+    return LLPanelRegionInfo::refreshFromRegion(region, phase);
 }
 
 //=========================================================================