summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateruipreview.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2010-02-11 11:44:21 -0800
committerCallum Prentice <callum@lindenlab.com>2010-02-11 11:44:21 -0800
commitc7715a74fd63c5dda370a5fe07089213a53014cb (patch)
treef9fda627380aa5f20d028482fc1999e4d3232166 /indra/newview/llfloateruipreview.cpp
parent494a42a680cdaa90dce677fd66ff722ccf1401f3 (diff)
parenta97c4d3ad879b8e53696b9cab9c5ab7141c7fc6c (diff)
Merge with tip
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