summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparcelmediaautoplay.h
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-08-18 19:17:21 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-08-18 19:17:21 +0300
commitb3b33a03c41cf3e26c080adb9c6cbefb32c1c4de (patch)
tree7c64d36bf256e59b09ee21306baaa3cb558d928b /indra/newview/llviewerparcelmediaautoplay.h
parent6d06d4bb5425c086551fa452fce3f9788fa16921 (diff)
parente8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff)
Merge branch 'master' into DRTVWR-486
Diffstat (limited to 'indra/newview/llviewerparcelmediaautoplay.h')
-rw-r--r--indra/newview/llviewerparcelmediaautoplay.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmediaautoplay.h b/indra/newview/llviewerparcelmediaautoplay.h
index cf8e9a97e7..d71fd4c075 100644
--- a/indra/newview/llviewerparcelmediaautoplay.h
+++ b/indra/newview/llviewerparcelmediaautoplay.h
@@ -39,7 +39,8 @@ public:
static void playStarted();
private:
- static void onStartMusicResponse(const LLUUID &region_id, const S32 &parcel_id, const std::string &url, const bool &play);
+ // for askToPlay
+ static void onStartMediaResponse(const LLUUID &region_id, const S32 &parcel_id, const std::string &url, const bool &play);
private:
S32 mLastParcelID;