diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-02-13 17:10:50 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-02-13 17:10:50 -0800 |
| commit | 0f8828edb5224d601fd72e3f2bfe0d1998ec0db0 (patch) | |
| tree | f58a2615f8295847edd6311bd9ca1dab9752b82b /indra/newview | |
| parent | 95f859dc22724611f4a1d2dc91e0c1769ec1e632 (diff) | |
Fixing line endings after cut/paste
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llpanellogin.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 911979721e..330da6a15f 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -708,19 +708,19 @@ void LLPanelLogin::setLocation(const LLSLURL& slurl) LL_DEBUGS("AppInit")<<"setting Location "<<slurl.asString()<<LL_ENDL; LLStartUp::setStartSLURL(slurl); // calls onUpdateStartSLURL, above } -
-void LLPanelLogin::autologinToLocation(const LLSLURL& slurl)
-{
- LL_DEBUGS("AppInit")<<"automatically logging into Location "<<slurl.asString()<<LL_ENDL;
- LLStartUp::setStartSLURL(slurl); // calls onUpdateStartSLURL, above
-
- if ( LLPanelLogin::sInstance != NULL )
- {
- void* unused_paramter = 0;
- LLPanelLogin::sInstance->onClickConnect(unused_paramter);
- }
-}
-
+ +void LLPanelLogin::autologinToLocation(const LLSLURL& slurl) +{ + LL_DEBUGS("AppInit")<<"automatically logging into Location "<<slurl.asString()<<LL_ENDL; + LLStartUp::setStartSLURL(slurl); // calls onUpdateStartSLURL, above + + if ( LLPanelLogin::sInstance != NULL ) + { + void* unused_paramter = 0; + LLPanelLogin::sInstance->onClickConnect(unused_paramter); + } +} + // static void LLPanelLogin::closePanel() |