1 files changed, 9 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 1e185e6..0132f11 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -138,6 +138,9 @@
 #include "llviewerdisplay.h"
 #include "llkeythrottle.h"
 
+#include "llwlparammanager.h"
+#include "llwaterparammanager.h"
+
 #include <boost/tokenizer.hpp>
 #include <boost/regex.hpp> // Boost Reg Expresions
 
@@ -3212,6 +3215,12 @@ 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);
+
         // now, use the circuit info to tell simulator about us!
         LL_INFOS("Messaging") << "process_teleport_finish() Enabling "
                         << sim_host << " with code " << msg->mOurCircuitCode << LL_ENDL;