diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-01-06 17:23:08 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-01-06 17:23:08 +0200 |
| commit | 3a7e3c4328684f9f52f14f7d4cb13ecf5d803ff4 (patch) | |
| tree | 61320af8ba979cec97b53c1b76ce96a2769d064f /indra/newview/llviewerparcelmgr.cpp | |
| parent | 6ee29d8c2a2b7a47f62d7a391106084e704cd544 (diff) | |
| parent | fc785febb332442533c20b638132b8ab378732a9 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index be68a2ef42..87a9eae028 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1754,7 +1754,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use void optionally_start_music(const std::string& music_url) { - if (gSavedSettings.getBOOL("AudioStreamingMusic") && gSavedSettings.getBOOL("AudioSteamingMedia")) + if (gSavedSettings.getBOOL("AudioStreamingMusic") && gSavedSettings.getBOOL("AudioStreamingMedia")) { // Make the user click the start button on the overlay bar. JC // llinfos << "Starting parcel music " << music_url << llendl; |