diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index abbcce641..238077dea 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -622,6 +622,12 @@ void region_change();
 void parse_simulator_features();
 void custom_selected(void* user_data);
 
+void reset_vertex_buffers(void *user_data)
+{
+	gPipeline.clearRebuildGroups();
+	gPipeline.resetVertexBuffers();
+}
+
 class LLMenuParcelObserver : public LLParcelObserver
 {
 public:
@@ -1591,6 +1597,8 @@ void init_debug_rendering_menu(LLMenuGL* menu)
 	item = new LLMenuItemCheckGL("Aggressive Alpha Masking", menu_toggle_control, NULL, menu_check_control, (void*)"SHUseRMSEAutoMask");
 	menu->addChild(item);
 	
+	menu->addChild(new LLMenuItemCallGL("Rebuild Vertex Buffers", reset_vertex_buffers, NULL, NULL, 'V', MASK_CONTROL | MASK_SHIFT));
+
 	item = new LLMenuItemCheckGL("Animate Textures", menu_toggle_control, NULL, menu_check_control, (void*)"AnimateTextures");
 	menu->addChild(item);
 	
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 7a7b70f9b..d7a772f22 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -663,13 +663,15 @@ static LLFastTimer::DeclareTimer FTM_IMAGE_MEDIA("Media");
 void LLViewerTextureList::updateImages(F32 max_time)
 {
 	static BOOL cleared = FALSE;
-	static const LLCachedControl<bool> hide_tp_screen("AscentDisableTeleportScreens",false);
+	//Singu note: Don't clear vbos on local tp until some serious geom rebuild bugs are stomped out.
+	//Currently it causes prims to fail to rebuild when they should be popping back into visiblity.
+	//static const LLCachedControl<bool> hide_tp_screen("AscentDisableTeleportScreens",false);
 
 	//Can't check gTeleportDisplay due to a process_teleport_local(), which sets it to true for local teleports... so:
 	// Do this case if IS teleporting but NOT local teleporting, AND either the TP screen is set to appear OR we just entered the sim (TELEPORT_START_ARRIVAL)
 	LLAgent::ETeleportState state = gAgent.getTeleportState();
 	if(state != LLAgent::TELEPORT_NONE && state != LLAgent::TELEPORT_LOCAL && state != LLAgent::TELEPORT_PENDING &&
-		(!hide_tp_screen || state == LLAgent::TELEPORT_START_ARRIVAL || state == LLAgent::TELEPORT_ARRIVING))
+		(/*!hide_tp_screen ||*/ state == LLAgent::TELEPORT_START_ARRIVAL || state == LLAgent::TELEPORT_ARRIVING))
 	{
 		if(!cleared)
 		{