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

COA stuff rolled into gSavedSettings.

Browse Source 
Added common script<->client command junk.
This commit is contained in:
unknown
2010-10-19 18:50:47 -05:00
parent 4e854ffd2b
commit 4929460c66
28 changed files with 1732 additions and 1718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
indra/newview/llviewermessage.cpp
View File

@@ -143,6 +143,10 @@
#include "llviewernetwork.h"
// </edit>
#if SHY_MOD //Group Title script access
# include "shcommandhandler.h"
#endif //shy_mod
#include <boost/tokenizer.hpp>
#if LL_WINDOWS // For Windows specific error handler
@@ -2673,21 +2677,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
if (chatter)
{
chat.mPosAgent = chatter->getPositionAgent();
// Make swirly things only for talking objects. (not script debug messages, though)
if (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);
}
// record last audible utterance
if (is_audible
&& (is_linden || (!is_muted && !is_busy)))
@@ -2804,6 +2794,10 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
break;
case CHAT_TYPE_DEBUG_MSG:
case CHAT_TYPE_OWNER:
#if SHY_MOD //Command handler
if(SHCommandHandler::handleCommand(false,mesg,from_id,chatter))
return;
#endif //shy_mod
case CHAT_TYPE_NORMAL:
verb = ": ";
break;
@@ -2861,6 +2855,21 @@ 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);
}
}