summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpay.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-04-03 18:56:46 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-04-03 18:56:46 -0400
commitd7481cd07c3e0b5eed54ff6a3539406d09ed0669 (patch)
tree7e0d2a2a9733784f16518b977423deb225021651 /indra/newview/llfloaterpay.cpp
parent076761a03d7cb8b53e6e3d4f2120091eabeba37a (diff)
parent31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff)
Merge. Refresh from viewer-release after 3.7.4 release.
Diffstat (limited to 'indra/newview/llfloaterpay.cpp')
-rwxr-xr-xindra/newview/llfloaterpay.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpay.cpp b/indra/newview/llfloaterpay.cpp
index b0009fd94f..f0c010b545 100755
--- a/indra/newview/llfloaterpay.cpp
+++ b/indra/newview/llfloaterpay.cpp
@@ -135,6 +135,7 @@ LLFloaterPay::LLFloaterPay(const LLSD& key)
LLFloaterPay::~LLFloaterPay()
{
std::for_each(mCallbackData.begin(), mCallbackData.end(), DeletePointer());
+ mCallbackData.clear();
// Name callbacks will be automatically disconnected since LLFloater is trackable
// In case this floater is currently waiting for a reply.