summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolcomp.cpp
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-03-13 21:55:22 +0000
committerAura Linden <aura@lindenlab.com>2014-03-13 21:55:22 +0000
commit706ec08deb3feaea9c5c3516dea657b86b0474c3 (patch)
treea918eac8a10e43b78d156cb0620520420f0dfc62 /indra/newview/lltoolcomp.cpp
parentd2bb4dae980a887a30b206875d8f9419901ed66a (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
Merged in viewer-release
Diffstat (limited to 'indra/newview/lltoolcomp.cpp')
-rwxr-xr-xindra/newview/lltoolcomp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index 5270c3d33f..b75d6b3dcb 100755
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -61,7 +61,7 @@ extern LLControlGroup gSavedSettings;
// we use this in various places instead of NULL
-static LLTool* sNullTool = new LLTool(std::string("null"), NULL);
+static LLPointer<LLTool> sNullTool(new LLTool(std::string("null"), NULL));
//-----------------------------------------------------------------------
// LLToolComposite