summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateruipreview.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-11 15:07:37 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-11 15:07:37 +0000
commit15ff4379e53eb5b3ed914c46c0051c3926de1ecb (patch)
treef16087fcddedb2a4e19f1f24b24de9e3c257d5b0 /indra/newview/llfloateruipreview.cpp
parent19962a783365784e3b820521e5854fdaf217133c (diff)
parentf023d238292332b6ed72d95af5e7381ce1f55fc4 (diff)
merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/llfloateruipreview.cpp')
-rw-r--r--indra/newview/llfloateruipreview.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index 3e804bef9d..f61c86db14 100644
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -362,8 +362,7 @@ BOOL LLFadeEventTimer::tick()
if(NULL == mParent) // no more need to tick, so suicide
{
- delete this;
- return FALSE;
+ return TRUE;
}
// Set up colors