summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-02-03 19:05:04 -0800
committerRichard Linden <none@none>2012-02-03 19:05:04 -0800
commit8b44dafd8f1641f77572787df5aa8b0cbb5c7aa6 (patch)
tree5a6f8aaf5753d0f810dad885bc831935cda4b1b8 /indra/newview/llviewermedia.cpp
parente0b29b67b6243b84a9c35d3460b91bed5d873d46 (diff)
parente854db064547ae20a87bbeac399295a924cf1c8f (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r--indra/newview/llviewermedia.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 046360e9e9..d7e79351c2 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1901,7 +1901,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
}
}
- LL_WARNS_ONCE("Plugin") << "plugin intialization failed for mime type: " << media_type << LL_ENDL;
+ LL_WARNS_ONCE("Plugin") << "plugin initialization failed for mime type: " << media_type << LL_ENDL;
LLSD args;
args["MIME_TYPE"] = media_type;
LLNotificationsUtil::add("NoPlugin", args);