diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 04:21:49 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 04:21:49 +0200 |
| commit | f13cc44f8999a9897c77411d1296582b7bc1f08d (patch) | |
| tree | 98524e69c320decef78cd5012aba982bce5b7b01 /indra/newview/llviewermedia.h | |
| parent | 5f731d84cb5823bdc4cae5be288f2de2ffb9f5f9 (diff) | |
Post-merge fixes
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 2b604d3a7a..9467a138f0 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -79,6 +79,7 @@ class LLViewerMedia: public LLSingleton<LLViewerMedia> public: // String to get/set media autoplay in gSavedSettings + static const char* AUTO_PLAY_MEDIA_SETTING; static const char* SHOW_MEDIA_ON_OTHERS_SETTING; static const char* SHOW_MEDIA_WITHIN_PARCEL_SETTING; static const char* SHOW_MEDIA_OUTSIDE_PARCEL_SETTING; |