Merge branch 'VoiceUpdate' of git://github.com/Lirusaito/SingularityViewer

This commit is contained in:
Latif Khalifa
2014-03-12 22:21:43 +01:00
6 changed files with 25 additions and 830 deletions

View File

@@ -3337,7 +3337,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);