diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 01:52:28 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 01:52:28 -0800 |
| commit | 2d7697dfade4ecbb8fbe9b26a5332fc9e93f5669 (patch) | |
| tree | 5e956b1e9bfc1efd65bcd365abac613b4d4baf04 /indra/newview/llpanellogin.cpp | |
| parent | 5c73a908353cdd7210e3148f7162d30afab7873a (diff) | |
| parent | 6ea944b38f1e619df2c52283f6b33bbcc1cbbc40 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 906f091090..1bc7f7a499 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -223,7 +223,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, LLComboBox* combo = getChild<LLComboBox>("start_location_combo"); - if(!LLStartUp::getStartSLURL().isValid()) + if(!LLStartUp::getStartSLURL().isLocation()) { LLStartUp::setStartSLURL(LLSLURL(gSavedSettings.getString("LoginLocation"))); } |