diff options
author | McCabe Maxsted | 2009-11-08 13:23:54 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-11-08 13:23:54 -0700 |
commit | d9ecd6fde8f588d8be9a54a3ebc301bab1e99754 (patch) | |
tree | 1f595f7577a5134b29e4933d1ce6b4b52e9c1f57 /linden/indra/newview/llstartup.cpp | |
parent | Merged working branch of 1.2 into LL 1.23 merge (diff) | |
parent | Changed version to 1.20 in other files (diff) | |
download | meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.zip meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.gz meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.bz2 meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.xz |
Merged almost-final version of Imprudence 1.2 into 1.3
Diffstat (limited to 'linden/indra/newview/llstartup.cpp')
-rw-r--r-- | linden/indra/newview/llstartup.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index b862d61..4d35242 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
@@ -2656,6 +2656,23 @@ bool idle_startup() | |||
2656 | #endif | 2656 | #endif |
2657 | 2657 | ||
2658 | 2658 | ||
2659 | // [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e | ||
2660 | // RELEASE-RLVa: this should go in LLAppViewer::handleLoginComplete() but Imprudence doesn't call that function | ||
2661 | gRlvHandler.initLookupTables(); | ||
2662 | |||
2663 | if (rlv_handler_t::isEnabled()) | ||
2664 | { | ||
2665 | RlvCurrentlyWorn::fetchWorn(); | ||
2666 | rlv_handler_t::fetchSharedInventory(); | ||
2667 | |||
2668 | #ifdef RLV_EXTENSION_STARTLOCATION | ||
2669 | RlvSettings::updateLoginLastLocation(); | ||
2670 | #endif // RLV_EXTENSION_STARTLOCATION | ||
2671 | |||
2672 | gRlvHandler.processRetainedCommands(); | ||
2673 | } | ||
2674 | // [/RLVa:KB] | ||
2675 | |||
2659 | return TRUE; | 2676 | return TRUE; |
2660 | } | 2677 | } |
2661 | 2678 | ||