diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-09-23 01:53:11 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-09-23 01:53:11 +0000 |
| commit | afe61eb994377e25d60d0a0893510a693149c6be (patch) | |
| tree | 80c6e33cd664e5c8b1c5f55c3b7b49c081dd590a /indra/newview/llviewermessage.cpp | |
| parent | 2945882258ad1befe8e8094c0a1a655e4ddbcd30 (diff) | |
QAR-849 merge maint-viewer-10-merge 96838-97237 -> release
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<LLUUID>& 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) |