diff options
author | Armin Weatherwax | 2011-06-16 10:27:42 +0200 |
---|---|---|
committer | Armin Weatherwax | 2011-11-13 14:28:26 +0100 |
commit | 6d061b388374ed0621d8b7a7040e165c6bb04089 (patch) | |
tree | 9ca2ebc49643eede268a8fc20af46ccc8f5a986d /linden/indra/newview/llfloaterregioninfo.cpp | |
parent | Changed version to 1.4.0 beta 2 (diff) | |
download | meta-impy-6d061b388374ed0621d8b7a7040e165c6bb04089.zip meta-impy-6d061b388374ed0621d8b7a7040e165c6bb04089.tar.gz meta-impy-6d061b388374ed0621d8b7a7040e165c6bb04089.tar.bz2 meta-impy-6d061b388374ed0621d8b7a7040e165c6bb04089.tar.xz |
fix Bug #967 memleak in llfloaterregioninfo
Diffstat (limited to 'linden/indra/newview/llfloaterregioninfo.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterregioninfo.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp index 60bdfcd..505f8e6 100644 --- a/linden/indra/newview/llfloaterregioninfo.cpp +++ b/linden/indra/newview/llfloaterregioninfo.cpp | |||
@@ -1739,11 +1739,7 @@ void LLPanelEstateInfo::onClickRemoveEstateManager(void* user_data) | |||
1739 | //--------------------------------------------------------------------------- | 1739 | //--------------------------------------------------------------------------- |
1740 | // Kick from estate methods | 1740 | // Kick from estate methods |
1741 | //--------------------------------------------------------------------------- | 1741 | //--------------------------------------------------------------------------- |
1742 | struct LLKickFromEstateInfo | 1742 | |
1743 | { | ||
1744 | LLPanelEstateInfo *mEstatePanelp; | ||
1745 | LLUUID mAgentID; | ||
1746 | }; | ||
1747 | 1743 | ||
1748 | void LLPanelEstateInfo::onClickKickUser(void *user_data) | 1744 | void LLPanelEstateInfo::onClickKickUser(void *user_data) |
1749 | { | 1745 | { |
@@ -1770,10 +1766,7 @@ void LLPanelEstateInfo::onKickUserCommit(const std::vector<std::string>& names, | |||
1770 | LLPanelEstateInfo* self = (LLPanelEstateInfo*)userdata; | 1766 | LLPanelEstateInfo* self = (LLPanelEstateInfo*)userdata; |
1771 | if(!self) return; | 1767 | if(!self) return; |
1772 | 1768 | ||
1773 | //keep track of what user they want to kick and other misc info | 1769 | |
1774 | LLKickFromEstateInfo *kick_info = new LLKickFromEstateInfo(); | ||
1775 | kick_info->mEstatePanelp = self; | ||
1776 | kick_info->mAgentID = ids[0]; | ||
1777 | 1770 | ||
1778 | //Bring up a confirmation dialog | 1771 | //Bring up a confirmation dialog |
1779 | LLSD args; | 1772 | LLSD args; |