diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index d2ac6d80e..32dcde12c 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -658,7 +658,15 @@ BOOL LLKeyframeMotion::onActivate()
 	// If the keyframe anim has an associated emote, trigger it. 
 	if( mJointMotionList->mEmoteName.length() > 0 )
 	{
-		mCharacter->startMotion( gAnimLibrary.stringToAnimState(mJointMotionList->mEmoteName) );
+		// <edit> crashfix
+		//mCharacter->startMotion( gAnimLibrary.stringToAnimState(mJointMotionList->mEmoteName) );
+		LLUUID emo = gAnimLibrary.stringToAnimState(mJointMotionList->mEmoteName);
+		
+		if(mCharacter->findMotion(emo) == NULL)
+		{
+			mCharacter->startMotion(emo);
+		}
+		// </edit>
 	}
 
 	mLastLoopedTime = 0.f;
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 99d959e95..90daefbf2 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12654,5 +12654,16 @@
             <integer>473</integer>
         </array>
     </map>
+    <key>HexEditorColumns</key>
+	<map>
+		<key>Comment</key>
+		<string>Number of columns shown in hex editor</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>U32</string>
+		<key>Value</key>
+		<integer>16</integer>
+	</map>
 </map>
 </llsd>
diff --git a/indra/newview/skins/default/xui/en-us/floater_hex.xml b/indra/newview/skins/default/xui/en-us/floater_hex.xml
index ceb91a5ae..b8377193e 100644
--- a/indra/newview/skins/default/xui/en-us/floater_hex.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_hex.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="200" width="560" min_width="560" min_height="128"  
+     can_resize="true" height="200" width="580" min_width="580" min_height="128"  
      name="floater_hex" title="Hex Editor" rect_control="FloaterHexRect">
 	<text name="status_text" follows="left|top" left="10" top="-25" height="20">Loading...</text>
 	<button name="upload_btn" follows="right|top" top="-25" right="-120" width="100" bottom="155" label="[UPLOAD]" enabled="false"/>