diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llagent.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 38e6caa4b3..bcc1953acc 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -637,19 +637,11 @@ void LLAgent::setRegion(LLViewerRegion *regionp) bool teleport = (gAgent.getTeleportState() != LLAgent::TELEPORT_NONE); if (teleport) { -#if 0 - LLEnvManager::getInstance()->notifyTP(); -#else LLEnvManagerNew::instance().onTeleport(); -#endif } else { -#if 0 - LLEnvManager::getInstance()->notifyCrossing(); -#else LLEnvManagerNew::instance().onRegionCrossing(); -#endif } } else @@ -669,11 +661,7 @@ void LLAgent::setRegion(LLViewerRegion *regionp) LLWorld::getInstance()->updateAgentOffset(mAgentOriginGlobal); // Notify windlight managers about login -#if 0 - LLEnvManager::getInstance()->notifyLogin(); -#else LLEnvManagerNew::instance().onLogin(); -#endif } // Pass new region along to metrics components that care about this level of detail. @@ -699,12 +687,7 @@ void LLAgent::setRegion(LLViewerRegion *regionp) LLFloaterMove::sUpdateFlyingStatus(); -#if 0 - // notify EnvManager that a refresh is needed - LLEnvManager::instance().refreshFromStorage(LLEnvKey::SCOPE_REGION); -#else - LLEnvManagerNew::instance().onTeleport(); -#endif + LLEnvManagerNew::instance().onTeleport(); } |