diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-01-20 15:30:07 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-01-20 15:30:07 -0800 |
| commit | 8aadfb1cb63a9527835c6c5127d041d924455505 (patch) | |
| tree | 3fd5f231cae133ec25f0d0d4bf9eda53d0d4c0e4 /indra/newview/llviewermedia.h | |
| parent | 622f8b59ceb286f955351b6185a98919f03ed136 (diff) | |
| parent | 20af2d325a4340aca997efbea752849e9f15d041 (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | 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 668f3b563d..ff18ed605a 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -330,6 +330,7 @@ public: bool isNavigateSuspended() { return mNavigateSuspended; }; void cancelMimeTypeProbe(); + private: // a single media url with some data and an impl. LLPluginClassMedia* mMediaSource; |