diff options
author | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
commit | 7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd (patch) | |
tree | 0243666021de3ae6ac61a6c6f4e57d42771fe964 /linden/indra/newview/llprefsim.cpp | |
parent | Applied BlockClickSit debug setting from Emerald to block sit click action (diff) | |
download | meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.zip meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.gz meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.bz2 meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.xz |
Merged in jacek/next
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llprefsim.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp index 6115074..5cb14fc 100644 --- a/linden/indra/newview/llprefsim.cpp +++ b/linden/indra/newview/llprefsim.cpp | |||
@@ -259,6 +259,12 @@ void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_e | |||
259 | LLWStringUtil::replaceChar(busy_response, '^', '\n'); | 259 | LLWStringUtil::replaceChar(busy_response, '^', '\n'); |
260 | LLWStringUtil::replaceChar(busy_response, '%', ' '); | 260 | LLWStringUtil::replaceChar(busy_response, '%', ' '); |
261 | childSetText("busy_response", wstring_to_utf8str(busy_response)); | 261 | childSetText("busy_response", wstring_to_utf8str(busy_response)); |
262 | // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | ||
263 | if (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)) | ||
264 | { | ||
265 | childDisable("busy_response"); | ||
266 | } | ||
267 | // [/RLVa:KB] | ||
262 | 268 | ||
263 | enableHistory(); | 269 | enableHistory(); |
264 | 270 | ||