diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-03-17 13:14:21 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-03-17 13:14:21 -0700 |
| commit | b8c1976460374e743743728ef49b38ad52c453a4 (patch) | |
| tree | 4f340d954ae3552d4dbb87b389d15d98d66eba51 /indra/newview/llviewermedia.h | |
| parent | 7a0fb4fece5a92627caa08622e9584a903a3fa1d (diff) | |
| parent | 4aae7b51616c0963af4668442bdb5bfaba8c5044 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rwxr-xr-x | indra/newview/llviewermedia.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index b92977f093..48f0d9dc4d 100755 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -474,6 +474,7 @@ private: std::string mTarget; LLNotificationPtr mNotification; bool mCleanBrowser; // force the creation of a clean browsing target with full options enabled + static std::vector<std::string> sMimeTypesFailed; private: BOOL mIsUpdated ; |