aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/moviemaker.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/moviemaker.cpp')
-rw-r--r--linden/indra/newview/moviemaker.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/moviemaker.cpp b/linden/indra/newview/moviemaker.cpp
index 34e5a16..611b6d2 100644
--- a/linden/indra/newview/moviemaker.cpp
+++ b/linden/indra/newview/moviemaker.cpp
@@ -2,6 +2,8 @@
2 * @file moviemaker.cpp 2 * @file moviemaker.cpp
3 * @brief MovieMaker implementation 3 * @brief MovieMaker implementation
4 * 4 *
5 * $LicenseInfo:firstyear=2003&license=viewergpl$
6 *
5 * Copyright (c) 2003-2007, Linden Research, Inc. 7 * Copyright (c) 2003-2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28 31
29// =============================================== 32// ===============================================
@@ -33,9 +36,7 @@
33#include "llviewerprecompiledheaders.h" 36#include "llviewerprecompiledheaders.h"
34 37
35#include "moviemaker.h" 38#include "moviemaker.h"
36#include <stdio.h> 39#include <memory>
37#include <stdlib.h>
38#include <memory.h>
39#include "llmemtype.h" 40#include "llmemtype.h"
40 41
41#if LL_WINDOWS 42#if LL_WINDOWS