diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-05 18:33:53 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-05 18:33:53 +0200 |
| commit | d956c866cf5f633668f6e81996f7ddb8481eae1c (patch) | |
| tree | dc85377a9d88ef39326df005e0b5047792466ec7 /indra/newview/llviewerparcelmgr.h | |
| parent | 1d1f2e95f2da9cd530f2336a8e661d16a512c064 (diff) | |
| parent | 2998552f3d7447da316afdd1713595528596a0c5 (diff) | |
Merge branch 'master' into DRTVWR-483
Diffstat (limited to 'indra/newview/llviewerparcelmgr.h')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h index 29219843c9..288077fafc 100644 --- a/indra/newview/llviewerparcelmgr.h +++ b/indra/newview/llviewerparcelmgr.h @@ -268,7 +268,8 @@ public: // *NOTE: Taken out 2005-03-21. Phoenix. //void makeLandmarkAtSelection(); - static void optionally_start_music(const std::string& music_url); + 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 processParcelOverlay(LLMessageSystem *msg, void **user_data); static void processParcelProperties(LLMessageSystem *msg, void **user_data); |