diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 17:51:28 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 17:51:28 -0700 |
| commit | 50247533f99f374be71728cc5ca00f0444189a9f (patch) | |
| tree | c1505ec3ec9c054447fb98968c9299e502857000 /indra/newview/llviewermenu.cpp | |
| parent | 146e084af3344ada737340115c5fa063c0aab6b3 (diff) | |
| parent | d885db79f94ee3d6a2b4ed7febe7beb69d0c7d51 (diff) | |
Merged latest viewer/login-api with latest viewer/viewer-20
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 dde7b1c7ee..1310fc7d53 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -208,6 +208,7 @@ #include "llwaterparammanager.h" #include "llfloaternotificationsconsole.h" #include "llfloatercamera.h" +#include "lluilistener.h" #include "lltexlayer.h" #include "llappearancemgr.h" @@ -417,6 +418,8 @@ public: static LLMenuParcelObserver* gMenuParcelObserver = NULL; +static LLUIListener sUIListener("UI"); + LLMenuParcelObserver::LLMenuParcelObserver() { LLViewerParcelMgr::getInstance()->addObserver(this); @@ -6962,7 +6965,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 *) |