aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterworldmap.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloaterworldmap.cpp')
-rw-r--r--linden/indra/newview/llfloaterworldmap.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index 2f6dc99..5399867 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -1159,7 +1159,7 @@ void LLFloaterWorldMap::onPanBtn( void* userdata )
1159// static 1159// static
1160void LLFloaterWorldMap::onGridManager(void*) 1160void LLFloaterWorldMap::onGridManager(void*)
1161{ 1161{
1162 LoginFloater::newShow(std::string("Test"), false, LoginFloater::testCallback, NULL); 1162 LoginFloater::newShow(std::string("Test"), false);
1163 //gAgent.teleportHome(); 1163 //gAgent.teleportHome();
1164 //gFloaterWorldMap->close(); 1164 //gFloaterWorldMap->close();
1165} 1165}
@@ -1528,7 +1528,7 @@ void LLFloaterWorldMap::teleport()
1528 } 1528 }
1529 1529
1530 gHippoGridManager->setCurrentGrid(gridInfo->getGridNick()); 1530 gHippoGridManager->setCurrentGrid(gridInfo->getGridNick());
1531 gHippoGridManager->setDefaultGrid(gridInfo->getGridNick()); 1531 //gHippoGridManager->setDefaultGrid(gridInfo->getGridNick());
1532 //this doesn't work :( gSavedSettings.setBOOL("CmdLineLoginURI", FALSE); 1532 //this doesn't work :( gSavedSettings.setBOOL("CmdLineLoginURI", FALSE);
1533 LLStartUp::setShouldAutoLogin(true); 1533 LLStartUp::setShouldAutoLogin(true);
1534 LLAppViewer::instance()->requestLogout(false); 1534 LLAppViewer::instance()->requestLogout(false);