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

Actually fix SV-1226

Browse Source 
It happened because we filtered mFromName which started out as from_name, and inconsistently used the two after that...
This change switches to just using mFromName after that point..
SV-1226 #close Fixed it~
This commit is contained in:
Inusaito Sayori
2013-11-22 00:49:47 -05:00
parent 15dbce00ee
commit f3f1727b49
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewermessage.cpp
View File

@@ -4018,7 +4018,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
std::string prefix = mesg.substr(0, 4); std::string prefix = mesg.substr(0, 4);
if (prefix == "/me " || prefix == "/me'") if (prefix == "/me " || prefix == "/me'")
{ {
chat.mText = from_name; chat.mText = chat.mFromName;
mesg = mesg.substr(3); mesg = mesg.substr(3);
ircstyle = TRUE; ircstyle = TRUE;
// This block was moved up to allow bubbles with italicized chat // This block was moved up to allow bubbles with italicized chat
@@ -4191,7 +4191,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
break; break;
} }
chat.mText = from_name + verb + mesg; chat.mText = chat.mFromName + verb + mesg;
} }
if (chatter) if (chatter)