diff options
| author | Karl Steifvater <qarl@lindenlab.com> | 2008-07-22 20:12:37 +0000 |
|---|---|---|
| committer | Karl Steifvater <qarl@lindenlab.com> | 2008-07-22 20:12:37 +0000 |
| commit | df4f20d4f51e41355e876f734527b4245543415c (patch) | |
| tree | 36aaf66ddb96b27fb9701764153cd7d17add275a /indra/newview/llviewermedia.cpp | |
| parent | 0c0391cc7114bd2e9e4462c40e88814326f61bc2 (diff) | |
merge uv-picking branch.
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 1586f8dc75..3f57b26fec 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -694,5 +694,3 @@ void LLViewerMedia::setMimeType(std::string mime_type) { sViewerMediaImpl.mMimeType = mime_type; } - - |