diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-11-24 22:12:42 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-11-25 14:25:30 +0200 |
| commit | 1b21cc8ffb4eb085fe0294796afbeb0c34bac588 (patch) | |
| tree | 6555d726bb11c34dcd00fa8baa284d640cbffb6c /indra/newview/llviewerparcelmgr.h | |
| parent | 1a7ca0ac711ffc197ece0cebe9edb1deb7dfdcbe (diff) | |
SL-14372 Changes to parcel properties should not pause or ask about music unless url changed
Diffstat (limited to 'indra/newview/llviewerparcelmgr.h')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h index 508a63c398..6ce389ab88 100644 --- a/indra/newview/llviewerparcelmgr.h +++ b/indra/newview/llviewerparcelmgr.h @@ -271,7 +271,7 @@ public: //void makeLandmarkAtSelection(); static void onStartMusicResponse(const LLUUID ®ion_id, const S32 &parcel_id, const std::string &url, const bool &play); - static void optionally_start_music(const std::string &music_url, const S32 &local_id, const LLUUID ®ion_id); + static void optionallyStartMusic(const std::string &music_url, const S32 &local_id, const LLUUID ®ion_id, bool switched_parcel); static void processParcelOverlay(LLMessageSystem *msg, void **user_data); static void processParcelProperties(LLMessageSystem *msg, void **user_data); |