From 1b45335d3294e84300b197605e758e8e61a0a957 Mon Sep 17 00:00:00 2001 From: Beeks Date: Sat, 18 Sep 2010 21:26:32 -0400 Subject: [PATCH] Removed a bunch of calls on the UI handlers that were creating listens for events that could never happen due to lacking the actual UI element. Also changed the posestand submenu to follow LL naming procedures. Signed-off-by: Beeks --- indra/newview/llfloaterland.cpp | 2 +- indra/newview/llpanellandmedia.cpp | 4 ++-- indra/newview/llpanelnetwork.cpp | 2 +- indra/newview/llprefsvoice.cpp | 2 +- indra/newview/llviewermenu.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 8802643b9..b928d200d 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -331,7 +331,7 @@ BOOL LLPanelLandGeneral::postBuild() mEditDesc = getChild("Description"); mEditDesc->setCommitOnFocusLost(TRUE); mEditDesc->setCommitCallback(onCommitAny); - childSetPrevalidate("Description", LLLineEditor::prevalidatePrintableNotPipe); + //childSetPrevalidate("Description", LLLineEditor::prevalidatePrintableNotPipe); Making Dummy View -HgB childSetUserData("Description", this); diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp index 845f9ae4f..ab2e6fc10 100644 --- a/indra/newview/llpanellandmedia.cpp +++ b/indra/newview/llpanellandmedia.cpp @@ -124,8 +124,8 @@ BOOL LLPanelLandMedia::postBuild() childSetCommitCallback("media_size_height", onCommitAny, this); mMediaSizeCtrlLabel = getChild("media_size"); - mMediaNavigateAllowCheck = getChild("check navigate allow"); - childSetCommitCallback("check navigate allow", onCommitAny, this); + /*mMediaNavigateAllowCheck = getChild("check navigate allow"); Making Dummy View -HgB + childSetCommitCallback("check navigate allow", onCommitAny, this);*/ mMediaURLFilterCheck = getChild("check navigate filter"); childSetCommitCallback("check navigate filter", onCommitAny, this); diff --git a/indra/newview/llpanelnetwork.cpp b/indra/newview/llpanelnetwork.cpp index 81c6913cf..b1a1d86ab 100644 --- a/indra/newview/llpanelnetwork.cpp +++ b/indra/newview/llpanelnetwork.cpp @@ -239,7 +239,7 @@ void LLPanelNetwork::updateProxyEnabled(LLPanelNetwork * self, bool enabled, std self->childSetEnabled("socks5_proxy_port", enabled); self->childSetEnabled("socks5_proxy_host", enabled); self->childSetEnabled("socks5_host_label", enabled); - self->childSetEnabled("socks5_proxy_label", enabled); + //self->childSetEnabled("socks5_proxy_label", enabled); Making Dummy View -HgB self->childSetEnabled("socks5_proxy_port", enabled); self->childSetEnabled("socks5_auth_label", enabled); self->childSetEnabled("socks5_auth", enabled); diff --git a/indra/newview/llprefsvoice.cpp b/indra/newview/llprefsvoice.cpp index e641f2c97..de3795f28 100644 --- a/indra/newview/llprefsvoice.cpp +++ b/indra/newview/llprefsvoice.cpp @@ -175,7 +175,7 @@ void LLPrefsVoice::onCommitEnableVoiceChat(LLUICtrl* ctrl, void* user_data) bool enable = enable_voice_chat->getValue(); self->childSetEnabled("modifier_combo", enable); - self->childSetEnabled("friends_only_check", enable); + //self->childSetEnabled("friends_only_check", enable); self->childSetEnabled("push_to_talk_label", enable); self->childSetEnabled("voice_call_friends_only_check", enable); self->childSetEnabled("auto_disengage_mic_check", enable); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 776c62762..df56c3d63 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -784,7 +784,7 @@ void init_menus() // // Add in the pose stand ------------------------------------------- - LLMenuGL* sub = new LLMenuGL("Pose Stand"); + LLMenuGL* sub = new LLMenuGL("Pose Stand..."); menu->appendMenu(sub); sub->append(new LLMenuItemCallGL( "Legs Together Arms Out", &handle_pose_stand_ltao, NULL)); @@ -1432,7 +1432,7 @@ void init_debug_rendering_menu(LLMenuGL* menu) menu->appendSeparator(); menu->append(new LLMenuItemCheckGL("Axes", menu_toggle_control, NULL, menu_check_control, (void*)"ShowAxes")); -// menu->append(new LLMenuItemCheckGL("Cull Small Objects", toggle_cull_small, NULL, menu_check_control, (void*)"RenderCullBySize")); + //menu->append(new LLMenuItemCheckGL("Cull Small Objects", toggle_cull_small, NULL, menu_check_control, (void*)"RenderCullBySize")); menu->appendSeparator(); menu->append(new LLMenuItemToggleGL("Hide Selected", &gHideSelectedObjects));