diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:15:22 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:15:22 -0700 |
| commit | 127b428863707c882fbf4d30699321b8a2365644 (patch) | |
| tree | 728c98bd177635891f0646ccabcf86b70341d4a0 /indra/newview/llviewermenu.cpp | |
| parent | 0220106ecdecd323854522a5bc3fd6455c60fdfc (diff) | |
| parent | 2438a9168b117dcabf5e5819f93e08a874735a26 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index dc291d6c34..a1c15d9d0f 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -206,6 +206,7 @@ #include "llwaterparammanager.h" #include "llfloaternotificationsconsole.h" #include "llfloatercamera.h" +#include "lluilistener.h" #include "lltexlayer.h" #include "llappearancemgr.h" @@ -413,6 +414,8 @@ public: static LLMenuParcelObserver* gMenuParcelObserver = NULL; +static LLUIListener sUIListener("UI"); + LLMenuParcelObserver::LLMenuParcelObserver() { LLViewerParcelMgr::getInstance()->addObserver(this); @@ -7064,7 +7067,7 @@ void force_error_bad_memory_access(void *) void force_error_infinite_loop(void *) { - LLAppViewer::instance()->forceErrorInifiniteLoop(); + LLAppViewer::instance()->forceErrorInfiniteLoop(); } void force_error_software_exception(void *) |