From afe61eb994377e25d60d0a0893510a693149c6be Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 23 Sep 2008 01:53:11 +0000 Subject: QAR-849 merge maint-viewer-10-merge 96838-97237 -> release --- indra/newview/llviewermessage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ce91678a36..e47ffe2d7f 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -861,7 +861,8 @@ void open_offer(const std::vector& items, const std::string& from_name) } if(gSavedSettings.getBOOL("ShowInInventory") && - asset_type != LLAssetType::AT_CALLINGCARD) + asset_type != LLAssetType::AT_CALLINGCARD && + item->getInventoryType() != LLInventoryType::IT_ATTACHMENT) { LLInventoryView::showAgentInventory(TRUE); } @@ -3306,8 +3307,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **) return; } - F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : (gain * gSavedSettings.getF32("AudioLevelSFX")); - gAudiop->triggerSound(sound_id, owner_id, volume, pos_global); + gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global); } void process_preload_sound(LLMessageSystem *msg, void **user_data) -- cgit v1.2.3