diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-09 12:47:36 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-09 12:47:36 +0200 |
| commit | cc6f28432e0b21df1cbb56bbc436175827332da1 (patch) | |
| tree | d5d6006fa91a36bfdc2a731ac1c8a861290c398f /indra/newview/llviewermenu.cpp | |
| parent | ff87f87fa6a33daf72eae963b2aa33c9d5890509 (diff) | |
| parent | b93fb9f31954b4851a13bd3070661537f9359b00 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
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) { |