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

Grid Manager fixes

Browse Source
This commit is contained in:
Siana Gearz
2011-02-02 02:28:27 +01:00
parent 86acf69bab
commit 789be05aba
2 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llstartup.cpp
View File

@@ -2669,8 +2669,9 @@ bool idle_startup()
if (!gAgent.isFirstLogin())
{
bool url_ok = LLURLSimString::sInstance.parse();
if (!url_ok && ((agent_start_location == "last" && gSavedSettings.getBOOL("LoginLastLocation")) ||
(agent_start_location == "home" && !gSavedSettings.getBOOL("LoginLastLocation"))))
if (!((agent_start_location == "url" && url_ok) ||
(!url_ok && ((agent_start_location == "last" && gSavedSettings.getBOOL("LoginLastLocation")) ||
(agent_start_location == "home" && !gSavedSettings.getBOOL("LoginLastLocation"))))))
{
// The reason we show the alert is because we want to
// reduce confusion for when you log in and your provided