Automated merge up from viewer-development into mesh-development

2011-02-11 10:30:01 -05:00 · 2011-02-11 10:30:01 -05:00 · 23f64494b0
parent 29ea62811f 547b40bfc8
commit 23f64494b0
1 changed files with 1 additions and 1 deletions
--- 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"