diff options
author | Jacek Antonelli | 2010-07-29 00:48:07 -0500 |
---|---|---|
committer | Jacek Antonelli | 2010-08-01 00:30:59 -0500 |
commit | fc0899df14e13eb7b20cf37b2c1f37a7412b5475 (patch) | |
tree | 0926db93e015fbac604c2c32515cdf255f2b352f /linden/indra/newview | |
parent | Added confirmation dialog before applying LightShare settings. (diff) | |
download | meta-impy-fc0899df14e13eb7b20cf37b2c1f37a7412b5475.zip meta-impy-fc0899df14e13eb7b20cf37b2c1f37a7412b5475.tar.gz meta-impy-fc0899df14e13eb7b20cf37b2c1f37a7412b5475.tar.bz2 meta-impy-fc0899df14e13eb7b20cf37b2c1f37a7412b5475.tar.xz |
No longer reset Windlight settings after teleport.
It was part of the LightShare changes, but it annoys people.
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/llviewermessage.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp index ecbe0ef..353fd9f 100644 --- a/linden/indra/newview/llviewermessage.cpp +++ b/linden/indra/newview/llviewermessage.cpp | |||
@@ -138,8 +138,6 @@ | |||
138 | #include "llviewerdisplay.h" | 138 | #include "llviewerdisplay.h" |
139 | #include "llkeythrottle.h" | 139 | #include "llkeythrottle.h" |
140 | 140 | ||
141 | #include "llwlparammanager.h" | ||
142 | #include "llwaterparammanager.h" | ||
143 | #include "panelradarentry.h" | 141 | #include "panelradarentry.h" |
144 | 142 | ||
145 | #include <boost/tokenizer.hpp> | 143 | #include <boost/tokenizer.hpp> |
@@ -3224,10 +3222,6 @@ void process_teleport_finish(LLMessageSystem* msg, void**) | |||
3224 | gCacheName->setUpstream(sim); | 3222 | gCacheName->setUpstream(sim); |
3225 | */ | 3223 | */ |
3226 | 3224 | ||
3227 | // Reset windlight settings to default | ||
3228 | LLWLParamManager::instance()->mAnimator.mIsRunning = true; | ||
3229 | LLWLParamManager::instance()->mAnimator.mUseLindenTime = true; | ||
3230 | |||
3231 | // now, use the circuit info to tell simulator about us! | 3225 | // now, use the circuit info to tell simulator about us! |
3232 | LL_INFOS("Messaging") << "process_teleport_finish() Enabling " | 3226 | LL_INFOS("Messaging") << "process_teleport_finish() Enabling " |
3233 | << sim_host << " with code " << msg->mOurCircuitCode << LL_ENDL; | 3227 | << sim_host << " with code " << msg->mOurCircuitCode << LL_ENDL; |