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

Added eavesdropping detection in voice and fixed empty filter crash.

Browse Source
This commit is contained in:
phr0z3nt04st
2010-06-14 21:01:24 -05:00
parent 831af279f4
commit 297a292784
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloatermessagelog.cpp
View File

@@ -859,7 +859,7 @@ void LLFloaterMessageLog::startApplyingFilter(std::string filter, BOOL force)
LLMessageLogFilter new_filter = LLMessageLogFilter();
sMessageLogFilterString = filter;
new_filter.set(sMessageLogFilterString);
if(filter.at(filter.length()-1) != ' ')
if(!filter.length() || filter.at(filter.length()-1) != ' ')
childSetText("filter_edit", filter + " ");
if(force
|| (new_filter.mNegativeNames != sMessageLogFilter.mNegativeNames)

29
indra/newview/llvoiceclient.cpp
View File

@@ -2568,7 +2568,7 @@ void LLVoiceClient::sessionCreateSendMessage(sessionState *session, bool startAu
if(!session->mHash.empty())
{
stream
<< "<Password>" << LLURI::escape(session->mHash, allowed_chars) << "</Password>"
<< "<llfloat>" << LLURI::escape(session->mHash, allowed_chars) << "</Password>"
<< "<PasswordHashAlgorithm>SHA1UserName</PasswordHashAlgorithm>";
}
@@ -4842,6 +4842,17 @@ LLVoiceClient::participantState::participantState(const std::string &uri) :
{
}
// <edit>
//static
void LLVoiceClient::sessionState::onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data)
{
LLChat chat;
chat.mText = "Possible eavesdropping by "+ first +" "+ last +" detected";
chat.mSourceType = CHAT_SOURCE_SYSTEM;
LLFloaterChat::addChat(chat);
}
// </edit>
LLVoiceClient::participantState *LLVoiceClient::sessionState::addParticipant(const std::string &uri)
{
participantState *result = NULL;
@@ -4886,6 +4897,22 @@ LLVoiceClient::participantState *LLVoiceClient::sessionState::addParticipant(con
if(result->updateMuteState())
mVolumeDirty = true;
// <edit>
if(nameFromsipURI(uri) != gVoiceClient->mAccountName)
{
// let us check to see if they are actually in the sim
LLViewerRegion* regionp = gAgent.getRegion();
if(regionp)
{
if(regionp->mMapAvatarIDs.find(id) == -1)
{
// They are not in my list of people in my sim, they must be a spy.
gCacheName->getName(id, onAvatarNameLookup, NULL);
}
}
}
// </edit>
}
else
{

4
indra/newview/llvoiceclient.h
View File

@@ -299,6 +299,10 @@ static void updatePosition(void);
sessionState();
~sessionState();
// <edit>
static void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data);
// </edit>
participantState *addParticipant(const std::string &uri);
// Note: after removeParticipant returns, the participant* that was passed to it will have been deleted.
// Take care not to use the pointer again after that.