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/newview/tests | |
| parent | f73b795bb709b3060e06b4238ae4dac702f21301 (diff) | |
| parent | 82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (diff) | |
Merge. Fixed issue with LLProxy code related to changes to the LLSocket interface.
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/llworldmap_test.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp index acc6e814bc..102294959a 100644 --- a/indra/newview/tests/llworldmap_test.cpp +++ b/indra/newview/tests/llworldmap_test.cpp @@ -27,7 +27,6 @@ // Dependencies #include "linden_common.h" -#include "llapr.h" #include "llsingleton.h" #include "lltrans.h" #include "lluistring.h" |