diff options
author | Mark Palange <palange@lindenlab.com> | 2008-10-20 22:16:40 +0000 |
---|---|---|
committer | Mark Palange <palange@lindenlab.com> | 2008-10-20 22:16:40 +0000 |
commit | 04decf22b9982aa8914024556ac11ce8c6f322a0 (patch) | |
tree | 35cbcc906763bd3b2abccccd1864213cfa59f1de /indra/newview/llfloaterregioninfo.cpp | |
parent | d0e62db34ebda571db3ad78ca138275c4e84e47f (diff) |
Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 RC5 secu-fix to 1.21.6 release.
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
-rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index e5193b8314..737a2afbb7 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -542,7 +542,6 @@ void LLPanelRegionInfo::onClickHelp(void* data) { const std::string* xml_alert = (std::string*)data; gViewerWindow->alertXml(*xml_alert); - delete xml_alert; } ///////////////////////////////////////////////////////////////////////////// |