diff options
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 26 | ||||
| -rw-r--r-- | indra/newview/llfloaterregioninfo.h | 3 | 
2 files changed, 0 insertions, 29 deletions
| diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 6e8e37621e..3256527ee5 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -1440,11 +1440,6 @@ BOOL LLPanelRegionTerrainInfo::postBuild()  	mAskedTextureHeights = false;  	mConfirmedTextureHeights = false; -    if (!mRegionChangedSlot.connected()) -    { -        mRegionChangedSlot = gAgent.addRegionChangedCallback(boost::bind(&LLPanelRegionTerrainInfo::onRegionChanged,this)); -    } -  	return LLPanelRegionInfo::postBuild();  } @@ -1491,27 +1486,6 @@ void LLPanelRegionTerrainInfo::updateForMaterialType()  	if (material_label) { material_label->setVisible(show_material_controls); }  } -void LLPanelRegionTerrainInfo::onRegionChanged() -{ -    LLViewerRegion *region = gAgent.getRegion(); -    if (!region) { return; } - -    if (region->simulatorFeaturesReceived()) -    { -        onSimulatorFeaturesReceived(region->getRegionID(), region); -    } -    else -    { -        // See "RenderTerrainPBREnabled" in LLViewerRegion::setSimulatorFeatures -        region->setSimulatorFeaturesReceivedCallback(boost::bind(&LLPanelRegionTerrainInfo::onSimulatorFeaturesReceived,this,_1, _2)); -    } -} - -void LLPanelRegionTerrainInfo::onSimulatorFeaturesReceived(const LLUUID& region_id, LLViewerRegion* regionp) -{ -    refresh(); -} -  // virtual  bool LLPanelRegionTerrainInfo::refreshFromRegion(LLViewerRegion* region)  { diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 315c6aca0f..93a4d3a795 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -249,8 +249,6 @@ public:  	BOOL postBuild() override; -    void onRegionChanged(); -    void onSimulatorFeaturesReceived(const LLUUID& region_id, LLViewerRegion* regionp);      bool refreshFromRegion(LLViewerRegion* region) override;                // refresh local settings from region update from simulator  	void setEnvControls(bool available);									// Whether environment settings are available for this region @@ -274,7 +272,6 @@ protected:  private:  	bool mConfirmedTextureHeights;  	bool mAskedTextureHeights; -    boost::signals2::connection mRegionChangedSlot;      LLUUID mLastSetTextures[LLTerrainMaterials::ASSET_COUNT];      LLUUID mLastSetMaterials[LLTerrainMaterials::ASSET_COUNT];  }; | 
