diff options
| author | Richard Linden <none@none> | 2010-11-15 15:52:54 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-11-15 15:52:54 -0800 |
| commit | 50d21a75a7c6a41a5a3355a8c4406a33454c70dd (patch) | |
| tree | e2fe3e855d710700cd956b505a3f0548038c9dac /indra/newview/llviewerparcelmgr.cpp | |
| parent | e8e1d7e629b9a4a65cde766ed81334140a749428 (diff) | |
| parent | 4bdac3f152862b257b9babe9b5a43329c9f544f9 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 11de377410..fccd1156d3 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -850,7 +850,7 @@ LLParcel* LLViewerParcelMgr::getCollisionParcel() const void LLViewerParcelMgr::render() { - if (mSelected && mRenderSelection) + if (mSelected && mRenderSelection && gSavedSettings.getBOOL("RenderParcelSelection")) { // Rendering is done in agent-coordinates, so need to supply // an appropriate offset to the render code. @@ -1784,8 +1784,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use void optionally_start_music(const std::string& music_url) { - if (gSavedSettings.getBOOL("AudioStreamingMusic") && - gSavedSettings.getBOOL("AudioStreamingMedia")) + if (gSavedSettings.getBOOL("AudioStreamingMusic")) { // only play music when you enter a new parcel if the UI control for this // was not *explicitly* stopped by the user. (part of SL-4878) |