aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/hippoGridManager.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-09-25 03:22:13 -0500
committerJacek Antonelli2009-09-25 04:02:24 -0500
commitf6be1049a5f71a97202eab28503a69a7ec5dfc04 (patch)
treecf203f08e682761d8e9159f66c81c512ebad9da9 /linden/indra/newview/hippoGridManager.cpp
parentReverted "grid-firstname_lastname" user directories. (diff)
downloadmeta-impy-f6be1049a5f71a97202eab28503a69a7ec5dfc04.zip
meta-impy-f6be1049a5f71a97202eab28503a69a7ec5dfc04.tar.gz
meta-impy-f6be1049a5f71a97202eab28503a69a7ec5dfc04.tar.bz2
meta-impy-f6be1049a5f71a97202eab28503a69a7ec5dfc04.tar.xz
Disabled avatar name and password fields in grid manager.
Temporary, until we implement a decent account manager.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/hippoGridManager.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/linden/indra/newview/hippoGridManager.cpp b/linden/indra/newview/hippoGridManager.cpp
index 56d585c..c7693af 100644
--- a/linden/indra/newview/hippoGridManager.cpp
+++ b/linden/indra/newview/hippoGridManager.cpp
@@ -543,9 +543,9 @@ void HippoGridManager::parseData(LLSD &gridInfo, bool mergeIfNewer)
543 if (gridMap.has("password")) grid->setPasswordUrl(gridMap["password"]); 543 if (gridMap.has("password")) grid->setPasswordUrl(gridMap["password"]);
544 //if (gridMap.has("search")) grid->setSearchUrl(gridMap["search"]); 544 //if (gridMap.has("search")) grid->setSearchUrl(gridMap["search"]);
545 if (gridMap.has("render_compat")) grid->setRenderCompat(gridMap["render_compat"]); 545 if (gridMap.has("render_compat")) grid->setRenderCompat(gridMap["render_compat"]);
546 if (gridMap.has("firstname")) grid->setFirstName(gridMap["firstname"]); 546 // if (gridMap.has("firstname")) grid->setFirstName(gridMap["firstname"]);
547 if (gridMap.has("lastname")) grid->setLastName(gridMap["lastname"]); 547 // if (gridMap.has("lastname")) grid->setLastName(gridMap["lastname"]);
548 if (gridMap.has("avatarpassword")) grid->setAvatarPassword(gridMap["avatarpassword"]); 548 // if (gridMap.has("avatarpassword")) grid->setAvatarPassword(gridMap["avatarpassword"]);
549 if (newGrid) addGrid(grid); 549 if (newGrid) addGrid(grid);
550 } 550 }
551 } 551 }
@@ -573,14 +573,14 @@ void HippoGridManager::saveFile()
573 gridInfo[i]["loginpage"] = grid->getLoginPage(); 573 gridInfo[i]["loginpage"] = grid->getLoginPage();
574 gridInfo[i]["helperuri"] = grid->getHelperUri(); 574 gridInfo[i]["helperuri"] = grid->getHelperUri();
575 gridInfo[i]["website"] = grid->getWebSite(); 575 gridInfo[i]["website"] = grid->getWebSite();
576 gridInfo[i]["support"] = grid->getSupportUrl(); 576 gridInfo[i]["support"] = grid->getSupportUrl();
577 gridInfo[i]["register"] = grid->getRegisterUrl(); 577 gridInfo[i]["register"] = grid->getRegisterUrl();
578 gridInfo[i]["password"] = grid->getPasswordUrl(); 578 gridInfo[i]["password"] = grid->getPasswordUrl();
579 gridInfo[i]["firstname"] = grid->getFirstName(); 579 // gridInfo[i]["firstname"] = grid->getFirstName();
580 gridInfo[i]["lastname"] = grid->getLastName(); 580 // gridInfo[i]["lastname"] = grid->getLastName();
581 gridInfo[i]["avatarpassword"] = grid->getAvatarPassword(); 581 // gridInfo[i]["avatarpassword"] = grid->getAvatarPassword();
582 582
583 //gridInfo[i]["search"] = grid->getSearchUrl(); 583 //gridInfo[i]["search"] = grid->getSearchUrl();
584 gridInfo[i]["render_compat"] = grid->isRenderCompat(); 584 gridInfo[i]["render_compat"] = grid->isRenderCompat();
585 } 585 }
586 586