diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-07 16:40:40 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-07 16:40:40 -0400 |
| commit | b8fddce34d1737acf32d83dac423dbb7a948cc4a (patch) | |
| tree | adf4c05ab3a42b2d3fed8fbda23c2de97840bab7 /indra/llcommon/llapp.cpp | |
| parent | f73b795bb709b3060e06b4238ae4dac702f21301 (diff) | |
| parent | 82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (diff) | |
Merge. Fixed issue with LLProxy code related to changes to the LLSocket interface.
Diffstat (limited to 'indra/llcommon/llapp.cpp')
| -rw-r--r-- | indra/llcommon/llapp.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index ed192a9975..a8b7106078 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -137,10 +137,6 @@ void LLApp::commonCtor() mOptions.append(sd); } - // Make sure we clean up APR when we exit - // Don't need to do this if we're cleaning up APR in the destructor - //atexit(ll_cleanup_apr); - // Set the application to this instance. sApplication = this; |