diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-02-11 13:52:32 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-02-11 13:52:32 -0500 |
| commit | 6b196c0ece6e515b64bf759198b90962e3c05d35 (patch) | |
| tree | a4c01d054da75ef2640d6f99d126bc2f29fd8889 | |
| parent | d381ec420972722cc176910b4d9e2f7ecf45288a (diff) | |
| parent | 23f64494b06d2dcf2aabbcb94f24696d6d7f5e4d (diff) | |
merge
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index fcd9141269..a8d5c9776c 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -53,7 +53,7 @@ #include "llwebsharing.h" // For LLWebSharing::setOpenIDCookie(), *TODO: find a better way to do this! #include "llfilepicker.h" #include "llnotifications.h" -#include "lldir_win32.h" +#include "lldir.h" #include "llevent.h" // LLSimpleListener #include "llnotificationsutil.h" #include "lluuid.h" |