summaryrefslogtreecommitdiff
path: root/indra/newview/llmediactrl.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-01-05 12:37:26 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-01-05 12:37:26 +0200
commitddf2cccdb926ca2aac226a90c4030f2d4e8c6f50 (patch)
treea1d7fe2f014b70e5b0d5fe3419b4e5eb85c0de48 /indra/newview/llmediactrl.cpp
parent3c5976981dd06ccca45d9d2b9024a6c72fd7ea49 (diff)
parentb282f04b31f60a3ddd9dcbd27eed2d2226a40e09 (diff)
Merge from default branch.
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
-rw-r--r--indra/newview/llmediactrl.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 199bd966ef..93f926b5d0 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -39,7 +39,6 @@
#include "llfloaterworldmap.h"
#include "lluictrlfactory.h"
#include "llurldispatcher.h"
-#include "llurlsimstring.h"
#include "llviewborder.h"
#include "llviewercontrol.h"
#include "llviewermedia.h"