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

46
indra/newview/llpanelgrouplandmoney.cpp
View File

@@ -322,7 +322,7 @@ bool LLPanelGroupLandMoney::impl::applyContribution()
if(!gAgent.setGroupContribution(mPanel.mGroupID, new_contribution))
{
// should never happen...
llwarns << "Unable to set contribution." << llendl;
LL_WARNS() << "Unable to set contribution." << LL_ENDL;
return false;
}
}
@@ -481,7 +481,7 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
if ( msg->getSizeFast(_PREHASH_QueryData, i, _PREHASH_ProductSKU) > 0 )
{
msg->getStringFast( _PREHASH_QueryData, _PREHASH_ProductSKU, land_sku, i);
llinfos << "Land sku: " << land_sku << llendl;
LL_INFOS() << "Land sku: " << land_sku << LL_ENDL;
land_type = LLProductInfoRequestManager::instance().getDescriptionForSku(land_sku);
}
else
@@ -845,10 +845,10 @@ void LLPanelGroupLandMoney::processPlacesReply(LLMessageSystem* msg, void**)
LLPanelGroupLandMoney* selfp = sGroupIDs.getIfThere(group_id);
if(!selfp)
{
llinfos << "Group Panel Land "
LL_INFOS() << "Group Panel Land "
<< gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
<< ' ' << group_id << " no longer in existence."
<< llendl;
<< LL_ENDL;
return;
}
@@ -1073,7 +1073,7 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg,
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_GroupID, group_id );
if (mImplementationp->getGroupID() != group_id)
{
llwarns << "Group Account details not for this group!" << llendl;
LL_WARNS() << "Group Account details not for this group!" << LL_ENDL;
return;
}
@@ -1088,8 +1088,8 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg,
if ( interval_days != mImplementationp->mIntervalLength ||
current_interval != mImplementationp->mCurrentInterval )
{
llinfos << "Out of date details packet " << interval_days << " "
<< current_interval << llendl;
LL_INFOS() << "Out of date details packet " << interval_days << " "
<< current_interval << LL_ENDL;
return;
}
@@ -1136,9 +1136,9 @@ void LLPanelGroupLandMoney::processGroupAccountDetailsReply(LLMessageSystem* msg
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
if (gAgent.getID() != agent_id)
{
llwarns << "Got group "
LL_WARNS() << "Got group "
<< gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
<< " history reply for another agent!" << llendl;
<< " history reply for another agent!" << LL_ENDL;
return;
}
@@ -1147,7 +1147,7 @@ void LLPanelGroupLandMoney::processGroupAccountDetailsReply(LLMessageSystem* msg
LLGroupMoneyTabEventHandler* selfp = LLGroupMoneyTabEventHandler::sInstanceIDs.getIfThere(request_id);
if (!selfp)
{
llwarns << "GroupAccountDetails recieved for non-existent group panel." << llendl;
LL_WARNS() << "GroupAccountDetails recieved for non-existent group panel." << LL_ENDL;
return;
}
@@ -1210,7 +1210,7 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg,
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_GroupID, group_id );
if (mImplementationp->getGroupID() != group_id)
{
llwarns << "Group Account Transactions not for this group!" << llendl;
LL_WARNS() << "Group Account Transactions not for this group!" << LL_ENDL;
return;
}
@@ -1227,8 +1227,8 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg,
if (interval_days != mImplementationp->mIntervalLength ||
current_interval != mImplementationp->mCurrentInterval)
{
llinfos << "Out of date details packet " << interval_days << " "
<< current_interval << llendl;
LL_INFOS() << "Out of date details packet " << interval_days << " "
<< current_interval << LL_ENDL;
return;
}
@@ -1309,9 +1309,9 @@ void LLPanelGroupLandMoney::processGroupAccountTransactionsReply(LLMessageSystem
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
if (gAgent.getID() != agent_id)
{
llwarns << "Got group "
LL_WARNS() << "Got group "
<< gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
<< " history reply for another agent!" << llendl;
<< " history reply for another agent!" << LL_ENDL;
return;
}
@@ -1323,7 +1323,7 @@ void LLPanelGroupLandMoney::processGroupAccountTransactionsReply(LLMessageSystem
self = LLGroupMoneyTabEventHandler::sInstanceIDs.getIfThere(request_id);
if (!self)
{
llwarns << "GroupAccountTransactions recieved for non-existent group panel." << llendl;
LL_WARNS() << "GroupAccountTransactions recieved for non-existent group panel." << LL_ENDL;
return;
}
@@ -1384,7 +1384,7 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_GroupID, group_id );
if (mImplementationp->getGroupID() != group_id)
{
llwarns << "Group Account Summary received not for this group!" << llendl;
LL_WARNS() << "Group Account Summary received not for this group!" << LL_ENDL;
return;
}
@@ -1434,8 +1434,8 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
if (interval_days != mImplementationp->mIntervalLength ||
current_interval != mImplementationp->mCurrentInterval)
{
llinfos << "Out of date summary packet " << interval_days << " "
<< current_interval << llendl;
LL_INFOS() << "Out of date summary packet " << interval_days << " "
<< current_interval << LL_ENDL;
return;
}
@@ -1482,9 +1482,9 @@ void LLPanelGroupLandMoney::processGroupAccountSummaryReply(LLMessageSystem* msg
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
if (gAgent.getID() != agent_id)
{
llwarns << "Got group "
LL_WARNS() << "Got group "
<< gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
<< " history reply for another agent!" << llendl;
<< " history reply for another agent!" << LL_ENDL;
return;
}
@@ -1496,9 +1496,9 @@ void LLPanelGroupLandMoney::processGroupAccountSummaryReply(LLMessageSystem* msg
self = LLGroupMoneyTabEventHandler::sInstanceIDs.getIfThere(request_id);
if (!self)
{
llwarns << "GroupAccountSummary recieved for non-existent group "
LL_WARNS() << "GroupAccountSummary recieved for non-existent group "
<< gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
<< " planning tab." << llendl;
<< " planning tab." << LL_ENDL;
return;
}