Applied rlva_init-imprudence.patch (fixes RLVa not initializing in 1.2)

2 files changed, 18 insertions, 1 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 448e26b..c432066 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3927,7 +3927,7 @@ void LLAppViewer::handleLoginComplete()
         writeDebugInfo();
 
 // [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
-        // TODO-RLVa: find some way to initialize the lookup table when we need them *and* support toggling RLVa at runtime
+        // NOTE: this function isn't called in Imprudence so any changes need to go in idle_startup() instead
         gRlvHandler.initLookupTables();
 
         if (rlv_handler_t::isEnabled())
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 346f7dd..d747bd2 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2647,6 +2647,23 @@ bool idle_startup()
 
                 LLAppViewer::instance()->initMainloopTimeout("Mainloop Init");
 
+// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
+                // RELEASE-RLVa: this should go in LLAppViewer::handleLoginComplete() but Imprudence doesn't call that function
+                gRlvHandler.initLookupTables();
+
+                if (rlv_handler_t::isEnabled())
+                {
+                        RlvCurrentlyWorn::fetchWorn();
+                        rlv_handler_t::fetchSharedInventory();
+
+                        #ifdef RLV_EXTENSION_STARTLOCATION
+                                RlvSettings::updateLoginLastLocation();
+                        #endif // RLV_EXTENSION_STARTLOCATION
+
+                        gRlvHandler.processRetainedCommands();
+                }
+// [/RLVa:KB]
+
                 return TRUE;
         }