diff --git a/indra/newview/skins/default/xui/en/floater_message_log.xml b/indra/newview/skins/default/xui/en/floater_message_log.xml
index c856039fd0d1e8783e6be07e93cec20d845a47f0..e81e356190d6f8b98d4a9ea8f78d3d91748b9ae2 100644
--- a/indra/newview/skins/default/xui/en/floater_message_log.xml
+++ b/indra/newview/skins/default/xui/en/floater_message_log.xml
@@ -91,7 +91,7 @@
        top_delta="0"
        right="340"
        height="20"
-       max_length="65535" />
+       max_length_bytes="65535" />
       <button
        name="filter_apply_btn"
        follows="top|right"
diff --git a/indra/newview/skins/default/xui/en/menu_message_log_filter.xml b/indra/newview/skins/default/xui/en/menu_message_log_filter.xml
index 542082e2ef529d8a7eed95c363775f35fcbf42aa..847c886237e22ac08fb15ca45fc5cbcceb37fb0f 100644
--- a/indra/newview/skins/default/xui/en/menu_message_log_filter.xml
+++ b/indra/newview/skins/default/xui/en/menu_message_log_filter.xml
@@ -17,21 +17,21 @@
      label="Fewer spammy messages">
         <menu_item_call.on_click 
          function="MessageLog.Filter.Action"
-         userdata="!StartPingCheck !CompletePingCheck !PacketAck !SimulatorViewerTimeMessage !SimStats !AgentUpdate !AgentAnimation !AvatarAnimation !ViewerEffect !CoarseLocationUpdate !LayerData !CameraConstraint !ObjectUpdateCached !RequestMultipleObjects !ObjectUpdate !ObjectUpdateCompressed !ImprovedTerseObjectUpdate !KillObject !ImagePacket !SendXferPacket !ConfirmXferPacket !TransferPacket"/>
+         userdata="!StartPingCheck !CompletePingCheck !PacketAck !SimulatorViewerTimeMessage !SimStats !AgentUpdate !AgentAnimation !AvatarAnimation !ObjectAnimation !ViewerEffect !CoarseLocationUpdate !LayerData !CameraConstraint !ObjectUpdateCached !RequestMultipleObjects !ObjectUpdate !ObjectUpdateCompressed !ImprovedTerseObjectUpdate !KillObject !ImagePacket !SendXferPacket !ConfirmXferPacket !TransferPacket"/>
         </menu_item_call>
   <menu_item_call
       name="less_spam_no_sound"
-      label="Fewer spammy messages (minus sound crap)">
+      label="Fewer spammy messages (minus sound)">
     <menu_item_call.on_click
       function="MessageLog.Filter.Action"
-      userdata="!StartPingCheck !CompletePingCheck !PacketAck !SimulatorViewerTimeMessage !SimStats !AgentUpdate !AgentAnimation !AvatarAnimation !ViewerEffect !CoarseLocationUpdate !LayerData !CameraConstraint !ObjectUpdateCached !RequestMultipleObjects !ObjectUpdate !ObjectUpdateCompressed !ImprovedTerseObjectUpdate !KillObject !ImagePacket !SendXferPacket !ConfirmXferPacket !TransferPacket !SoundTrigger !AttachedSound !PreloadSound"/>
+      userdata="!StartPingCheck !CompletePingCheck !PacketAck !SimulatorViewerTimeMessage !SimStats !AgentUpdate !AgentAnimation !AvatarAnimation !ObjectAnimation !ViewerEffect !CoarseLocationUpdate !LayerData !CameraConstraint !ObjectUpdateCached !RequestMultipleObjects !ObjectUpdate !ObjectUpdateCompressed !ImprovedTerseObjectUpdate !KillObject !ImagePacket !SendXferPacket !ConfirmXferPacket !TransferPacket !SoundTrigger !AttachedSound !AttachedSoundGainChange !PreloadSound"/>
   </menu_item_call>
 	<menu_item_call 
      name="less_spam_no_sound" 
-     label="Fewer spammy messages (minus sound and map crap)">
+     label="Fewer spammy messages (minus sound and map)">
         <menu_item_call.on_click 
          function="MessageLog.Filter.Action"
-         userdata="!StartPingCheck !CompletePingCheck !PacketAck !SimulatorViewerTimeMessage !SimStats !AgentUpdate !AgentAnimation !AvatarAnimation !ViewerEffect !CoarseLocationUpdate !LayerData !CameraConstraint !ObjectUpdateCached !RequestMultipleObjects !ObjectUpdate !ObjectUpdateCompressed !ImprovedTerseObjectUpdate !KillObject !ImagePacket !SendXferPacket !ConfirmXferPacket !TransferPacket !SoundTrigger !AttachedSound !PreloadSound !FindAgent !MapBlockRequest"/>
+         userdata="!StartPingCheck !CompletePingCheck !PacketAck !SimulatorViewerTimeMessage !SimStats !AgentUpdate !AgentAnimation !AvatarAnimation !ObjectAnimation !ViewerEffect !CoarseLocationUpdate !LayerData !CameraConstraint !ObjectUpdateCached !RequestMultipleObjects !ObjectUpdate !ObjectUpdateCompressed !ImprovedTerseObjectUpdate !KillObject !ImagePacket !SendXferPacket !ConfirmXferPacket !TransferPacket !SoundTrigger !AttachedSound !AttachedSoundGainChange !PreloadSound !FindAgent !MapBlockRequest"/>
         </menu_item_call>
 	<menu_item_call 
      name="obj_update"