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

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/lldrawpoolwlsky.cpp
This commit is contained in:
Inusaito Sayori
2015-06-19 05:42:49 -04:00
parent 2bd2a7a64b 1c627317ec
commit b11511b7b9
634 changed files with 8198 additions and 12212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llgiveinventory.cpp
View File

@@ -203,7 +203,7 @@ bool LLGiveInventory::doGiveInventoryItem(const LLUUID& to_agent,
{
bool res = true;
llinfos << "LLGiveInventory::giveInventory()" << llendl;
LL_INFOS() << "LLGiveInventory::giveInventory()" << LL_ENDL;
if(!isInventoryGiveAcceptable(item))
{
return false;
@@ -241,8 +241,8 @@ bool LLGiveInventory::doGiveInventoryCategory(const LLUUID& to_agent,
{
return false;
}
llinfos << "LLGiveInventory::giveInventoryCategory() - "
<< cat->getUUID() << llendl;
LL_INFOS() << "LLGiveInventory::giveInventoryCategory() - "
<< cat->getUUID() << LL_ENDL;
if (!isAgentAvatarValid())
{
@@ -512,8 +512,8 @@ bool LLGiveInventory::commitGiveInventoryCategory(const LLUUID& to_agent,
{
return false;
}
llinfos << "LLGiveInventory::commitGiveInventoryCategory() - "
<< cat->getUUID() << llendl;
LL_INFOS() << "LLGiveInventory::commitGiveInventoryCategory() - "
<< cat->getUUID() << LL_ENDL;
// Test out how many items are being given.
LLViewerInventoryCategory::cat_array_t cats;