diff options
Diffstat (limited to 'linden/indra/newview/llstartup.cpp')
-rw-r--r-- | linden/indra/newview/llstartup.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index b70253e..e997e5f 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
@@ -201,6 +201,10 @@ | |||
201 | #include "llmozlib.h" | 201 | #include "llmozlib.h" |
202 | #endif // LL_LIBXUL_ENABLED | 202 | #endif // LL_LIBXUL_ENABLED |
203 | 203 | ||
204 | // [RLVa:KB] | ||
205 | #include "rlvhandler.h" | ||
206 | // [/RLVa:KB] | ||
207 | |||
204 | #if LL_WINDOWS | 208 | #if LL_WINDOWS |
205 | #include "llwindebug.h" | 209 | #include "llwindebug.h" |
206 | #include "lldxhardware.h" | 210 | #include "lldxhardware.h" |
@@ -2426,6 +2430,14 @@ bool idle_startup() | |||
2426 | LLInventoryView::toggleVisibility(NULL); | 2430 | LLInventoryView::toggleVisibility(NULL); |
2427 | } | 2431 | } |
2428 | 2432 | ||
2433 | // [RLVa:KB] - Checked: 2009-11-27 (RLVa-1.1.0f) | Added: RLVa-1.1.0f | ||
2434 | if (rlv_handler_t::isEnabled()) | ||
2435 | { | ||
2436 | // Regularly process a select subset of retained commands during logon | ||
2437 | gIdleCallbacks.addFunction(RlvHandler::onIdleStartup, new LLTimer()); | ||
2438 | } | ||
2439 | // [/RLVa:KB] | ||
2440 | |||
2429 | LLStartUp::setStartupState( STATE_MISC ); | 2441 | LLStartUp::setStartupState( STATE_MISC ); |
2430 | return FALSE; | 2442 | return FALSE; |
2431 | } | 2443 | } |
@@ -2828,7 +2840,7 @@ bool idle_startup() | |||
2828 | // reset keyboard focus to sane state of pointing at world | 2840 | // reset keyboard focus to sane state of pointing at world |
2829 | gFocusMgr.setKeyboardFocus(NULL); | 2841 | gFocusMgr.setKeyboardFocus(NULL); |
2830 | 2842 | ||
2831 | // [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e | 2843 | // [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e |
2832 | // RELEASE-RLVa: this should go in LLAppViewer::handleLoginComplete() but Imprudence doesn't call that function | 2844 | // RELEASE-RLVa: this should go in LLAppViewer::handleLoginComplete() but Imprudence doesn't call that function |
2833 | gRlvHandler.initLookupTables(); | 2845 | gRlvHandler.initLookupTables(); |
2834 | 2846 | ||