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

Link names! Online/Offline notifications, Make group item declines better

Browse Source
This commit is contained in:
Liru Færs
2019-11-03 16:17:32 -05:00
parent fa869f21ad
commit 9cf26e1fc2
7 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llcallingcard.cpp
View File

@@ -745,6 +745,7 @@ static void on_avatar_name_cache_notify(const LLUUID& agent_id,
// Use display name only because this user is your friend
LLSD args;
args["NAME"] = av_name.getNSName(friend_name_system());
args["ID"] = agent_id;
args["STATUS"] = online ? LLTrans::getString("OnlineStatus") : LLTrans::getString("OfflineStatus");
// Popup a notify box with online status of this agent

7
indra/newview/llviewermessage.cpp
View File

@@ -2801,12 +2801,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
info->mTransactionID = session_id;
info->mType = (LLAssetType::EType) asset_type;
info->mFolderID = gInventory.findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(info->mType));
std::string from_name;
from_name += LLTrans::getString("AGroupMemberNamed") + " ";
from_name += name;
info->mFromName = from_name;
info->mFromName = LLTrans::getString("AGroupMemberNamed", LLSD().with("GROUP_ID", group_id).with("FROM_ID", from_id));
info->mDesc = item_name;
info->mHost = msg->getSender();
}

1
indra/newview/skins/default/xui/de/strings.xml
View File

@@ -352,7 +352,6 @@
<string name="RemapControlInputs">Steuerung neu zuweisen</string>
<string name="AnimateYourAvatar">Avatar animieren</string>
<string name="AttachToYourAvatar">An Avatar anhängen</string>
<string name="AGroupMemberNamed">A group member named</string>
<string name="ReleaseOwnership">Eigentum aufgeben und öffentlich machen</string>
<string name="LinkAndDelink">Mit Objekten verknüpfen und davon trennen</string>
<string name="AddAndRemoveJoints">Verbindungen zu anderen Objekten hinzufügen und entfernen</string>

2
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -6549,7 +6549,7 @@ Topic: [SUBJECT], Message: [MESSAGE]
log_to_chat="true"
type="notifytip">
<tag>friendship</tag>
[NAME] is [STATUS]
[secondlife:///app/agent/[ID]/about [NAME]] is [STATUS]
</notification>
<notification

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

@@ -452,7 +452,7 @@ http://secondlife.com/support for help fixing this problem.
<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="AGroupMemberNamed">A member of secondlife:///app/group/[GROUP_ID]/about named secondlife:///app/agent/[FROM_ID]/about</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>

2
indra/newview/skins/default/xui/es/notifications.xml
View File

@@ -3444,7 +3444,7 @@ Pero, vaya, diviértete si quieres.
</notification>
<notification name="FriendOnlineOffline">
[NAME] está [STATUS]
[secondlife:///app/agent/[ID]/about [NAME]] está [STATUS]
</notification>
<notification name="AddSelfFriend">

2
indra/newview/skins/default/xui/es/strings.xml
View File

@@ -495,7 +495,7 @@ http://secondlife.com/support para obtener ayuda sobre cómo solucionar este pro
<string name="RemapControlInputs">Reconfigurar tus controles de entrada</string>
<string name="AnimateYourAvatar">Animar tu avatar</string>
<string name="AttachToYourAvatar">Anexar a tu avatar</string>
<string name="AGroupMemberNamed">un miembro del grupo de nombre</string>
<string name="AGroupMemberNamed">un miembro del secondlife:///app/group/[GROUP_ID]/about de nombre secondlife:///app/agent/[FROM_ID]/about</string>
<string name="ReleaseOwnership">Liberar propiedad y hacer público</string>
<string name="LinkAndDelink">Enlazar y desenlazar de otros objetos</string>
<string name="AddAndRemoveJoints">Agregar o remover uniones con otros objetos</string>