diff options
| author | Denis Serdjuk <dserduk@productengine.com> | 2010-02-19 16:54:52 +0200 |
|---|---|---|
| committer | Denis Serdjuk <dserduk@productengine.com> | 2010-02-19 16:54:52 +0200 |
| commit | 11a01981789b13d8f9e38286715accfe1eb665cf (patch) | |
| tree | 07ac7c51c26f69f907891e0a89eac7e05d32c61b /indra/newview/llpanellogin.cpp | |
| parent | fcd34cbe8e1fd90edd26486b7d2d004109b8fab7 (diff) | |
| parent | 22676e6d38fe938f394a9764b226793b5862768c (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 43f4024bac..7bd03167fd 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -232,6 +232,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, if(sim_string.empty()) { LLURLSimString::setString(gSavedSettings.getString("LoginLocation")); + sim_string = LLURLSimString::sInstance.mSimString; } if (!sim_string.empty()) |