Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@@ -1424,13 +1424,13 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
|
||||
+ " " + LLTrans::getString("'") + group_name + LLTrans::getString("'");
|
||||
|
||||
chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByGroup")
|
||||
+ " " + group_name + + LLTrans::getString("'") + LLTrans::getString(".");
|
||||
+ " " + group_name + LLTrans::getString("'") + LLTrans::getString(".");
|
||||
}
|
||||
else
|
||||
{
|
||||
from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'")
|
||||
+ mFromName + LLTrans::getString("'") + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup");
|
||||
chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup" + LLTrans::getString("."));
|
||||
chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup") + LLTrans::getString(".");
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user