diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-03-29 16:24:58 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-29 16:24:58 -0700 |
commit | 86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (patch) | |
tree | 35ab8edbc364a05a5d29d343f63b22e01ea5cb38 /indra/newview/llpanellogin.cpp | |
parent | 3fca923949667d1c713119043cd4aaeae4acfe09 (diff) | |
parent | 8654ba5e2571e07c8d2fd898027abf6f85777905 (diff) |
Automated merge
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
-rw-r--r-- | indra/newview/llpanellogin.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index b620a005d2..42e4b397db 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -797,7 +797,6 @@ void LLPanelLogin::setLocation(const LLSLURL& slurl) { LLStartUp::setStartSLURL(slurl); updateServer(); - } // static |