diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-10 16:20:09 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-10 16:20:09 -0700 |
| commit | 5690becdf4743286b196a331c48c8aa0332a8c66 (patch) | |
| tree | 7c64dba5dca5ccfc9631f92fa7d662257654137b /indra/newview/lltoolcomp.cpp | |
| parent | 807fa3ee06cc139fcc41f69ed2caac20a8e8370d (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/lltoolcomp.cpp')
| -rwxr-xr-x | indra/newview/lltoolcomp.cpp | 2 |
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 |