aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterchat.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-08-19 10:54:12 -0700
committerMcCabe Maxsted2010-08-26 11:22:52 -0700
commitfee791f808c6adcb114302f39aacce4d5834edf5 (patch)
tree8328ae00e6af4163f68adfaf12e0947e91b84135 /linden/indra/newview/llfloaterchat.cpp
parentDisable ParticleChat by default, as it's a privacy concern. (diff)
downloadmeta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.zip
meta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.tar.gz
meta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.tar.bz2
meta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.tar.xz
Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.e
Diffstat (limited to 'linden/indra/newview/llfloaterchat.cpp')
-rw-r--r--linden/indra/newview/llfloaterchat.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 7613e36..b14930b 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -208,10 +208,11 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4&
208 // extract out the sender name and replace it with the hotlinked name. 208 // extract out the sender name and replace it with the hotlinked name.
209 if (chat.mSourceType == CHAT_SOURCE_AGENT && 209 if (chat.mSourceType == CHAT_SOURCE_AGENT &&
210 chat.mFromID != LLUUID::null && 210 chat.mFromID != LLUUID::null &&
211// chat.mFromID != gAgent.getID())
212// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
211 chat.mFromID != gAgent.getID() && 213 chat.mFromID != gAgent.getID() &&
212// [RLVa] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
213 (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ) 214 (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
214// [/RLVa] 215// [/RLVa:KB]
215 { 216 {
216 chat.mURL = llformat("secondlife:///app/agent/%s/about",chat.mFromID.asString().c_str()); 217 chat.mURL = llformat("secondlife:///app/agent/%s/about",chat.mFromID.asString().c_str());
217 } 218 }