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

Applied STORM-1209 and added string AGroupMemberNamed for translation.

Browse Source
This commit is contained in:
Lirusaito
2013-01-09 11:05:37 -05:00
parent a7d1a4611f
commit 07f88d21bd
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewermessage.cpp
View File

@@ -2011,7 +2011,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// </edit>
BOOL is_busy = gAgent.getBusy();
BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat);
BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat)
// object IMs contain sender object id in session_id (STORM-1209)
|| dialog == IM_FROM_TASK && LLMuteList::getInstance()->isMuted(session_id);
BOOL is_linden = LLMuteList::getInstance()->isLinden(name);
BOOL is_owned_by_me = FALSE;
@@ -2509,7 +2511,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
info->mFolderID = gInventory.findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(info->mType));
std::string from_name;
from_name += "A group member named ";
from_name += LLTrans::getString("AGroupMemberNamed") + " ";
from_name += name;
info->mFromName = from_name;

1
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -290,6 +290,7 @@
<string name="RemapControlInputs">Remap your control inputs</string>
<string name="AnimateYourAvatar">Animate your avatar</string>
<string name="AttachToYourAvatar">Attach to your avatar</string>
<string name="AGroupMemberNamed">A group member named</string>
<string name="ReleaseOwnership">Release ownership and become public</string>
<string name="LinkAndDelink">Link and delink from other objects</string>
<string name="AddAndRemoveJoints">Add and remove joints with other objects</string>