diff options
| author | Richard Linden <none@none> | 2013-06-21 11:00:47 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-21 11:00:47 -0700 |
| commit | 090fa057b5ff17170d846473a2bc9ebc315c99d3 (patch) | |
| tree | 781dff230ab8d1fc651e453cdd568df5aff8487a /indra/newview/llstartup.cpp | |
| parent | 5de2f0a8970244866dc8b511caa3c8626955264f (diff) | |
| parent | a2a6bf20d71f923e9a5e43f71213fffbfea5a2a6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 3c67216688..de8d549055 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -645,7 +645,7 @@ bool idle_startup() gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL(); } #endif - + if (gAudiop) { #if LL_WINDOWS @@ -2293,7 +2293,7 @@ bool login_alert_status(const LLSD& notification, const LLSD& response) // break; case 2: // Teleport // Restart the login process, starting at our home locaton - LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_HOME)); + LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_HOME)); LLStartUp::setStartupState( STATE_LOGIN_CLEANUP ); break; default: |