diff options
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 47fbec30dd..3853aaa8fd 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -122,8 +122,7 @@ const F32 MAX_FIDGET_TIME = 20.f; // seconds const S32 UI_FEATURE_VERSION = 1; // For version 1: 1 - inventory, 2 - gltf -// Will need to change to 3 once either inventory or gltf releases and cause a conflict -const S32 UI_FEATURE_FLAGS = 1; +const S32 UI_FEATURE_FLAGS = 3; // The agent instance. LLAgent gAgent; @@ -1046,11 +1045,7 @@ void LLAgent::setRegion(LLViewerRegion *regionp) { gSky.mVOSkyp->setRegion(regionp); } - if (gSky.mVOGroundp) - { - gSky.mVOGroundp->setRegion(regionp); - } - + if (regionp->capabilitiesReceived()) { regionp->requestSimulatorFeatures(); @@ -4080,10 +4075,6 @@ bool LLAgent::teleportCore(bool is_local) gTeleportDisplay = TRUE; LL_INFOS("Teleport") << "Non-local, setting teleport state to TELEPORT_START" << LL_ENDL; gAgent.setTeleportState( LLAgent::TELEPORT_START ); - - //release geometry from old location - gPipeline.resetVertexBuffers(); - LLSpatialPartition::sTeleportRequested = TRUE; } make_ui_sound("UISndTeleportOut"); @@ -4429,7 +4420,6 @@ void LLAgent::teleportCancel() } clearTeleportRequest(); gAgent.setTeleportState( LLAgent::TELEPORT_NONE ); - gPipeline.resetVertexBuffers(); } void LLAgent::restoreCanceledTeleportRequest() |