diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-10-27 15:45:21 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-10-27 15:45:21 -0700 |
| commit | b1c3ec9c0049758afbe9e13d31cc2f60348ecffb (patch) | |
| tree | 9da64a10bee7c90ac671db21df68b9e78ca72c7c /indra/llplugin/llpluginclassmedia.h | |
| parent | 9833a50260fb45d5f0033200ae756834c0cc9940 (diff) | |
| parent | 4ee02ce01a220aaf63f10c2a00556b13c7892de3 (diff) | |
Merge
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
| -rwxr-xr-x | indra/llplugin/llpluginclassmedia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 255fb0e2f1..a0167bc5fc 100755 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -193,7 +193,7 @@ public: bool canPaste() const { return mCanPaste; }; // These can be called before init(), and they will be queued and sent before the media init message. - void setUserDataPath(const std::string &user_data_path); + void setUserDataPath(const std::string &user_data_path_cache, const std::string &user_data_path_cookies); void setLanguageCode(const std::string &language_code); void setPluginsEnabled(const bool enabled); void setJavascriptEnabled(const bool enabled); |