livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-23328: Improve extended script info by agent/group SLURLs & human-readable attachment point name

master
Ansariel 2018-12-03 23:39:14 +01:00
parent cf36d9d8bc
commit 20494c8ee9
5 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/llappearance/llavatarappearance.cpp
View File

@ -2180,3 +2180,19 @@ LLAvatarAppearance::LLMaskedMorph::LLMaskedMorph(LLVisualParam *morph_target, BO
target->addPendingMorphMask();
}
}
// <FS:Ansariel> Get attachment point name from ID
//static
std::string LLAvatarAppearance::getAttachmentPointName(S32 attachmentPointId)
{
for (auto attachmentPoint : sAvatarXmlInfo->mAttachmentInfoList)
{
if (attachmentPoint->mAttachmentID == attachmentPointId)
{
return attachmentPoint->mName;
}
}
return std::string();
}
// </FS:Ansariel>

4
indra/llappearance/llavatarappearance.h
View File

@ -228,6 +228,10 @@ protected:
static LLAvatarSkeletonInfo* sAvatarSkeletonInfo;
static LLAvatarXmlInfo* sAvatarXmlInfo;
// <FS:Ansariel> Get attachment point name from ID
public:
static std::string getAttachmentPointName(S32 attachmentPointId);
// </FS:Ansariel>
/** Skeleton
** **

20
indra/newview/fslslbridge.cpp
View File

@ -33,17 +33,19 @@
#include "apr_base64.h" // For getScriptInfo()
#include "llagent.h"
#include "llattachmentsmgr.h"
#include "llappearancemgr.h"
#include "llattachmentsmgr.h"
#include "llavatarappearance.h"
#include "llinventoryfunctions.h"
#include "llmaniptranslate.h"
#include "llpreviewscript.h"
#include "llselectmgr.h"
#include "llsdutil.h"
#include "llslurl.h"
#include "lltrans.h"
#include "llviewerassetupload.h"
#include "llviewercontrol.h"
#include "llviewerregion.h"
#include "llviewerassetupload.h"
#include "llsdutil.h"
#if OPENSIM
#include "llviewernetwork.h"
@ -401,15 +403,15 @@ bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID,
args3["OBJECT_POS"] = scriptInfoArray[12].asString();
args3["OBJECT_ROT"] = scriptInfoArray[13].asString();
args3["OBJECT_OMEGA"] = scriptInfoArray[14].asString();
args3["OBJECT_CREATOR"] = scriptInfoArray[15].asString();
args3["OBJECT_OWNER"] = scriptInfoArray[16].asString();
args3["OBJECT_LAST_OWNER_ID"] = scriptInfoArray[17].asString();
args3["OBJECT_CREATOR"] = LLSLURL("agent", scriptInfoArray[15].asUUID(), "inspect").getSLURLString();
args3["OBJECT_OWNER"] = scriptInfoArray[16].asUUID().isNull() ? LLTrans::getString("GroupOwned") : LLSLURL("agent", scriptInfoArray[16].asUUID(), "inspect").getSLURLString();
args3["OBJECT_LAST_OWNER_ID"] = scriptInfoArray[17].asUUID().notNull() ? LLSLURL("agent", scriptInfoArray[17].asUUID(), "inspect").getSLURLString() : "---";
args3["OBJECT_REZZER_KEY"] = scriptInfoArray[18].asString();
args3["OBJECT_GROUP"] = scriptInfoArray[19].asString();
args3["OBJECT_GROUP"] = scriptInfoArray[19].asUUID().notNull() ? LLSLURL("group", scriptInfoArray[19].asUUID(), "inspect").getSLURLString() : "---";
args3["OBJECT_CREATION_TIME"] = scriptInfoArray[20].asString();
args3["OBJECT_PATHFINDING_TYPE"] = scriptInfoArray[21].asString();
args3["OBJECT_ATTACHED_POINT"] = scriptInfoArray[22].asString();
args3["OBJECT_TEMP_ATTACHED"] = scriptInfoArray[23].asString();
args3["OBJECT_ATTACHED_POINT"] = (scriptInfoArray[22].asInteger() < 1 || scriptInfoArray[22].asInteger() > 255) ? "---" : LLTrans::getString(LLAvatarAppearance::getAttachmentPointName(scriptInfoArray[22].asInteger()));
args3["OBJECT_TEMP_ATTACHED"] = scriptInfoArray[23].asInteger() == 1 ? LLTrans::getString("Yes") : LLTrans::getString("No");
args3["AVATAR_POS"] = scriptInfoArray[24].asString();
args3["INSPECTING_KEY"] = scriptInfoArray[25].asString();
report_to_nearby_chat(format_string(LLTrans::getString("fsbridge_script_info_ext"), args3));

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

@ -6904,4 +6904,10 @@ Ihre aktuelle Position: [AVATAR_POS]
[ASSET_NAME]
</string>
<string name="Yes">
Ja
</string>
<string name="No">
Nein
</string>
</strings>

3
indra/newview/skins/default/xui/en/strings.xml
View File

@ -3108,7 +3108,8 @@ Your current position: [AVATAR_POS]
<string name="mode_settings_text.xml">Text</string>
<string name="Asset_Uploading">Uploading...
[ASSET_NAME]
</string>
<string name="Yes">Yes</string>
<string name="No">No</string>
</strings>