Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rev changed grid management incompatibly -.-

Browse Source
This commit is contained in:
Siana Gearz
2011-10-15 04:46:35 +02:00
parent ca757ff1b2
commit 0130423d93
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/app_settings/default_grids.xml
View File

@@ -2,33 +2,34 @@
<array> <array>
<map> <map>
<key>default_grids_version</key><string>1</string> <key>default_grids_version</key><string>2</string>
</map> </map>
<!-- Second Life --> <!-- Second Life -->
<map> <map>
<key>gridnick</key><string>secondlife</string> <key>gridname</key><string>Second Life</string>
<key>gridname</key><string>Agni</string>
<key>platform</key><string>SecondLife</string> <key>platform</key><string>SecondLife</string>
<key>loginuri</key><string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string> <key>loginuri</key><string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>
<key>loginpage</key><string>http://secondlife.com/app/login/</string> <key>loginpage</key><string>http://viewer-login.agni.lindenlab.com/</string>
<key>helperuri</key><string>https://secondlife.com/helpers/</string> <key>helperuri</key><string>https://secondlife.com/helpers/</string>
<key>website</key><string>http://secondlife.com/</string> <key>website</key><string>http://secondlife.com/</string>
<key>support</key><string>http://secondlife.com/support/</string> <key>support</key><string>http://secondlife.com/support/</string>
<key>register</key><string>http://secondlife.com/registration/</string> <key>register</key><string>http://secondlife.com/registration/</string>
<key>password</key><string>http://secondlife.com/account/request.php</string> <key>password</key><string>http://secondlife.com/account/request.php</string>
<key>render_compat</key><boolean>1</boolean>
<key>inventory_links</key><boolean>1</boolean>
</map> </map>
<map> <map>
<key>gridnick</key><string>secondlife_beta</string> <key>gridname</key><string>Second Life BETA</string>
<key>gridname</key><string>Aditi</string>
<key>helperuri</key><string>http://aditi-secondlife.webdev.lindenlab.com/helpers/</string> <key>helperuri</key><string>http://aditi-secondlife.webdev.lindenlab.com/helpers/</string>
<key>loginpage</key><string>http://secondlife.com/app/login/</string> <key>loginpage</key><string>http://viewer-login.agni.lindenlab.com/</string>
<key>loginuri</key><string>https://login.aditi.lindenlab.com/cgi-bin/login.cgi</string> <key>loginuri</key><string>https://login.aditi.lindenlab.com/cgi-bin/login.cgi</string>
<key>password</key><string>http://secondlife.com/account/request.php</string> <key>password</key><string>http://secondlife.com/account/request.php</string>
<key>platform</key><string>SecondLife</string> <key>platform</key><string>SecondLife</string>
<key>register</key><string>http://secondlife.com/registration/</string> <key>register</key><string>http://secondlife.com/registration/</string>
<key>render_compat</key><boolean>0</boolean> <key>render_compat</key><boolean>0</boolean>
<key>inventory_links</key><boolean>1</boolean>
<key>support</key><string>http://secondlife.com/support/</string> <key>support</key><string>http://secondlife.com/support/</string>
<key>version</key><integer>0</integer> <key>version</key><integer>0</integer>
<key>website</key><string>http://secondlife.com/</string> <key>website</key><string>http://secondlife.com/</string>
@@ -37,7 +38,6 @@
<!-- Local Host --> <!-- Local Host -->
<map> <map>
<key>gridnick</key><string>local</string>
<key>gridname</key><string>Local Host</string> <key>gridname</key><string>Local Host</string>
<key>platform</key><string>OpenSim</string> <key>platform</key><string>OpenSim</string>
<key>loginuri</key><string>http://127.0.0.1:9000/</string> <key>loginuri</key><string>http://127.0.0.1:9000/</string>

4
indra/newview/hippogridmanager.cpp
View File

@@ -796,7 +796,7 @@ void HippoGridManager::loadFromFile()
{ {
mDefaultGridsVersion = 0; mDefaultGridsVersion = 0;
// load user grid info // load user grid info
parseFile(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids_sg1.xml"), false); parseFile(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids_sg2.xml"), false);
// merge default grid info, if newer. Force load, if list of grids is empty. // merge default grid info, if newer. Force load, if list of grids is empty.
parseFile(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml"), !mGridInfo.empty()); parseFile(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml"), !mGridInfo.empty());
// merge grid info from web site, if newer. Force load, if list of grids is empty. // merge grid info from web site, if newer. Force load, if list of grids is empty.
@@ -957,7 +957,7 @@ void HippoGridManager::saveFile()
} }
// write client grid info file // write client grid info file
std::string fileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids_sg1.xml"); std::string fileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids_sg2.xml");
llofstream file; llofstream file;
file.open(fileName.c_str()); file.open(fileName.c_str());
if (file.is_open()) if (file.is_open())

6
indra/newview/llpanellogin.cpp
View File

@@ -942,7 +942,6 @@ void LLPanelLogin::loadLoginPage()
} }
// Grid // Grid
oStr << "&grid=" << LLWeb::curlEscape(LLViewerLogin::getInstance()->getGridLabel());
if (gHippoGridManager->getConnectedGrid()->isSecondLife()) { if (gHippoGridManager->getConnectedGrid()->isSecondLife()) {
// find second life grid from login URI // find second life grid from login URI
@@ -960,6 +959,11 @@ void LLPanelLogin::loadLoginPage()
} }
} }
} }
else
{
oStr << "&grid=" << LLWeb::curlEscape(LLViewerLogin::getInstance()->getGridLabel());
}
gViewerWindow->setMenuBackgroundColor(false, !LLViewerLogin::getInstance()->isInProductionGrid()); gViewerWindow->setMenuBackgroundColor(false, !LLViewerLogin::getInstance()->isInProductionGrid());
gLoginMenuBarView->setBackgroundColor(gMenuBarView->getBackgroundColor()); gLoginMenuBarView->setBackgroundColor(gMenuBarView->getBackgroundColor());