Fixed #318 Crash in LLWindlightRemoteCtrl::refreshPresets()

2 files changed, 10 insertions, 7 deletions

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 58b6df4..b1c316d 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3224,11 +3224,9 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
         gCacheName->setUpstream(sim);
 */
 
-        //Reset the windlight profile to default
-        LLWLParamManager::instance()->mAnimator.mIsRunning = false;
-        LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
-        LLWLParamManager::instance()->loadPreset("Default", true);
-        LLWaterParamManager::instance()->loadPreset("Default",true);
+        // Reset windlight settings to default
+        LLWLParamManager::instance()->mAnimator.mIsRunning = true;
+        LLWLParamManager::instance()->mAnimator.mUseLindenTime = true;
 
         // now, use the circuit info to tell simulator about us!
         LL_INFOS("Messaging") << "process_teleport_finish() Enabling "
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
index f9fb7ba..0beb3e5 100644
--- a/linden/indra/newview/llwindlightremotectrl.cpp
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -41,6 +41,7 @@
 #include "lluictrlfactory.h"
 #include "llwlparammanager.h"
 #include "llviewercontrol.h"
+#include "llviewerwindow.h"
 
 // [RLVa:KB] - Alternate: Imprudence-1.2.0
 #include "rlvhandler.h"
@@ -137,8 +138,12 @@ BOOL LLWindlightRemoteCtrl::postBuild()
 
 void LLWindlightRemoteCtrl::refreshPresets()
 {
-        // Just in case, let's not ever crash here
-        mPresetsCombo = getChild<LLComboBox>("Presets");
+        // If we're teleporting or just logging in, no UI to refresh
+        if (gViewerWindow->getShowProgress())
+        {
+                return;
+        }
+
         if (mPresetsCombo)
         {
                 // snag current preset