summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.cpp
diff options
context:
space:
mode:
authorMaximB ProductEngine <mberezhnoy@productengine.com>2012-12-04 14:45:19 +0200
committerMaximB ProductEngine <mberezhnoy@productengine.com>2012-12-04 14:45:19 +0200
commit4c3510bc4e4c2365bf75c3fbfdfae6b329a420e0 (patch)
tree6a712f7b27366afc5e99e1b43138be45edeef388 /indra/llui/llbutton.cpp
parentf888a3fd00ca32275ab2da6437cb011b3ab78f89 (diff)
parent8c24cc8e3635888b766e30001749966eddc0dc7e (diff)
merging
Diffstat (limited to 'indra/llui/llbutton.cpp')
-rw-r--r--indra/llui/llbutton.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 97547208ec..f82cdc64a9 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -286,7 +286,7 @@ LLButton::~LLButton()
if (mFlashingTimer)
{
- delete mFlashingTimer;
+ mFlashingTimer->unset();
}
}