diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-12-15 12:34:37 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-12-15 12:34:37 +0800 |
| commit | 3316ffb3b571b8730d26d6e8b2ee00fc9cbdf7c0 (patch) | |
| tree | 200cd8497a4fdd782ac4dbfd2ad5fb1632e03275 /indra/newview/llfloaterregioninfo.cpp | |
| parent | d4e433b37af94ee11880deeede74a87a728f4775 (diff) | |
| parent | 5b77436cf0ad749d36e8f0c60077eeb24698d644 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 219a9ca520..6bbd27478c 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -2100,8 +2100,14 @@ LLPanelEstateInfo::LLPanelEstateInfo() mEstateID(0) // invalid { LLEstateInfoModel& estate_info = LLEstateInfoModel::instance(); - estate_info.setCommitCallback(boost::bind(&LLPanelEstateInfo::refreshFromEstate, this)); - estate_info.setUpdateCallback(boost::bind(&LLPanelEstateInfo::refreshFromEstate, this)); + mEstateInfoCommitConnection = estate_info.setCommitCallback(boost::bind(&LLPanelEstateInfo::refreshFromEstate, this)); + mEstateInfoUpdateConnection = estate_info.setUpdateCallback(boost::bind(&LLPanelEstateInfo::refreshFromEstate, this)); +} + +LLPanelEstateInfo::~LLPanelEstateInfo() +{ + mEstateInfoCommitConnection.disconnect(); + mEstateInfoUpdateConnection.disconnect(); } // static |