Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Voice Update] Apply updates from Viewer-Vivox2

Browse Source 
Applies the following commits:
 4c13e7c - Interim version with SLIM removed from voice.
   4c13e7c753
 9cad21a - Thanks mercurial.
   9cad21adc1
   Only the changes that should have been in 4c13e7c (removal of LLVivoxVoiceClient::accountListBlockRulesSendMessage() and LLVivoxVoiceClient::accountListAutoAcceptRulesSendMessage())
 9c94b96 - Removed debugging.
   9c94b96ed3
 ec77595 - Turn off logging.
   ec775958ef
 857cab1 - Kill all the vivox logs
   857cab153e
This commit is contained in:
Inusaito Sayori
2013-07-27 15:47:04 -04:00
parent 2b2a6d5ea6
commit 641067c399
6 changed files with 8 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llinventorybridge.cpp
View File

@@ -3327,7 +3327,7 @@ void LLFolderBridge::buildContextMenuBaseOptions(U32 flags)
}
}
//Added by spatters to force inventory pull on right-click to display folder options correctly. 07-17-06
//Added by aura to force inventory pull on right-click to display folder options correctly. 07-17-06
mCallingCards = mWearables = FALSE;
LLIsType is_callingcard(LLAssetType::AT_CALLINGCARD);