diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-11 10:30:01 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-11 10:30:01 -0500 |
| commit | 23f64494b06d2dcf2aabbcb94f24696d6d7f5e4d (patch) | |
| tree | 3c96bde7e9dcd724114d76658ee8f4a1a4e119fc /indra/newview | |
| parent | 29ea62811fff865c05c67b26a2dc8d2da966c5d0 (diff) | |
| parent | 547b40bfc8b0139789a2d9c5dcd1591343a2c60b (diff) | |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview')
| -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" |