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

Shymod/RLVa merge whoopsie

Browse Source
This commit is contained in:
Siana Gearz
2010-11-15 01:42:38 +01:00
parent 6a7c9250fd
commit 8a2915d07c
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llviewermessage.cpp
View File

@@ -3131,6 +3131,10 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
break;
}
// [/RLVa:KB]
#if SHY_MOD //Command handler
if(SHCommandHandler::handleCommand(false,mesg,from_id,chatter))
return;
#endif //shy_mod
// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-10 (RLVa-1.0.0g)
// Copy/paste from above
if ( (chatter) && (chat.mSourceType == CHAT_SOURCE_OBJECT && chat.mChatType != CHAT_TYPE_DEBUG_MSG) &&
@@ -3146,10 +3150,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
}
// [/RLVa:KB]
case CHAT_TYPE_DEBUG_MSG:
#if SHY_MOD //Command handler
if(SHCommandHandler::handleCommand(false,mesg,from_id,chatter))
return;
#endif //shy_mod
case CHAT_TYPE_NORMAL:
verb = ": ";
break;
@@ -3207,21 +3207,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
check_translate_chat(mesg, chat, TRUE);
}
}
// Make swirly things only for talking objects. (not script debug messages, though)
if( chatter
&& chat.mSourceType == CHAT_SOURCE_OBJECT
&& chat.mChatType != CHAT_TYPE_DEBUG_MSG
&& gSavedSettings.getBOOL("EffectScriptChatParticles") )
{
LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
psc->setSourceObject(chatter);
psc->setColor(color);
//We set the particles to be owned by the object's owner,
//just in case they should be muted by the mute list
psc->setOwnerUUID(owner_id);
LLViewerPartSim::getInstance()->addPartSource(psc);
}
}