diff options
| author | callum <none@none> | 2009-12-09 14:56:48 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-09 14:56:48 -0800 |
| commit | a97479f41bae05ff08b3598a9497be9be3ee371d (patch) | |
| tree | 860b0e365bc24fb056030622bdb04574e6f46ba3 /indra/newview/llviewermenu.cpp | |
| parent | dc3cad90c1cd4490d8035832138579f9711f8549 (diff) | |
| parent | 874f53230dbe40e599e8903fae87a60816508fd6 (diff) | |
Merge with head
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) { |