Merge remote branch 'shyotl/master'

2010-10-11 03:53:52 +02:00
parent 6192edf353 fe9a3d2ba2
commit 6c8080d1a6
93 changed files with 715 additions and 399 deletions
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2644,7 +2644,6 @@ bool idle_startup()
 			LLFloaterBeacons::showInstance(); DIE -HgB
 		}*/
 		
-
 		if (!gNoRender)
 		{
 			//Set up cloud rendertypes. Passed argument is unused.