Merge remote-tracking branch 'shyotl/master'

2013-07-05 22:37:13 +02:00
parent a329928dcd bbb0bd54bf
commit f1e493291a
22 changed files with 565 additions and 268 deletions
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2332,7 +2332,6 @@ bool LLAppViewer::initConfiguration()
 		if(LLStartUp::getStartSLURL().getType() == LLSLURL::LOCATION) 
 		{  
 			gHippoGridManager->setCurrentGrid(LLStartUp::getStartSLURL().getGrid());
-			
 		}  
    }
    else if(clp.hasOption("slurl"))