Commit 2930c2b7 authored by Kitty Barnett's avatar Kitty Barnett
Browse files

Merged with RLVa tip

--HG--
branch : RLVa
parents 234f45da 6cd180e4
7e30e8e8e09c5a2a9be662c225715bd14e23195a
\ No newline at end of file
8afbb1bf15157f51bfdc769576c4422a0543535c
\ No newline at end of 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>
......
......@@ -99,7 +99,8 @@ void LLDrawPoolTree::render(S32 pass)
LLOverrideFaceColor color(this, 1.f, 1.f, 1.f, 1.f);
// [SL:KB] - Patch: Render-TextureToggle (Catznip-4.0)
gGL.getTexUnit(sDiffTex)->bind( (LLPipeline::sRenderTextures) ? mTexturep : LLViewerFetchedTexture::sDefaultDiffuseImagep );
LLViewerTexture* pTexture = (LLPipeline::sRenderTextures) ? mTexturep : LLViewerFetchedTexture::sDefaultDiffuseImagep;
gGL.getTexUnit(sDiffTex)->bind(pTexture);
// [/SL:KB]
// gGL.getTexUnit(sDiffTex)->bind(mTexturep);
......
......@@ -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 )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment