aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-09-01 07:57:04 -0700
committerMcCabe Maxsted2010-09-01 07:57:04 -0700
commit3ae1fe5627c48d7136aea5b7b882e493a97ed90c (patch)
treeccb215b029c0973215f76bae7051e8e1cde378cf /linden/indra
parentenabled help button for cmdline (diff)
downloadmeta-impy-3ae1fe5627c48d7136aea5b7b882e493a97ed90c.zip
meta-impy-3ae1fe5627c48d7136aea5b7b882e493a97ed90c.tar.gz
meta-impy-3ae1fe5627c48d7136aea5b7b882e493a97ed90c.tar.bz2
meta-impy-3ae1fe5627c48d7136aea5b7b882e493a97ed90c.tar.xz
Fixed function duplication after merge
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llviewercontrol.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index a73d0ab..50224ad 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -498,20 +498,6 @@ bool handleTranslateChatPrefsChanged(const LLSD& newvalue)
498 return true; 498 return true;
499} 499}
500 500
501// [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
502bool rlvHandleEnableLegacyNamingChanged(const LLSD& newvalue)
503{
504 rlv_handler_t::fLegacyNaming = newvalue.asBoolean();
505 return true;
506}
507
508bool rlvHandleShowNameTagsChanged(const LLSD& newvalue)
509{
510 RlvSettings::fShowNameTags = newvalue.asBoolean();
511 return true;
512}
513// [/RLVa:KB]
514
515bool handleMediaDebugLevelChanged(const LLSD& newvalue) 501bool handleMediaDebugLevelChanged(const LLSD& newvalue)
516{ 502{
517 LLMediaManager *mgr = LLMediaManager::getInstance(); 503 LLMediaManager *mgr = LLMediaManager::getInstance();