summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-05-16 17:21:53 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2011-05-16 17:21:53 +0300
commit683c9ff3f8e662c1906e5ee6319f7d46513bca81 (patch)
tree2ae5a7bd7f2e7892d36bb773e09439c2cb2cc14d
parent912f021bb11ef48f352ea85cca27c2bca6ca06b1 (diff)
STORM-1245 WIP Removed some dead code.
-rw-r--r--indra/newview/llagent.cpp19
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();
}