diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-21 14:19:25 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-21 14:19:25 -0400 |
| commit | f64a79d9d14fe52dc9ac599bc9e4faf8009254ce (patch) | |
| tree | d14ff8f9cf8bd723b8d479446f47eeb4211e8326 /indra/newview/llstartup.cpp | |
| parent | ee130adc60dea8530f82d90107198ebcbd63fded (diff) | |
| parent | 4539e5c8e93badc83e71045ba87ef81bf8740cab (diff) | |
merge changes for DRTVWR-171
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 6b0fc26db7..50e50ce63a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3215,17 +3215,6 @@ bool process_login_success_response() gSavedSettings.setU32("PreferredMaturity", preferredMaturity); } - // During the AO transition, this flag will be true. Then the flag will - // go away. After the AO transition, this code and all the code that - // uses it can be deleted. - text = response["ao_transition"].asString(); - if (!text.empty()) - { - if (text == "1") - { - gAgent.setAOTransition(); - } - } text = response["start_location"].asString(); if(!text.empty()) |