livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

secondlife/viewer#712: Clean up unused region change callback checks

meow-7.2.2
Cosmic Linden 2024-03-06 13:04:40 -08:00
parent 0cf4141d7d
commit 55fdd540d2
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llfloaterregioninfo.cpp
View File

@ -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)
{

3
indra/newview/llfloaterregioninfo.h
View File

@ -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];
};