diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-09 15:52:34 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-09 15:52:34 -0500 |
| commit | 579af2da335edd6a62cc0e4881ed59682e2c2d04 (patch) | |
| tree | e72c72ae02411679cc5460b776be6265fb80bd9e /indra/newview/llviewermenu.cpp | |
| parent | 45b24808657dddfb2a605186416409b453f149e7 (diff) | |
| parent | 4a7c31ee1d63db068eeef3bd2f5fc0cf61247f69 (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index bf4d0c78e6..431b4d3c0a 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -45,6 +45,7 @@ #include "llagentwearables.h" #include "llagentpilot.h" #include "llcompilequeue.h" +#include "llconsole.h" #include "lldebugview.h" #include "llfilepicker.h" #include "llfirstuse.h" @@ -487,7 +488,7 @@ class LLAdvancedToggleConsole : public view_listener_t } else if ("debug" == console_type) { - toggle_visibility( (void*)((LLView*)gDebugView->mDebugConsolep) ); + toggle_visibility( (void*)static_cast<LLUICtrl*>(gDebugView->mDebugConsolep)); } else if (gTextureSizeView && "texture size" == console_type) { |