diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:59:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:59:14 +0000 |
| commit | cef46d16453873691406c22be39ce0ee5e8076d1 (patch) | |
| tree | d7df442ce4af8e8001d7e7bf5647f116b35f929e /indra/newview/llviewermedia.cpp | |
| parent | 73a97010e6c8c7874fdc1778ab46e492f77d9394 (diff) | |
merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r 1078-1091 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index bfc258506f..abaac42874 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -43,6 +43,8 @@ #include "llviewertexture.h" #include "llviewerparcelmedia.h" #include "llviewerparcelmgr.h" +#include "llviewerparcelmedia.h" +#include "llviewerparcelmgr.h" #include "llviewerwindow.h" #include "llversionviewer.h" #include "llviewertexturelist.h" |