livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: custom start location "randomly" reset

Armin Weatherwax 2012-06-17 21:41:29 +02:00
parent 20078e8c55
commit 8efb37cd3d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llpanellogin.cpp
View File

@ -494,7 +494,12 @@ void LLPanelLogin::setFields(LLPointer<LLCredential> credential)
if(identifier.has("startlocation")){
// <FS:AW fix: custom start location "randomly" reset>
// if(identifier.has("startlocation")){
LLSLURL slurl = LLSLURL(sInstance->getChild<LLComboBox>("start_location_combo")->getValue());
if(LLSLURL::LOCATION != slurl.getType() && identifier.has("startlocation"))
{
// <FS:AW fix: custom start location "randomly" reset>
llinfos << "Settings startlocation to: " << identifier["startlocation"].asString() << llendl;
LLStartUp::setStartSLURL(LLSLURL(identifier["startlocation"].asString()));
updateLocationCombo(false);