Git is saying I can't just pull the updates, so I'm forced to push this so I can sync. It's unfinished and shouldn't be used or touched really.

Signed-off-by: Beeks <HgDelirium@gmail.com>

indra/newview/llstartup.cpp

@@ -2646,10 +2646,10 @@ bool idle_startup()
 			LLFloaterActiveSpeakers::showInstance();
 		}
 
-		if (gSavedSettings.getBOOL("BeaconAlwaysOn"))
+		/*if (gSavedSettings.getBOOL("BeaconAlwaysOn"))
 		{
-			LLFloaterBeacons::showInstance();
-		}
+			LLFloaterBeacons::showInstance(); DIE
+		}*/
 		
 		if (!gSavedSettings.getBOOL("CloudsEnabled") && !gNoRender)
 		{