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

Wrecking ball "fix" for attachment kills during teleport 

--HG--
branch : RLVa
meow-7.2.2
Kitty Barnett 2019-04-23 23:29:00 +02:00
parent 779c1ca245
commit d448031edf
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -1175,6 +1175,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>BlockAttachmentKillsOnTeleport</key>
<map>
<key>Comment</key>
<string>Ignore all attachment object kills during teleport</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<boolean>1</boolean>
</map>
<key>BlockAvatarAppearanceMessages</key>
<map>
<key>Comment</key>

15
indra/newview/llviewermessage.cpp
View File

@ -3654,13 +3654,14 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data)
LLViewerObject *objectp = gObjectList.findObject(id);
if (objectp)
{
//// [SL:KB] - Patch: Appearance-TeleportAttachKill | Checked: Catznip-4.0
// if ( (objectp->isAttachment()) && (gAgentAvatarp) && (gAgent.getTeleportState() != LLAgent::TELEPORT_NONE) && (objectp->permYouOwner()) )
// {
// gAgentAvatarp->addPendingDetach(objectp->getRootEdit()->getID());
// continue;
// }
//// [/SL:KB]
// [SL:KB] - Patch: Appearance-TeleportAttachKill | Checked: Catznip-4.0
if ( (objectp->isAttachment()) && (!objectp->isTempAttachment()) && (LLAgent::TELEPORT_NONE != gAgent.getTeleportState()) &&
(gAgentAvatarp) && (objectp->permYouOwner()) && (gSavedSettings.getBOOL("BlockAttachmentKillsOnTeleport")) )
{
//gAgentAvatarp->addPendingDetach(objectp->getRootEdit()->getID());
continue;
}
// [/SL:KB]
// Display green bubble on kill
if ( gShowObjectUpdates )