diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-11 15:23:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-11 15:23:46 -0400 |
| commit | b6708435214a5af158956b0f6ef6a90bacbcc142 (patch) | |
| tree | 1a0f0612cc87d43e33d466afc7d6928ec7a2e20b /indra/newview/lltoolcomp.cpp | |
| parent | 20d486b52fb8ecefc03eb63a93e4447513d704d2 (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
merge changes for 3.7.3-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 |