From da40427a0be28de943988a4961c728384a453119 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 16 Jan 2012 14:27:35 -0500
Subject: STORM-1795 Ad-hoc messages are received even when "Only friends and
 groups can call or IM me"

---
 indra/newview/llimview.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index a856bd0bdc..fa7930503b 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2458,7 +2458,10 @@ void LLIMMgr::addMessage(
 		make_ui_sound("UISndNewIncomingIMSession");
 	}
 
-	if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat))
+	bool show_message = gSavedSettings.getBOOL("VoiceCallsFriendsOnly") &&
+		LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL ? false : true;
+
+	if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && show_message)
 	{
 		LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg);
 	}
-- 
cgit v1.2.3


From 25610423cf732aec40c719f7e6c18e4c06968376 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 19 Jan 2012 15:33:48 -0500
Subject: STORM-1718 For notifications.xml Mute and Ignore in ScriptDialog and
 ScriptDialogGroup can collide with user-supplied fields causing unexpected
 behavior

---
 indra/newview/skins/default/xui/en/notifications.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e4458f33b1..9e3962ac86 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6354,11 +6354,11 @@ Grant this request?
     <form name="form">
       <button
        index="-2"
-       name="Mute"
+       name="Client_Side_Mute"
        text="Block"/>
       <button
        index="-1"
-       name="Ignore"
+       name="Client_Side_Ignore"
        text="Ignore"/>
     </form>
   </notification>
@@ -6373,11 +6373,11 @@ Grant this request?
     <form name="form">
       <button
        index="-2"
-       name="Mute"
+       name="Client_Side_Mute"
        text="Block"/>
       <button
        index="-1"
-       name="Ignore"
+       name="Client_Side_Ignore"
        text="Ignore"/>
     </form>
   </notification>
-- 
cgit v1.2.3


From d70d57c9387bd94d32cb3e2b71430102f250c6eb Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 20 Jan 2012 14:15:31 -0500
Subject: STORM-1795 Fix logic error

---
 indra/newview/llimview.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index fa7930503b..dbdef9d47b 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2458,8 +2458,14 @@ void LLIMMgr::addMessage(
 		make_ui_sound("UISndNewIncomingIMSession");
 	}
 
-	bool show_message = gSavedSettings.getBOOL("VoiceCallsFriendsOnly") &&
-		LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL ? false : true;
+	bool show_message = true;
+	if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly"))
+	{
+		if (LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL)
+		{
+			show_messages = false;
+		}
+	}
 
 	if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && show_message)
 	{
-- 
cgit v1.2.3


From 44436d0240ceeb384d1a2fc05c46ccf1c4034f94 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 20 Jan 2012 14:26:45 -0500
Subject: STORM-1795 Fixed misspelled variable

---
 indra/newview/llimview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index dbdef9d47b..06f57719f5 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2463,7 +2463,7 @@ void LLIMMgr::addMessage(
 	{
 		if (LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL)
 		{
-			show_messages = false;
+			show_message = false;
 		}
 	}
 
-- 
cgit v1.2.3


From 9003c4c54b82cfa2517d264e9437aa294aef5bb9 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 23 Jan 2012 17:43:05 -0500
Subject: STORM-1795 Small logic/formatting change

---
 indra/newview/llimview.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 06f57719f5..f621475193 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2458,16 +2458,10 @@ void LLIMMgr::addMessage(
 		make_ui_sound("UISndNewIncomingIMSession");
 	}
 
-	bool show_message = true;
-	if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly"))
-	{
-		if (LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL)
-		{
-			show_message = false;
-		}
-	}
+	bool skip_message = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") &&
+		LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL);
 
-	if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && show_message)
+	if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message)
 	{
 		LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg);
 	}
-- 
cgit v1.2.3


From d264b5b9233650f2bf8668514b9a5f14c9f6fcfe Mon Sep 17 00:00:00 2001
From: Kitty Barnett <none@none>
Date: Wed, 25 Jan 2012 07:41:08 -0500
Subject: STORM-1804 Details... button on PERMISSION_DEBIT dialog triggers
 run_time_permissions() with a deny action With help from Jonathan Yap

---
 indra/newview/llviewermessage.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index ad333a71ff..2e233b71ce 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5786,6 +5786,16 @@ bool script_question_cb(const LLSD& notification, const LLSD& response)
 	S32 orig = notification["payload"]["questions"].asInteger();
 	S32 new_questions = orig;
 
+	if (response["Details"])
+	{
+		// respawn notification...
+		LLNotificationsUtil::add(notification["name"], notification["substitutions"], notification["payload"]);
+
+		// ...with description on top
+		LLNotificationsUtil::add("DebitPermissionDetails");
+		return false;
+	}
+
 	// check whether permissions were granted or denied
 	BOOL allowed = TRUE;
 	// the "yes/accept" button is the first button in the template, making it button 0
@@ -5843,14 +5853,6 @@ bool script_question_cb(const LLSD& notification, const LLSD& response)
 				gSavedSettings.getString("NotificationChannelUUID")), OfferMatcher(item_id));
 	}
 
-	if (response["Details"])
-	{
-		// respawn notification...
-		LLNotificationsUtil::add(notification["name"], notification["substitutions"], notification["payload"]);
-
-		// ...with description on top
-		LLNotificationsUtil::add("DebitPermissionDetails");
-	}
 	return false;
 }
 static LLNotificationFunctorRegistration script_question_cb_reg_1("ScriptQuestion", script_question_cb);
-- 
cgit v1.2.3


From 619f737abb5c12022537c1f6715d60860152ec79 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sun, 29 Jan 2012 15:34:51 -0500
Subject: STORM-1803 Adding raw anim file upload support

---
 indra/newview/CMakeLists.txt                       |    4 +-
 indra/newview/llfilepicker.cpp                     |   20 +-
 indra/newview/llfloateranimpreview.cpp             | 1174 --------------------
 indra/newview/llfloateranimpreview.h               |  131 ---
 indra/newview/llfloaterbvhpreview.cpp              | 1174 ++++++++++++++++++++
 indra/newview/llfloaterbvhpreview.h                |  131 +++
 indra/newview/llfloaternamedesc.cpp                |   19 +
 indra/newview/llfloaternamedesc.h                  |    7 +
 indra/newview/llviewerfloaterreg.cpp               |    5 +-
 indra/newview/llviewermenufile.cpp                 |   16 +-
 .../xui/en/floater_animation_anim_preview.xml      |   76 ++
 .../xui/en/floater_animation_bvh_preview.xml       |  573 ++++++++++
 .../default/xui/en/floater_animation_preview.xml   |  573 ----------
 13 files changed, 2012 insertions(+), 1891 deletions(-)
 delete mode 100644 indra/newview/llfloateranimpreview.cpp
 delete mode 100644 indra/newview/llfloateranimpreview.h
 create mode 100644 indra/newview/llfloaterbvhpreview.cpp
 create mode 100644 indra/newview/llfloaterbvhpreview.h
 create mode 100644 indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_animation_preview.xml

(limited to 'indra')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 6b2fe1e45a..bced4485ee 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -166,7 +166,7 @@ set(viewer_SOURCE_FILES
     llfirstuse.cpp
     llflexibleobject.cpp
     llfloaterabout.cpp
-    llfloateranimpreview.cpp
+    llfloaterbvhpreview.cpp
     llfloaterauction.cpp
     llfloateravatar.cpp
     llfloateravatarpicker.cpp
@@ -720,7 +720,7 @@ set(viewer_HEADER_FILES
     llfirstuse.h
     llflexibleobject.h
     llfloaterabout.h
-    llfloateranimpreview.h
+    llfloaterbvhpreview.h
     llfloaterauction.h
     llfloateravatar.h
     llfloateravatarpicker.h
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 8024755e86..b426bcf84b 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -49,7 +49,7 @@ LLFilePicker LLFilePicker::sInstance;
 #if LL_WINDOWS
 #define SOUND_FILTER L"Sounds (*.wav)\0*.wav\0"
 #define IMAGE_FILTER L"Images (*.tga; *.bmp; *.jpg; *.jpeg; *.png)\0*.tga;*.bmp;*.jpg;*.jpeg;*.png\0"
-#define ANIM_FILTER L"Animations (*.bvh)\0*.bvh\0"
+#define ANIM_FILTER L"Animations (*.bvh; *.anim)\0*.bvh;*.anim\0"
 #define COLLADA_FILTER L"Scene (*.dae)\0*.dae\0"
 #ifdef _CORY_TESTING
 #define GEOMETRY_FILTER L"SL Geometry (*.slg)\0*.slg\0"
@@ -593,8 +593,10 @@ Boolean LLFilePicker::navOpenFilterProc(AEDesc *theItem, void *info, void *callB
 						}
 						else if (filter == FFLOAD_ANIM)
 						{
-							if (fileInfo.filetype != 'BVH ' && 
-								(fileInfo.extension && (CFStringCompare(fileInfo.extension, CFSTR("bvh"), kCFCompareCaseInsensitive) != kCFCompareEqualTo))
+							if (fileInfo.filetype != 'BVH ' &&
+								fileInfo.filetype != 'ANIM' &&
+								(fileInfo.extension && (CFStringCompare(fileInfo.extension, CFSTR("bvh"), kCFCompareCaseInsensitive) != kCFCompareEqualTo) &&
+								fileInfo.extension && (CFStringCompare(fileInfo.extension, CFSTR("anim"), kCFCompareCaseInsensitive) != kCFCompareEqualTo))
 							)
 							{
 								result = false;
@@ -1196,10 +1198,14 @@ static std::string add_wav_filter_to_gtkchooser(GtkWindow *picker)
 						    LLTrans::getString("sound_files") + " (*.wav)");
 }
 
-static std::string add_bvh_filter_to_gtkchooser(GtkWindow *picker)
+static std::string add_anim_filter_to_gtkchooser(GtkWindow *picker)
 {
-	return add_simple_pattern_filter_to_gtkchooser(picker,  "*.bvh",
-						       LLTrans::getString("animation_files") + " (*.bvh)");
+	GtkFileFilter *gfilter = gtk_file_filter_new();
+	gtk_file_filter_add_pattern(gfilter, "*.bvh");
+	gtk_file_filter_add_pattern(gfilter, "*.anim");
+	std::string filtername = LLTrans::getString("animation_files") + " (*.bvh; *.anim)");
+	add_common_filters_to_gtkchooser(gfilter, picker, filtername);
+	return filtername;
 }
 
 static std::string add_collada_filter_to_gtkchooser(GtkWindow *picker)
@@ -1351,7 +1357,7 @@ BOOL LLFilePicker::getOpenFile( ELoadFilter filter, bool blocking )
 			filtername = add_wav_filter_to_gtkchooser(picker);
 			break;
 		case FFLOAD_ANIM:
-			filtername = add_bvh_filter_to_gtkchooser(picker);
+			filtername = add_anim_filter_to_gtkchooser(picker);
 			break;
 		case FFLOAD_COLLADA:
 			filtername = add_collada_filter_to_gtkchooser(picker);
diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp
deleted file mode 100644
index 2a3512e21a..0000000000
--- a/indra/newview/llfloateranimpreview.cpp
+++ /dev/null
@@ -1,1174 +0,0 @@
-/** 
- * @file llfloateranimpreview.cpp
- * @brief LLFloaterAnimPreview class implementation
- *
- * $LicenseInfo:firstyear=2004&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloateranimpreview.h"
-
-#include "llbvhloader.h"
-#include "lldatapacker.h"
-#include "lldir.h"
-#include "lleconomy.h"
-#include "llnotificationsutil.h"
-#include "llvfile.h"
-#include "llapr.h"
-#include "llstring.h"
-
-#include "llagent.h"
-#include "llanimationstates.h"
-#include "llbbox.h"
-#include "llbutton.h"
-#include "llcheckboxctrl.h"
-#include "llcombobox.h"
-#include "lldrawable.h"
-#include "lldrawpoolavatar.h"
-#include "llrender.h"
-#include "llface.h"
-#include "llfocusmgr.h"
-#include "llkeyframemotion.h"
-#include "lllineeditor.h"
-#include "llfloaterperms.h"
-#include "llsliderctrl.h"
-#include "llspinctrl.h"
-#include "lltextbox.h"
-#include "lltoolmgr.h"
-#include "llui.h"
-#include "llviewercamera.h"
-#include "llviewerobjectlist.h"
-#include "llviewerwindow.h"
-#include "llviewermenufile.h"	// upload_new_resource()
-#include "llvoavatar.h"
-#include "pipeline.h"
-#include "lluictrlfactory.h"
-#include "lltrans.h"
-
-const S32 PREVIEW_BORDER_WIDTH = 2;
-const S32 PREVIEW_RESIZE_HANDLE_SIZE = S32(RESIZE_HANDLE_WIDTH * OO_SQRT2) + PREVIEW_BORDER_WIDTH;
-const S32 PREVIEW_HPAD = PREVIEW_RESIZE_HANDLE_SIZE;
-const S32 PREF_BUTTON_HEIGHT = 16;
-const S32 PREVIEW_TEXTURE_HEIGHT = 300;
-
-const F32 PREVIEW_CAMERA_DISTANCE = 4.f;
-
-const F32 MIN_CAMERA_ZOOM = 0.5f;
-const F32 MAX_CAMERA_ZOOM = 10.f;
-
-const F32 BASE_ANIM_TIME_OFFSET = 5.f;
-
-std::string STATUS[] =
-{
-	"E_ST_OK",
-	"E_ST_EOF",
-	"E_ST_NO_CONSTRAINT",
-	"E_ST_NO_FILE",
-	"E_ST_NO_HIER",
-	"E_ST_NO_JOINT",
-	"E_ST_NO_NAME",
-	"E_ST_NO_OFFSET",
-	"E_ST_NO_CHANNELS",
-	"E_ST_NO_ROTATION",
-	"E_ST_NO_AXIS",
-	"E_ST_NO_MOTION",
-	"E_ST_NO_FRAMES",
-	"E_ST_NO_FRAME_TIME",
-	"E_ST_NO_POS",
-	"E_ST_NO_ROT",
-	"E_ST_NO_XLT_FILE",
-	"E_ST_NO_XLT_HEADER",
-	"E_ST_NO_XLT_NAME",
-	"E_ST_NO_XLT_IGNORE",
-	"E_ST_NO_XLT_RELATIVE",
-	"E_ST_NO_XLT_OUTNAME",
-	"E_ST_NO_XLT_MATRIX",
-	"E_ST_NO_XLT_MERGECHILD",
-	"E_ST_NO_XLT_MERGEPARENT",
-	"E_ST_NO_XLT_PRIORITY",
-	"E_ST_NO_XLT_LOOP",
-	"E_ST_NO_XLT_EASEIN",
-	"E_ST_NO_XLT_EASEOUT",
-	"E_ST_NO_XLT_HAND",
-	"E_ST_NO_XLT_EMOTE",
-"E_ST_BAD_ROOT"
-};
-
-//-----------------------------------------------------------------------------
-// LLFloaterAnimPreview()
-//-----------------------------------------------------------------------------
-LLFloaterAnimPreview::LLFloaterAnimPreview(const std::string& filename) : 
-	LLFloaterNameDesc(filename)
-{
-	mLastMouseX = 0;
-	mLastMouseY = 0;
-
-	mIDList["Standing"] = ANIM_AGENT_STAND;
-	mIDList["Walking"] = ANIM_AGENT_FEMALE_WALK;
-	mIDList["Sitting"] = ANIM_AGENT_SIT_FEMALE;
-	mIDList["Flying"] = ANIM_AGENT_HOVER;
-
-	mIDList["[None]"] = LLUUID::null;
-	mIDList["Aaaaah"] = ANIM_AGENT_EXPRESS_OPEN_MOUTH;
-	mIDList["Afraid"] = ANIM_AGENT_EXPRESS_AFRAID;
-	mIDList["Angry"] = ANIM_AGENT_EXPRESS_ANGER;
-	mIDList["Big Smile"] = ANIM_AGENT_EXPRESS_TOOTHSMILE;
-	mIDList["Bored"] = ANIM_AGENT_EXPRESS_BORED;
-	mIDList["Cry"] = ANIM_AGENT_EXPRESS_CRY;
-	mIDList["Disdain"] = ANIM_AGENT_EXPRESS_DISDAIN;
-	mIDList["Embarrassed"] = ANIM_AGENT_EXPRESS_EMBARRASSED;
-	mIDList["Frown"] = ANIM_AGENT_EXPRESS_FROWN;
-	mIDList["Kiss"] = ANIM_AGENT_EXPRESS_KISS;
-	mIDList["Laugh"] = ANIM_AGENT_EXPRESS_LAUGH;
-	mIDList["Plllppt"] = ANIM_AGENT_EXPRESS_TONGUE_OUT;
-	mIDList["Repulsed"] = ANIM_AGENT_EXPRESS_REPULSED;
-	mIDList["Sad"] = ANIM_AGENT_EXPRESS_SAD;
-	mIDList["Shrug"] = ANIM_AGENT_EXPRESS_SHRUG;
-	mIDList["Smile"] = ANIM_AGENT_EXPRESS_SMILE;
-	mIDList["Surprise"] = ANIM_AGENT_EXPRESS_SURPRISE;
-	mIDList["Wink"] = ANIM_AGENT_EXPRESS_WINK;
-	mIDList["Worry"] = ANIM_AGENT_EXPRESS_WORRY;
-}
-
-//-----------------------------------------------------------------------------
-// setAnimCallbacks()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::setAnimCallbacks()
-{
-	getChild<LLUICtrl>("playback_slider")->setCommitCallback(boost::bind(&LLFloaterAnimPreview::onSliderMove, this));
-	
-	getChild<LLUICtrl>("preview_base_anim")->setCommitCallback(boost::bind(&LLFloaterAnimPreview::onCommitBaseAnim, this));
-	getChild<LLUICtrl>("preview_base_anim")->setValue("Standing");
-
-	getChild<LLUICtrl>("priority")->setCommitCallback(boost::bind(&LLFloaterAnimPreview::onCommitPriority, this));
-	getChild<LLUICtrl>("loop_check")->setCommitCallback(boost::bind(&LLFloaterAnimPreview::onCommitLoop, this));
-	getChild<LLUICtrl>("loop_in_point")->setCommitCallback(boost::bind(&LLFloaterAnimPreview::onCommitLoopIn, this));
-	getChild<LLUICtrl>("loop_in_point")->setValidateBeforeCommit( boost::bind(&LLFloaterAnimPreview::validateLoopIn, this, _1));
-	getChild<LLUICtrl>("loop_out_point")->setCommitCallback(boost::bind(&LLFloaterAnimPreview::onCommitLoopOut, this));
-	getChild<LLUICtrl>("loop_out_point")->setValidateBeforeCommit( boost::bind(&LLFloaterAnimPreview::validateLoopOut, this, _1));
-
-	getChild<LLUICtrl>("hand_pose_combo")->setCommitCallback(boost::bind(&LLFloaterAnimPreview::onCommitHandPose, this));
-	
-	getChild<LLUICtrl>("emote_combo")->setCommitCallback(boost::bind(&LLFloaterAnimPreview::onCommitEmote, this));
-	getChild<LLUICtrl>("emote_combo")->setValue("[None]");
-
-	getChild<LLUICtrl>("ease_in_time")->setCommitCallback(boost::bind(&LLFloaterAnimPreview::onCommitEaseIn, this));
-	getChild<LLUICtrl>("ease_in_time")->setValidateBeforeCommit( boost::bind(&LLFloaterAnimPreview::validateEaseIn, this, _1));
-	getChild<LLUICtrl>("ease_out_time")->setCommitCallback(boost::bind(&LLFloaterAnimPreview::onCommitEaseOut, this));
-	getChild<LLUICtrl>("ease_out_time")->setValidateBeforeCommit( boost::bind(&LLFloaterAnimPreview::validateEaseOut, this, _1));
-}
-
-//-----------------------------------------------------------------------------
-// postBuild()
-//-----------------------------------------------------------------------------
-BOOL LLFloaterAnimPreview::postBuild()
-{
-	LLKeyframeMotion* motionp = NULL;
-	LLBVHLoader* loaderp = NULL;
-
-	if (!LLFloaterNameDesc::postBuild())
-	{
-		return FALSE;
-	}
-
-	getChild<LLUICtrl>("name_form")->setCommitCallback(boost::bind(&LLFloaterAnimPreview::onCommitName, this));
-
-	childSetAction("ok_btn", onBtnOK, this);
-	setDefaultBtn();
-
-	mPreviewRect.set(PREVIEW_HPAD, 
-		PREVIEW_TEXTURE_HEIGHT,
-		getRect().getWidth() - PREVIEW_HPAD, 
-		PREVIEW_HPAD + PREF_BUTTON_HEIGHT + PREVIEW_HPAD);
-	mPreviewImageRect.set(0.f, 1.f, 1.f, 0.f);
-
-	mPlayButton = getChild<LLButton>( "play_btn");
-	mPlayButton->setClickedCallback(boost::bind(&LLFloaterAnimPreview::onBtnPlay, this));
-	mPlayButton->setVisible(true);
-
-	mPauseButton = getChild<LLButton>( "pause_btn");
-	mPauseButton->setClickedCallback(boost::bind(&LLFloaterAnimPreview::onBtnPause, this));
-	mPauseButton->setVisible(false);
-	
-	mStopButton = getChild<LLButton>( "stop_btn");
-	mStopButton->setClickedCallback(boost::bind(&LLFloaterAnimPreview::onBtnStop, this));
-
-	getChildView("bad_animation_text")->setVisible(FALSE);
-
-	std::string exten = gDirUtilp->getExtension(mFilename);
-	if (exten == "bvh")
-	{
-		// loading a bvh file
-
-		// now load bvh file
-		S32 file_size;
-		
-		LLAPRFile infile ;
-		infile.open(mFilenameAndPath, LL_APR_RB, NULL, &file_size);
-		
-		if (!infile.getFileHandle())
-		{
-			llwarns << "Can't open BVH file:" << mFilename << llendl;	
-		}
-		else
-		{
-			char*	file_buffer;
-
-			file_buffer = new char[file_size + 1];
-
-			if (file_size == infile.read(file_buffer, file_size))
-			{
-				file_buffer[file_size] = '\0';
-				llinfos << "Loading BVH file " << mFilename << llendl;
-				ELoadStatus load_status = E_ST_OK;
-				S32 line_number = 0; 
-				loaderp = new LLBVHLoader(file_buffer, load_status, line_number);
-				std::string status = getString(STATUS[load_status]);
-				
-				if(load_status == E_ST_NO_XLT_FILE)
-				{
-					llwarns << "NOTE: No translation table found." << llendl;
-				}
-				else
-				{
-					llwarns << "ERROR: [line: " << line_number << "] " << status << llendl;
-				}
-			}
-
-			infile.close() ;
-			delete[] file_buffer;
-		}
-	}
-
-	if (loaderp && loaderp->isInitialized() && loaderp->getDuration() <= MAX_ANIM_DURATION)
-	{
-		// generate unique id for this motion
-		mTransactionID.generate();
-		mMotionID = mTransactionID.makeAssetID(gAgent.getSecureSessionID());
-
-		mAnimPreview = new LLPreviewAnimation(256, 256);
-
-		// motion will be returned, but it will be in a load-pending state, as this is a new motion
-		// this motion will not request an asset transfer until next update, so we have a chance to 
-		// load the keyframe data locally
-		motionp = (LLKeyframeMotion*)mAnimPreview->getDummyAvatar()->createMotion(mMotionID);
-
-		// create data buffer for keyframe initialization
-		S32 buffer_size = loaderp->getOutputSize();
-		U8* buffer = new U8[buffer_size];
-
-		LLDataPackerBinaryBuffer dp(buffer, buffer_size);
-
-		// pass animation data through memory buffer
-		loaderp->serialize(dp);
-		dp.reset();
-		BOOL success = motionp && motionp->deserialize(dp);
-
-		delete []buffer;
-
-		if (success)
-		{
-			setAnimCallbacks() ;
-			
-			const LLBBoxLocal &pelvis_bbox = motionp->getPelvisBBox();
-
-			LLVector3 temp = pelvis_bbox.getCenter();
-			// only consider XY?
-			//temp.mV[VZ] = 0.f;
-			F32 pelvis_offset = temp.magVec();
-
-			temp = pelvis_bbox.getExtent();
-			//temp.mV[VZ] = 0.f;
-			F32 pelvis_max_displacement = pelvis_offset + (temp.magVec() * 0.5f) + 1.f;
-			
-			F32 camera_zoom = LLViewerCamera::getInstance()->getDefaultFOV() / (2.f * atan(pelvis_max_displacement / PREVIEW_CAMERA_DISTANCE));
-		
-			mAnimPreview->setZoom(camera_zoom);
-
-			motionp->setName(getChild<LLUICtrl>("name_form")->getValue().asString());
-			mAnimPreview->getDummyAvatar()->startMotion(mMotionID);
-			
-			getChild<LLSlider>("playback_slider")->setMinValue(0.0);
-			getChild<LLSlider>("playback_slider")->setMaxValue(1.0);
-
-			getChild<LLUICtrl>("loop_check")->setValue(LLSD(motionp->getLoop()));
-			getChild<LLUICtrl>("loop_in_point")->setValue(LLSD(motionp->getLoopIn() / motionp->getDuration() * 100.f));
-			getChild<LLUICtrl>("loop_out_point")->setValue(LLSD(motionp->getLoopOut() / motionp->getDuration() * 100.f));
-			getChild<LLUICtrl>("priority")->setValue(LLSD((F32)motionp->getPriority()));
-			getChild<LLUICtrl>("hand_pose_combo")->setValue(LLHandMotion::getHandPoseName(motionp->getHandPose()));
-			getChild<LLUICtrl>("ease_in_time")->setValue(LLSD(motionp->getEaseInDuration()));
-			getChild<LLUICtrl>("ease_out_time")->setValue(LLSD(motionp->getEaseOutDuration()));
-			setEnabled(TRUE);
-			std::string seconds_string;
-			seconds_string = llformat(" - %.2f seconds", motionp->getDuration());
-
-			setTitle(mFilename + std::string(seconds_string));
-		}
-		else
-		{
-			mAnimPreview = NULL;
-			mMotionID.setNull();
-			getChild<LLUICtrl>("bad_animation_text")->setValue(getString("failed_to_initialize"));
-		}
-	}
-	else
-	{
-		if ( loaderp )
-		{
-			if (loaderp->getDuration() > MAX_ANIM_DURATION)
-			{
-				LLUIString out_str = getString("anim_too_long");
-				out_str.setArg("[LENGTH]", llformat("%.1f", loaderp->getDuration()));
-				out_str.setArg("[MAX_LENGTH]", llformat("%.1f", MAX_ANIM_DURATION));
-				getChild<LLUICtrl>("bad_animation_text")->setValue(out_str.getString());
-			}
-			else
-			{
-				LLUIString out_str = getString("failed_file_read");
-				out_str.setArg("[STATUS]", getString(STATUS[loaderp->getStatus()])); 
-				getChild<LLUICtrl>("bad_animation_text")->setValue(out_str.getString());
-			}
-		}
-
-		//setEnabled(FALSE);
-		mMotionID.setNull();
-		mAnimPreview = NULL;
-	}
-
-	refresh();
-
-	delete loaderp;
-
-	return TRUE;
-}
-
-//-----------------------------------------------------------------------------
-// LLFloaterAnimPreview()
-//-----------------------------------------------------------------------------
-LLFloaterAnimPreview::~LLFloaterAnimPreview()
-{
-	mAnimPreview = NULL;
-
-	setEnabled(FALSE);
-}
-
-//-----------------------------------------------------------------------------
-// draw()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::draw()
-{
-	LLFloater::draw();
-	LLRect r = getRect();
-
-	refresh();
-
-	if (mMotionID.notNull() && mAnimPreview)
-	{
-		gGL.color3f(1.f, 1.f, 1.f);
-
-		gGL.getTexUnit(0)->bind(mAnimPreview);
-
-		gGL.begin( LLRender::QUADS );
-		{
-			gGL.texCoord2f(0.f, 1.f);
-			gGL.vertex2i(PREVIEW_HPAD, PREVIEW_TEXTURE_HEIGHT);
-			gGL.texCoord2f(0.f, 0.f);
-			gGL.vertex2i(PREVIEW_HPAD, PREVIEW_HPAD + PREF_BUTTON_HEIGHT + PREVIEW_HPAD);
-			gGL.texCoord2f(1.f, 0.f);
-			gGL.vertex2i(r.getWidth() - PREVIEW_HPAD, PREVIEW_HPAD + PREF_BUTTON_HEIGHT + PREVIEW_HPAD);
-			gGL.texCoord2f(1.f, 1.f);
-			gGL.vertex2i(r.getWidth() - PREVIEW_HPAD, PREVIEW_TEXTURE_HEIGHT);
-		}
-		gGL.end();
-
-		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-
-		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-		if (!avatarp->areAnimationsPaused())
-		{
-			mAnimPreview->requestUpdate();
-		}
-	}
-}
-
-//-----------------------------------------------------------------------------
-// resetMotion()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::resetMotion()
-{
-	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-	BOOL paused = avatarp->areAnimationsPaused();
-
-	// *TODO: Fix awful casting hack
-	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
-	
-	// Set emotion
-	std::string emote = getChild<LLUICtrl>("emote_combo")->getValue().asString();
-	motionp->setEmote(mIDList[emote]);
-	
-	LLUUID base_id = mIDList[getChild<LLUICtrl>("preview_base_anim")->getValue().asString()];
-	avatarp->deactivateAllMotions();
-	avatarp->startMotion(mMotionID, 0.0f);
-	avatarp->startMotion(base_id, BASE_ANIM_TIME_OFFSET);
-	getChild<LLUICtrl>("playback_slider")->setValue(0.0f);
-
-	// Set pose
-	std::string handpose = getChild<LLUICtrl>("hand_pose_combo")->getValue().asString();
-	avatarp->startMotion( ANIM_AGENT_HAND_MOTION, 0.0f );
-	motionp->setHandPose(LLHandMotion::getHandPose(handpose));
-
-	if (paused)
-	{
-		mPauseRequest = avatarp->requestPause();
-	}
-	else
-	{
-		mPauseRequest = NULL;	
-	}
-}
-
-//-----------------------------------------------------------------------------
-// handleMouseDown()
-//-----------------------------------------------------------------------------
-BOOL LLFloaterAnimPreview::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-	if (mPreviewRect.pointInRect(x, y))
-	{
-		bringToFront( x, y );
-		gFocusMgr.setMouseCapture(this);
-		gViewerWindow->hideCursor();
-		mLastMouseX = x;
-		mLastMouseY = y;
-		return TRUE;
-	}
-
-	return LLFloater::handleMouseDown(x, y, mask);
-}
-
-//-----------------------------------------------------------------------------
-// handleMouseUp()
-//-----------------------------------------------------------------------------
-BOOL LLFloaterAnimPreview::handleMouseUp(S32 x, S32 y, MASK mask)
-{
-	gFocusMgr.setMouseCapture(FALSE);
-	gViewerWindow->showCursor();
-	return LLFloater::handleMouseUp(x, y, mask);
-}
-
-//-----------------------------------------------------------------------------
-// handleHover()
-//-----------------------------------------------------------------------------
-BOOL LLFloaterAnimPreview::handleHover(S32 x, S32 y, MASK mask)
-{
-	MASK local_mask = mask & ~MASK_ALT;
-
-	if (mAnimPreview && hasMouseCapture())
-	{
-		if (local_mask == MASK_PAN)
-		{
-			// pan here
-			mAnimPreview->pan((F32)(x - mLastMouseX) * -0.005f, (F32)(y - mLastMouseY) * -0.005f);
-		}
-		else if (local_mask == MASK_ORBIT)
-		{
-			F32 yaw_radians = (F32)(x - mLastMouseX) * -0.01f;
-			F32 pitch_radians = (F32)(y - mLastMouseY) * 0.02f;
-			
-			mAnimPreview->rotate(yaw_radians, pitch_radians);
-		}
-		else 
-		{
-			F32 yaw_radians = (F32)(x - mLastMouseX) * -0.01f;
-			F32 zoom_amt = (F32)(y - mLastMouseY) * 0.02f;
-			
-			mAnimPreview->rotate(yaw_radians, 0.f);
-			mAnimPreview->zoom(zoom_amt);
-		}
-
-		mAnimPreview->requestUpdate();
-
-		LLUI::setMousePositionLocal(this, mLastMouseX, mLastMouseY);
-	}
-
-	if (!mPreviewRect.pointInRect(x, y) || !mAnimPreview)
-	{
-		return LLFloater::handleHover(x, y, mask);
-	}
-	else if (local_mask == MASK_ORBIT)
-	{
-		gViewerWindow->setCursor(UI_CURSOR_TOOLCAMERA);
-	}
-	else if (local_mask == MASK_PAN)
-	{
-		gViewerWindow->setCursor(UI_CURSOR_TOOLPAN);
-	}
-	else
-	{
-		gViewerWindow->setCursor(UI_CURSOR_TOOLZOOMIN);
-	}
-
-	return TRUE;
-}
-
-//-----------------------------------------------------------------------------
-// handleScrollWheel()
-//-----------------------------------------------------------------------------
-BOOL LLFloaterAnimPreview::handleScrollWheel(S32 x, S32 y, S32 clicks)
-{
-	mAnimPreview->zoom((F32)clicks * -0.2f);
-	mAnimPreview->requestUpdate();
-
-	return TRUE;
-}
-
-//-----------------------------------------------------------------------------
-// onMouseCaptureLost()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onMouseCaptureLost()
-{
-	gViewerWindow->showCursor();
-}
-
-//-----------------------------------------------------------------------------
-// onBtnPlay()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onBtnPlay()
-{
-	if (!getEnabled())
-		return;
-
-	if (mMotionID.notNull() && mAnimPreview)
-	{
-		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-		
-		if (!avatarp->isMotionActive(mMotionID))
-		{
-			resetMotion();
-			mPauseRequest = NULL;
-		}
-		else if (avatarp->areAnimationsPaused())
-		{			
-			mPauseRequest = NULL;
-		}
-	}
-}
-
-//-----------------------------------------------------------------------------
-// onBtnPause()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onBtnPause()
-{
-	if (!getEnabled())
-		return;
-	
-	if (mMotionID.notNull() && mAnimPreview)
-	{
-		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-
-		if (avatarp->isMotionActive(mMotionID))
-		{
-			if (!avatarp->areAnimationsPaused())
-			{
-				mPauseRequest = avatarp->requestPause();
-			}
-		}
-	}
-}
-
-//-----------------------------------------------------------------------------
-// onBtnStop()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onBtnStop()
-{
-	if (!getEnabled())
-		return;
-
-	if (mMotionID.notNull() && mAnimPreview)
-	{
-		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-		resetMotion();
-		mPauseRequest = avatarp->requestPause();
-	}
-}
-
-//-----------------------------------------------------------------------------
-// onSliderMove()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onSliderMove()
-{
-	if (!getEnabled())
-		return;
-
-	if (mAnimPreview)
-	{
-		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-		F32 slider_value = (F32)getChild<LLUICtrl>("playback_slider")->getValue().asReal();
-		LLUUID base_id = mIDList[getChild<LLUICtrl>("preview_base_anim")->getValue().asString()];
-		LLMotion* motionp = avatarp->findMotion(mMotionID);
-		F32 duration = motionp->getDuration();// + motionp->getEaseOutDuration();
-		F32 delta_time = duration * slider_value;
-		avatarp->deactivateAllMotions();
-		avatarp->startMotion(base_id, delta_time + BASE_ANIM_TIME_OFFSET);
-		avatarp->startMotion(mMotionID, delta_time);
-		mPauseRequest = avatarp->requestPause();
-		refresh();
-	}
-
-}
-
-//-----------------------------------------------------------------------------
-// onCommitBaseAnim()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onCommitBaseAnim()
-{
-	if (!getEnabled())
-		return;
-
-	if (mAnimPreview)
-	{
-		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-
-		BOOL paused = avatarp->areAnimationsPaused();
-
-		// stop all other possible base motions
-		avatarp->stopMotion(mIDList["Standing"], TRUE);
-		avatarp->stopMotion(mIDList["Walking"], TRUE);
-		avatarp->stopMotion(mIDList["Sitting"], TRUE);
-		avatarp->stopMotion(mIDList["Flying"], TRUE);
-
-		resetMotion();
-
-		if (!paused)
-		{
-			mPauseRequest = NULL;
-		}
-	}
-}
-
-//-----------------------------------------------------------------------------
-// onCommitLoop()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onCommitLoop()
-{
-	if (!getEnabled())
-		return;
-	
-	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
-
-	if (motionp)
-	{
-		motionp->setLoop(getChild<LLUICtrl>("loop_check")->getValue().asBoolean());
-		motionp->setLoopIn((F32)getChild<LLUICtrl>("loop_in_point")->getValue().asReal() * 0.01f * motionp->getDuration());
-		motionp->setLoopOut((F32)getChild<LLUICtrl>("loop_out_point")->getValue().asReal() * 0.01f * motionp->getDuration());
-	}
-}
-
-//-----------------------------------------------------------------------------
-// onCommitLoopIn()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onCommitLoopIn()
-{
-	if (!getEnabled())
-		return;
-
-	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
-
-	if (motionp)
-	{
-		motionp->setLoopIn((F32)getChild<LLUICtrl>("loop_in_point")->getValue().asReal() / 100.f);
-		resetMotion();
-		getChild<LLUICtrl>("loop_check")->setValue(LLSD(TRUE));
-		onCommitLoop();
-	}
-}
-
-//-----------------------------------------------------------------------------
-// onCommitLoopOut()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onCommitLoopOut()
-{
-	if (!getEnabled())
-		return;
-
-	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
-
-	if (motionp)
-	{
-		motionp->setLoopOut((F32)getChild<LLUICtrl>("loop_out_point")->getValue().asReal() * 0.01f * motionp->getDuration());
-		resetMotion();
-		getChild<LLUICtrl>("loop_check")->setValue(LLSD(TRUE));
-		onCommitLoop();
-	}
-}
-
-//-----------------------------------------------------------------------------
-// onCommitName()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onCommitName()
-{
-	if (!getEnabled())
-		return;
-
-	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
-
-	if (motionp)
-	{
-		motionp->setName(getChild<LLUICtrl>("name_form")->getValue().asString());
-	}
-
-	doCommit();
-}
-
-//-----------------------------------------------------------------------------
-// onCommitHandPose()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onCommitHandPose()
-{
-	if (!getEnabled())
-		return;
-
-	resetMotion(); // sets hand pose
-}
-
-//-----------------------------------------------------------------------------
-// onCommitEmote()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onCommitEmote()
-{
-	if (!getEnabled())
-		return;
-
-	resetMotion(); // ssts emote
-}
-
-//-----------------------------------------------------------------------------
-// onCommitPriority()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onCommitPriority()
-{
-	if (!getEnabled())
-		return;
-
-	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
-
-	motionp->setPriority(llfloor((F32)getChild<LLUICtrl>("priority")->getValue().asReal()));
-}
-
-//-----------------------------------------------------------------------------
-// onCommitEaseIn()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onCommitEaseIn()
-{
-	if (!getEnabled())
-		return;
-
-	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
-
-	motionp->setEaseIn((F32)getChild<LLUICtrl>("ease_in_time")->getValue().asReal());
-	resetMotion();
-}
-
-//-----------------------------------------------------------------------------
-// onCommitEaseOut()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onCommitEaseOut()
-{
-	if (!getEnabled())
-		return;
-
-	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
-
-	motionp->setEaseOut((F32)getChild<LLUICtrl>("ease_out_time")->getValue().asReal());
-	resetMotion();
-}
-
-//-----------------------------------------------------------------------------
-// validateEaseIn()
-//-----------------------------------------------------------------------------
-bool LLFloaterAnimPreview::validateEaseIn(const LLSD& data)
-{
-	if (!getEnabled())
-		return false;
-
-	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
-	
-	if (!motionp->getLoop())
-	{
-		F32 new_ease_in = llclamp((F32)getChild<LLUICtrl>("ease_in_time")->getValue().asReal(), 0.f, motionp->getDuration() - motionp->getEaseOutDuration());
-		getChild<LLUICtrl>("ease_in_time")->setValue(LLSD(new_ease_in));
-	}
-	
-	return true;
-}
-
-//-----------------------------------------------------------------------------
-// validateEaseOut()
-//-----------------------------------------------------------------------------
-bool LLFloaterAnimPreview::validateEaseOut(const LLSD& data)
-{
-	if (!getEnabled())
-		return false;
-
-	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
-	
-	if (!motionp->getLoop())
-	{
-		F32 new_ease_out = llclamp((F32)getChild<LLUICtrl>("ease_out_time")->getValue().asReal(), 0.f, motionp->getDuration() - motionp->getEaseInDuration());
-		getChild<LLUICtrl>("ease_out_time")->setValue(LLSD(new_ease_out));
-	}
-
-	return true;
-}
-
-//-----------------------------------------------------------------------------
-// validateLoopIn()
-//-----------------------------------------------------------------------------
-bool LLFloaterAnimPreview::validateLoopIn(const LLSD& data)
-{
-	if (!getEnabled())
-		return false;
-
-	F32 loop_in_value = (F32)getChild<LLUICtrl>("loop_in_point")->getValue().asReal();
-	F32 loop_out_value = (F32)getChild<LLUICtrl>("loop_out_point")->getValue().asReal();
-
-	if (loop_in_value < 0.f)
-	{
-		loop_in_value = 0.f;
-	}
-	else if (loop_in_value > 100.f)
-	{
-		loop_in_value = 100.f;
-	}
-	else if (loop_in_value > loop_out_value)
-	{
-		loop_in_value = loop_out_value;
-	}
-
-	getChild<LLUICtrl>("loop_in_point")->setValue(LLSD(loop_in_value));
-	return true;
-}
-
-//-----------------------------------------------------------------------------
-// validateLoopOut()
-//-----------------------------------------------------------------------------
-bool LLFloaterAnimPreview::validateLoopOut(const LLSD& data)
-{
-	if (!getEnabled())
-		return false;
-
-	F32 loop_out_value = (F32)getChild<LLUICtrl>("loop_out_point")->getValue().asReal();
-	F32 loop_in_value = (F32)getChild<LLUICtrl>("loop_in_point")->getValue().asReal();
-
-	if (loop_out_value < 0.f)
-	{
-		loop_out_value = 0.f;
-	}
-	else if (loop_out_value > 100.f)
-	{
-		loop_out_value = 100.f;
-	}
-	else if (loop_out_value < loop_in_value)
-	{
-		loop_out_value = loop_in_value;
-	}
-
-	getChild<LLUICtrl>("loop_out_point")->setValue(LLSD(loop_out_value));
-	return true;
-}
-
-
-//-----------------------------------------------------------------------------
-// refresh()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::refresh()
-{
-	// Are we showing the play button (default) or the pause button?
-	bool show_play = true;
-	if (!mAnimPreview)
-	{
-		getChildView("bad_animation_text")->setVisible(TRUE);
-		// play button visible but disabled
-		mPlayButton->setEnabled(FALSE);
-		mStopButton->setEnabled(FALSE);
-		getChildView("ok_btn")->setEnabled(FALSE);
-	}
-	else
-	{
-		getChildView("bad_animation_text")->setVisible(FALSE);
-		// re-enabled in case previous animation was bad
-		mPlayButton->setEnabled(TRUE);
-		mStopButton->setEnabled(TRUE);
-		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
-		if (avatarp->isMotionActive(mMotionID))
-		{
-			mStopButton->setEnabled(TRUE);
-			LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
-			if (!avatarp->areAnimationsPaused())
-			{
-				// animation is playing
-				if (motionp)
-				{
-					F32 fraction_complete = motionp->getLastUpdateTime() / motionp->getDuration();
-					getChild<LLUICtrl>("playback_slider")->setValue(fraction_complete);
-				}
-				show_play = false;
-			}
-		}
-		else
-		{
-			// Motion just finished playing
-			mPauseRequest = avatarp->requestPause();
-		}
-		getChildView("ok_btn")->setEnabled(TRUE);
-		mAnimPreview->requestUpdate();
-	}
-	mPlayButton->setVisible(show_play);
-	mPauseButton->setVisible(!show_play);
-}
-
-//-----------------------------------------------------------------------------
-// onBtnOK()
-//-----------------------------------------------------------------------------
-void LLFloaterAnimPreview::onBtnOK(void* userdata)
-{
-	LLFloaterAnimPreview* floaterp = (LLFloaterAnimPreview*)userdata;
-	if (!floaterp->getEnabled()) return;
-
-	if (floaterp->mAnimPreview)
-	{
-		LLKeyframeMotion* motionp = (LLKeyframeMotion*)floaterp->mAnimPreview->getDummyAvatar()->findMotion(floaterp->mMotionID);
-
-		S32 file_size = motionp->getFileSize();
-		U8* buffer = new U8[file_size];
-
-		LLDataPackerBinaryBuffer dp(buffer, file_size);
-		if (motionp->serialize(dp))
-		{
-			LLVFile file(gVFS, motionp->getID(), LLAssetType::AT_ANIMATION, LLVFile::APPEND);
-
-			S32 size = dp.getCurrentSize();
-			file.setMaxSize(size);
-			if (file.write((U8*)buffer, size))
-			{
-				std::string name = floaterp->getChild<LLUICtrl>("name_form")->getValue().asString();
-				std::string desc = floaterp->getChild<LLUICtrl>("description_form")->getValue().asString();
-				LLAssetStorage::LLStoreAssetCallback callback = NULL;
-				S32 expected_upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
-				void *userdata = NULL;
-				upload_new_resource(floaterp->mTransactionID, // tid
-						    LLAssetType::AT_ANIMATION,
-						    name,
-						    desc,
-						    0,
-						    LLFolderType::FT_NONE,
-						    LLInventoryType::IT_ANIMATION,
-						    LLFloaterPerms::getNextOwnerPerms(), LLFloaterPerms::getGroupPerms(), LLFloaterPerms::getEveryonePerms(),
-						    name,
-						    callback, expected_upload_cost, userdata);
-
-			}
-			else
-			{
-				llwarns << "Failure writing animation data." << llendl;
-				LLNotificationsUtil::add("WriteAnimationFail");
-			}
-		}
-
-		delete [] buffer;
-		// clear out cache for motion data
-		floaterp->mAnimPreview->getDummyAvatar()->removeMotion(floaterp->mMotionID);
-		LLKeyframeDataCache::removeKeyframeData(floaterp->mMotionID);
-	}
-
-	floaterp->closeFloater(false);
-}
-
-//-----------------------------------------------------------------------------
-// LLPreviewAnimation
-//-----------------------------------------------------------------------------
-LLPreviewAnimation::LLPreviewAnimation(S32 width, S32 height) : LLViewerDynamicTexture(width, height, 3, ORDER_MIDDLE, FALSE)
-{
-	mNeedsUpdate = TRUE;
-	mCameraDistance = PREVIEW_CAMERA_DISTANCE;
-	mCameraYaw = 0.f;
-	mCameraPitch = 0.f;
-	mCameraZoom = 1.f;
-
-	mDummyAvatar = (LLVOAvatar*)gObjectList.createObjectViewer(LL_PCODE_LEGACY_AVATAR, gAgent.getRegion());
-	mDummyAvatar->createDrawable(&gPipeline);
-	mDummyAvatar->mIsDummy = TRUE;
-	mDummyAvatar->mSpecialRenderMode = 1;
-	mDummyAvatar->setPositionAgent(LLVector3::zero);
-	mDummyAvatar->slamPosition();
-	mDummyAvatar->updateJointLODs();
-	mDummyAvatar->updateGeometry(mDummyAvatar->mDrawable);
-	mDummyAvatar->startMotion(ANIM_AGENT_STAND, BASE_ANIM_TIME_OFFSET);
-	mDummyAvatar->hideSkirt();
-
-	// stop extraneous animations
-	mDummyAvatar->stopMotion( ANIM_AGENT_HEAD_ROT, TRUE );
-	mDummyAvatar->stopMotion( ANIM_AGENT_EYE, TRUE );
-	mDummyAvatar->stopMotion( ANIM_AGENT_BODY_NOISE, TRUE );
-	mDummyAvatar->stopMotion( ANIM_AGENT_BREATHE_ROT, TRUE );
-}
-
-//-----------------------------------------------------------------------------
-// LLPreviewAnimation()
-//-----------------------------------------------------------------------------
-LLPreviewAnimation::~LLPreviewAnimation()
-{
-	mDummyAvatar->markDead();
-}
-
-//virtual
-S8 LLPreviewAnimation::getType() const
-{
-	return LLViewerDynamicTexture::LL_PREVIEW_ANIMATION ;
-}
-
-//-----------------------------------------------------------------------------
-// update()
-//-----------------------------------------------------------------------------
-BOOL	LLPreviewAnimation::render()
-{
-	mNeedsUpdate = FALSE;
-	LLVOAvatar* avatarp = mDummyAvatar;
-	
-	gGL.matrixMode(LLRender::MM_PROJECTION);
-	gGL.pushMatrix();
-	gGL.loadIdentity();
-	gGL.ortho(0.0f, mFullWidth, 0.0f, mFullHeight, -1.0f, 1.0f);
-
-	gGL.matrixMode(LLRender::MM_MODELVIEW);
-	gGL.pushMatrix();
-	gGL.loadIdentity();
-
-	if (LLGLSLShader::sNoFixedFunction)
-	{
-		gUIProgram.bind();
-	}
-
-	LLGLSUIDefault def;
-	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-	gGL.color4f(0.15f, 0.2f, 0.3f, 1.f);
-
-	gl_rect_2d_simple( mFullWidth, mFullHeight );
-
-	gGL.matrixMode(LLRender::MM_PROJECTION);
-	gGL.popMatrix();
-
-	gGL.matrixMode(LLRender::MM_MODELVIEW);
-	gGL.popMatrix();
-
-	gGL.flush();
-
-	LLVector3 target_pos = avatarp->mRoot.getWorldPosition();
-
-	LLQuaternion camera_rot = LLQuaternion(mCameraPitch, LLVector3::y_axis) * 
-		LLQuaternion(mCameraYaw, LLVector3::z_axis);
-
-	LLQuaternion av_rot = avatarp->mRoot.getWorldRotation() * camera_rot;
-	LLViewerCamera::getInstance()->setOriginAndLookAt(
-		target_pos + ((LLVector3(mCameraDistance, 0.f, 0.f) + mCameraOffset) * av_rot),		// camera
-		LLVector3::z_axis,																	// up
-		target_pos + (mCameraOffset  * av_rot) );											// point of interest
-
-	LLViewerCamera::getInstance()->setView(LLViewerCamera::getInstance()->getDefaultFOV() / mCameraZoom);
-	LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mFullWidth, mFullHeight, FALSE);
-
-	mCameraRelPos = LLViewerCamera::getInstance()->getOrigin() - avatarp->mHeadp->getWorldPosition();
-
-	//avatarp->setAnimationData("LookAtPoint", (void *)&mCameraRelPos);
-
-	//SJB: Animation is updated in LLVOAvatar::updateCharacter
-	
-	if (avatarp->mDrawable.notNull())
-	{
-		avatarp->updateLOD();
-		
-		LLVertexBuffer::unbind();
-		LLGLDepthTest gls_depth(GL_TRUE);
-
-		LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)avatarp->mDrawable->getFace(0)->getPool();
-		avatarp->dirtyMesh();
-		avatarPoolp->renderAvatars(avatarp);  // renders only one avatar
-	}
-
-	gGL.color4f(1,1,1,1);
-	return TRUE;
-}
-
-//-----------------------------------------------------------------------------
-// requestUpdate()
-//-----------------------------------------------------------------------------
-void LLPreviewAnimation::requestUpdate()
-{ 
-	mNeedsUpdate = TRUE; 
-}
-
-//-----------------------------------------------------------------------------
-// rotate()
-//-----------------------------------------------------------------------------
-void LLPreviewAnimation::rotate(F32 yaw_radians, F32 pitch_radians)
-{
-	mCameraYaw = mCameraYaw + yaw_radians;
-
-	mCameraPitch = llclamp(mCameraPitch + pitch_radians, F_PI_BY_TWO * -0.8f, F_PI_BY_TWO * 0.8f);
-}
-
-//-----------------------------------------------------------------------------
-// zoom()
-//-----------------------------------------------------------------------------
-void LLPreviewAnimation::zoom(F32 zoom_delta)
-{
-	setZoom(mCameraZoom + zoom_delta);
-}
-
-//-----------------------------------------------------------------------------
-// setZoom()
-//-----------------------------------------------------------------------------
-void LLPreviewAnimation::setZoom(F32 zoom_amt)
-{
-	mCameraZoom	= llclamp(zoom_amt, MIN_CAMERA_ZOOM, MAX_CAMERA_ZOOM);
-}
-
-//-----------------------------------------------------------------------------
-// pan()
-//-----------------------------------------------------------------------------
-void LLPreviewAnimation::pan(F32 right, F32 up)
-{
-	mCameraOffset.mV[VY] = llclamp(mCameraOffset.mV[VY] + right * mCameraDistance / mCameraZoom, -1.f, 1.f);
-	mCameraOffset.mV[VZ] = llclamp(mCameraOffset.mV[VZ] + up * mCameraDistance / mCameraZoom, -1.f, 1.f);
-}
-
-
-
diff --git a/indra/newview/llfloateranimpreview.h b/indra/newview/llfloateranimpreview.h
deleted file mode 100644
index f1ffb6547f..0000000000
--- a/indra/newview/llfloateranimpreview.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/** 
- * @file llfloateranimpreview.h
- * @brief LLFloaterAnimPreview class definition
- *
- * $LicenseInfo:firstyear=2004&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLFLOATERANIMPREVIEW_H
-#define LL_LLFLOATERANIMPREVIEW_H
-
-#include "llassettype.h"
-#include "llfloaternamedesc.h"
-#include "lldynamictexture.h"
-#include "llcharacter.h"
-#include "llquaternion.h"
-
-class LLVOAvatar;
-class LLViewerJointMesh;
-
-class LLPreviewAnimation : public LLViewerDynamicTexture
-{
-protected:
-	virtual ~LLPreviewAnimation();
-
-public:
-	LLPreviewAnimation(S32 width, S32 height);	
-
-	/*virtual*/ S8 getType() const ;
-
-	BOOL	render();
-	void	requestUpdate();
-	void	rotate(F32 yaw_radians, F32 pitch_radians);
-	void	zoom(F32 zoom_delta);
-	void	setZoom(F32 zoom_amt);
-	void	pan(F32 right, F32 up);
-	virtual BOOL needsUpdate() { return mNeedsUpdate; }
-
-	LLVOAvatar* getDummyAvatar() { return mDummyAvatar; }
-
-protected:
-	BOOL				mNeedsUpdate;
-	F32					mCameraDistance;
-	F32					mCameraYaw;
-	F32					mCameraPitch;
-	F32					mCameraZoom;
-	LLVector3			mCameraOffset;
-	LLVector3			mCameraRelPos;
-	LLPointer<LLVOAvatar>			mDummyAvatar;
-};
-
-class LLFloaterAnimPreview : public LLFloaterNameDesc
-{
-public:
-	LLFloaterAnimPreview(const std::string& filename);
-	virtual ~LLFloaterAnimPreview();
-	
-	BOOL postBuild();
-
-	BOOL handleMouseDown(S32 x, S32 y, MASK mask);
-	BOOL handleMouseUp(S32 x, S32 y, MASK mask);
-	BOOL handleHover(S32 x, S32 y, MASK mask);
-	BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); 
-	void onMouseCaptureLost();
-
-	void refresh();
-
-	void onBtnPlay();
-	void onBtnPause();	
-	void onBtnStop();
-	void onSliderMove();
-	void onCommitBaseAnim();
-	void onCommitLoop();
-	void onCommitLoopIn();
-	void onCommitLoopOut();
-	bool validateLoopIn(const LLSD& data);
-	bool validateLoopOut(const LLSD& data);
-	void onCommitName();
-	void onCommitHandPose();
-	void onCommitEmote();
-	void onCommitPriority();
-	void onCommitEaseIn();
-	void onCommitEaseOut();
-	bool validateEaseIn(const LLSD& data);
-	bool validateEaseOut(const LLSD& data);
-	static void	onBtnOK(void*);
-	static void onSaveComplete(const LLUUID& asset_uuid,
-									   LLAssetType::EType type,
-									   void* user_data,
-									   S32 status, LLExtStat ext_status);
-private:
-	void setAnimCallbacks() ;
-	
-protected:
-	void			draw();
-	void			resetMotion();
-
-	LLPointer< LLPreviewAnimation > mAnimPreview;
-	S32					mLastMouseX;
-	S32					mLastMouseY;
-	LLButton*			mPlayButton;
-	LLButton*			mPauseButton;	
-	LLButton*			mStopButton;
-	LLRect				mPreviewRect;
-	LLRectf				mPreviewImageRect;
-	LLAssetID			mMotionID;
-	LLTransactionID		mTransactionID;
-	LLAnimPauseRequest	mPauseRequest;
-
-	std::map<std::string, LLUUID>	mIDList;
-};
-
-#endif  // LL_LLFLOATERANIMPREVIEW_H
diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp
new file mode 100644
index 0000000000..b050a638dc
--- /dev/null
+++ b/indra/newview/llfloaterbvhpreview.cpp
@@ -0,0 +1,1174 @@
+/** 
+ * @file llfloaterbvhpreview.cpp
+ * @brief LLFloaterBvhPreview class implementation
+ *
+ * $LicenseInfo:firstyear=2004&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterbvhpreview.h"
+
+#include "llbvhloader.h"
+#include "lldatapacker.h"
+#include "lldir.h"
+#include "lleconomy.h"
+#include "llnotificationsutil.h"
+#include "llvfile.h"
+#include "llapr.h"
+#include "llstring.h"
+
+#include "llagent.h"
+#include "llanimationstates.h"
+#include "llbbox.h"
+#include "llbutton.h"
+#include "llcheckboxctrl.h"
+#include "llcombobox.h"
+#include "lldrawable.h"
+#include "lldrawpoolavatar.h"
+#include "llrender.h"
+#include "llface.h"
+#include "llfocusmgr.h"
+#include "llkeyframemotion.h"
+#include "lllineeditor.h"
+#include "llfloaterperms.h"
+#include "llsliderctrl.h"
+#include "llspinctrl.h"
+#include "lltextbox.h"
+#include "lltoolmgr.h"
+#include "llui.h"
+#include "llviewercamera.h"
+#include "llviewerobjectlist.h"
+#include "llviewerwindow.h"
+#include "llviewermenufile.h"	// upload_new_resource()
+#include "llvoavatar.h"
+#include "pipeline.h"
+#include "lluictrlfactory.h"
+#include "lltrans.h"
+
+const S32 PREVIEW_BORDER_WIDTH = 2;
+const S32 PREVIEW_RESIZE_HANDLE_SIZE = S32(RESIZE_HANDLE_WIDTH * OO_SQRT2) + PREVIEW_BORDER_WIDTH;
+const S32 PREVIEW_HPAD = PREVIEW_RESIZE_HANDLE_SIZE;
+const S32 PREF_BUTTON_HEIGHT = 16;
+const S32 PREVIEW_TEXTURE_HEIGHT = 300;
+
+const F32 PREVIEW_CAMERA_DISTANCE = 4.f;
+
+const F32 MIN_CAMERA_ZOOM = 0.5f;
+const F32 MAX_CAMERA_ZOOM = 10.f;
+
+const F32 BASE_ANIM_TIME_OFFSET = 5.f;
+
+std::string STATUS[] =
+{
+	"E_ST_OK",
+	"E_ST_EOF",
+	"E_ST_NO_CONSTRAINT",
+	"E_ST_NO_FILE",
+	"E_ST_NO_HIER",
+	"E_ST_NO_JOINT",
+	"E_ST_NO_NAME",
+	"E_ST_NO_OFFSET",
+	"E_ST_NO_CHANNELS",
+	"E_ST_NO_ROTATION",
+	"E_ST_NO_AXIS",
+	"E_ST_NO_MOTION",
+	"E_ST_NO_FRAMES",
+	"E_ST_NO_FRAME_TIME",
+	"E_ST_NO_POS",
+	"E_ST_NO_ROT",
+	"E_ST_NO_XLT_FILE",
+	"E_ST_NO_XLT_HEADER",
+	"E_ST_NO_XLT_NAME",
+	"E_ST_NO_XLT_IGNORE",
+	"E_ST_NO_XLT_RELATIVE",
+	"E_ST_NO_XLT_OUTNAME",
+	"E_ST_NO_XLT_MATRIX",
+	"E_ST_NO_XLT_MERGECHILD",
+	"E_ST_NO_XLT_MERGEPARENT",
+	"E_ST_NO_XLT_PRIORITY",
+	"E_ST_NO_XLT_LOOP",
+	"E_ST_NO_XLT_EASEIN",
+	"E_ST_NO_XLT_EASEOUT",
+	"E_ST_NO_XLT_HAND",
+	"E_ST_NO_XLT_EMOTE",
+"E_ST_BAD_ROOT"
+};
+
+//-----------------------------------------------------------------------------
+// LLFloaterBvhPreview()
+//-----------------------------------------------------------------------------
+LLFloaterBvhPreview::LLFloaterBvhPreview(const std::string& filename) : 
+	LLFloaterNameDesc(filename)
+{
+	mLastMouseX = 0;
+	mLastMouseY = 0;
+
+	mIDList["Standing"] = ANIM_AGENT_STAND;
+	mIDList["Walking"] = ANIM_AGENT_FEMALE_WALK;
+	mIDList["Sitting"] = ANIM_AGENT_SIT_FEMALE;
+	mIDList["Flying"] = ANIM_AGENT_HOVER;
+
+	mIDList["[None]"] = LLUUID::null;
+	mIDList["Aaaaah"] = ANIM_AGENT_EXPRESS_OPEN_MOUTH;
+	mIDList["Afraid"] = ANIM_AGENT_EXPRESS_AFRAID;
+	mIDList["Angry"] = ANIM_AGENT_EXPRESS_ANGER;
+	mIDList["Big Smile"] = ANIM_AGENT_EXPRESS_TOOTHSMILE;
+	mIDList["Bored"] = ANIM_AGENT_EXPRESS_BORED;
+	mIDList["Cry"] = ANIM_AGENT_EXPRESS_CRY;
+	mIDList["Disdain"] = ANIM_AGENT_EXPRESS_DISDAIN;
+	mIDList["Embarrassed"] = ANIM_AGENT_EXPRESS_EMBARRASSED;
+	mIDList["Frown"] = ANIM_AGENT_EXPRESS_FROWN;
+	mIDList["Kiss"] = ANIM_AGENT_EXPRESS_KISS;
+	mIDList["Laugh"] = ANIM_AGENT_EXPRESS_LAUGH;
+	mIDList["Plllppt"] = ANIM_AGENT_EXPRESS_TONGUE_OUT;
+	mIDList["Repulsed"] = ANIM_AGENT_EXPRESS_REPULSED;
+	mIDList["Sad"] = ANIM_AGENT_EXPRESS_SAD;
+	mIDList["Shrug"] = ANIM_AGENT_EXPRESS_SHRUG;
+	mIDList["Smile"] = ANIM_AGENT_EXPRESS_SMILE;
+	mIDList["Surprise"] = ANIM_AGENT_EXPRESS_SURPRISE;
+	mIDList["Wink"] = ANIM_AGENT_EXPRESS_WINK;
+	mIDList["Worry"] = ANIM_AGENT_EXPRESS_WORRY;
+}
+
+//-----------------------------------------------------------------------------
+// setAnimCallbacks()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::setAnimCallbacks()
+{
+	getChild<LLUICtrl>("playback_slider")->setCommitCallback(boost::bind(&LLFloaterBvhPreview::onSliderMove, this));
+	
+	getChild<LLUICtrl>("preview_base_anim")->setCommitCallback(boost::bind(&LLFloaterBvhPreview::onCommitBaseAnim, this));
+	getChild<LLUICtrl>("preview_base_anim")->setValue("Standing");
+
+	getChild<LLUICtrl>("priority")->setCommitCallback(boost::bind(&LLFloaterBvhPreview::onCommitPriority, this));
+	getChild<LLUICtrl>("loop_check")->setCommitCallback(boost::bind(&LLFloaterBvhPreview::onCommitLoop, this));
+	getChild<LLUICtrl>("loop_in_point")->setCommitCallback(boost::bind(&LLFloaterBvhPreview::onCommitLoopIn, this));
+	getChild<LLUICtrl>("loop_in_point")->setValidateBeforeCommit( boost::bind(&LLFloaterBvhPreview::validateLoopIn, this, _1));
+	getChild<LLUICtrl>("loop_out_point")->setCommitCallback(boost::bind(&LLFloaterBvhPreview::onCommitLoopOut, this));
+	getChild<LLUICtrl>("loop_out_point")->setValidateBeforeCommit( boost::bind(&LLFloaterBvhPreview::validateLoopOut, this, _1));
+
+	getChild<LLUICtrl>("hand_pose_combo")->setCommitCallback(boost::bind(&LLFloaterBvhPreview::onCommitHandPose, this));
+	
+	getChild<LLUICtrl>("emote_combo")->setCommitCallback(boost::bind(&LLFloaterBvhPreview::onCommitEmote, this));
+	getChild<LLUICtrl>("emote_combo")->setValue("[None]");
+
+	getChild<LLUICtrl>("ease_in_time")->setCommitCallback(boost::bind(&LLFloaterBvhPreview::onCommitEaseIn, this));
+	getChild<LLUICtrl>("ease_in_time")->setValidateBeforeCommit( boost::bind(&LLFloaterBvhPreview::validateEaseIn, this, _1));
+	getChild<LLUICtrl>("ease_out_time")->setCommitCallback(boost::bind(&LLFloaterBvhPreview::onCommitEaseOut, this));
+	getChild<LLUICtrl>("ease_out_time")->setValidateBeforeCommit( boost::bind(&LLFloaterBvhPreview::validateEaseOut, this, _1));
+}
+
+//-----------------------------------------------------------------------------
+// postBuild()
+//-----------------------------------------------------------------------------
+BOOL LLFloaterBvhPreview::postBuild()
+{
+	LLKeyframeMotion* motionp = NULL;
+	LLBVHLoader* loaderp = NULL;
+
+	if (!LLFloaterNameDesc::postBuild())
+	{
+		return FALSE;
+	}
+
+	getChild<LLUICtrl>("name_form")->setCommitCallback(boost::bind(&LLFloaterBvhPreview::onCommitName, this));
+
+	childSetAction("ok_btn", onBtnOK, this);
+	setDefaultBtn();
+
+	mPreviewRect.set(PREVIEW_HPAD, 
+		PREVIEW_TEXTURE_HEIGHT,
+		getRect().getWidth() - PREVIEW_HPAD, 
+		PREVIEW_HPAD + PREF_BUTTON_HEIGHT + PREVIEW_HPAD);
+	mPreviewImageRect.set(0.f, 1.f, 1.f, 0.f);
+
+	mPlayButton = getChild<LLButton>( "play_btn");
+	mPlayButton->setClickedCallback(boost::bind(&LLFloaterBvhPreview::onBtnPlay, this));
+	mPlayButton->setVisible(true);
+
+	mPauseButton = getChild<LLButton>( "pause_btn");
+	mPauseButton->setClickedCallback(boost::bind(&LLFloaterBvhPreview::onBtnPause, this));
+	mPauseButton->setVisible(false);
+	
+	mStopButton = getChild<LLButton>( "stop_btn");
+	mStopButton->setClickedCallback(boost::bind(&LLFloaterBvhPreview::onBtnStop, this));
+
+	getChildView("bad_animation_text")->setVisible(FALSE);
+
+	std::string exten = gDirUtilp->getExtension(mFilename);
+	if (exten == "bvh")
+	{
+		// loading a bvh file
+
+		// now load bvh file
+		S32 file_size;
+		
+		LLAPRFile infile ;
+		infile.open(mFilenameAndPath, LL_APR_RB, NULL, &file_size);
+		
+		if (!infile.getFileHandle())
+		{
+			llwarns << "Can't open BVH file:" << mFilename << llendl;	
+		}
+		else
+		{
+			char*	file_buffer;
+
+			file_buffer = new char[file_size + 1];
+
+			if (file_size == infile.read(file_buffer, file_size))
+			{
+				file_buffer[file_size] = '\0';
+				llinfos << "Loading BVH file " << mFilename << llendl;
+				ELoadStatus load_status = E_ST_OK;
+				S32 line_number = 0; 
+				loaderp = new LLBVHLoader(file_buffer, load_status, line_number);
+				std::string status = getString(STATUS[load_status]);
+				
+				if(load_status == E_ST_NO_XLT_FILE)
+				{
+					llwarns << "NOTE: No translation table found." << llendl;
+				}
+				else
+				{
+					llwarns << "ERROR: [line: " << line_number << "] " << status << llendl;
+				}
+			}
+
+			infile.close() ;
+			delete[] file_buffer;
+		}
+	}
+
+	if (loaderp && loaderp->isInitialized() && loaderp->getDuration() <= MAX_ANIM_DURATION)
+	{
+		// generate unique id for this motion
+		mTransactionID.generate();
+		mMotionID = mTransactionID.makeAssetID(gAgent.getSecureSessionID());
+
+		mAnimPreview = new LLPreviewAnimation(256, 256);
+
+		// motion will be returned, but it will be in a load-pending state, as this is a new motion
+		// this motion will not request an asset transfer until next update, so we have a chance to 
+		// load the keyframe data locally
+		motionp = (LLKeyframeMotion*)mAnimPreview->getDummyAvatar()->createMotion(mMotionID);
+
+		// create data buffer for keyframe initialization
+		S32 buffer_size = loaderp->getOutputSize();
+		U8* buffer = new U8[buffer_size];
+
+		LLDataPackerBinaryBuffer dp(buffer, buffer_size);
+
+		// pass animation data through memory buffer
+		loaderp->serialize(dp);
+		dp.reset();
+		BOOL success = motionp && motionp->deserialize(dp);
+
+		delete []buffer;
+
+		if (success)
+		{
+			setAnimCallbacks() ;
+			
+			const LLBBoxLocal &pelvis_bbox = motionp->getPelvisBBox();
+
+			LLVector3 temp = pelvis_bbox.getCenter();
+			// only consider XY?
+			//temp.mV[VZ] = 0.f;
+			F32 pelvis_offset = temp.magVec();
+
+			temp = pelvis_bbox.getExtent();
+			//temp.mV[VZ] = 0.f;
+			F32 pelvis_max_displacement = pelvis_offset + (temp.magVec() * 0.5f) + 1.f;
+			
+			F32 camera_zoom = LLViewerCamera::getInstance()->getDefaultFOV() / (2.f * atan(pelvis_max_displacement / PREVIEW_CAMERA_DISTANCE));
+		
+			mAnimPreview->setZoom(camera_zoom);
+
+			motionp->setName(getChild<LLUICtrl>("name_form")->getValue().asString());
+			mAnimPreview->getDummyAvatar()->startMotion(mMotionID);
+			
+			getChild<LLSlider>("playback_slider")->setMinValue(0.0);
+			getChild<LLSlider>("playback_slider")->setMaxValue(1.0);
+
+			getChild<LLUICtrl>("loop_check")->setValue(LLSD(motionp->getLoop()));
+			getChild<LLUICtrl>("loop_in_point")->setValue(LLSD(motionp->getLoopIn() / motionp->getDuration() * 100.f));
+			getChild<LLUICtrl>("loop_out_point")->setValue(LLSD(motionp->getLoopOut() / motionp->getDuration() * 100.f));
+			getChild<LLUICtrl>("priority")->setValue(LLSD((F32)motionp->getPriority()));
+			getChild<LLUICtrl>("hand_pose_combo")->setValue(LLHandMotion::getHandPoseName(motionp->getHandPose()));
+			getChild<LLUICtrl>("ease_in_time")->setValue(LLSD(motionp->getEaseInDuration()));
+			getChild<LLUICtrl>("ease_out_time")->setValue(LLSD(motionp->getEaseOutDuration()));
+			setEnabled(TRUE);
+			std::string seconds_string;
+			seconds_string = llformat(" - %.2f seconds", motionp->getDuration());
+
+			setTitle(mFilename + std::string(seconds_string));
+		}
+		else
+		{
+			mAnimPreview = NULL;
+			mMotionID.setNull();
+			getChild<LLUICtrl>("bad_animation_text")->setValue(getString("failed_to_initialize"));
+		}
+	}
+	else
+	{
+		if ( loaderp )
+		{
+			if (loaderp->getDuration() > MAX_ANIM_DURATION)
+			{
+				LLUIString out_str = getString("anim_too_long");
+				out_str.setArg("[LENGTH]", llformat("%.1f", loaderp->getDuration()));
+				out_str.setArg("[MAX_LENGTH]", llformat("%.1f", MAX_ANIM_DURATION));
+				getChild<LLUICtrl>("bad_animation_text")->setValue(out_str.getString());
+			}
+			else
+			{
+				LLUIString out_str = getString("failed_file_read");
+				out_str.setArg("[STATUS]", getString(STATUS[loaderp->getStatus()])); 
+				getChild<LLUICtrl>("bad_animation_text")->setValue(out_str.getString());
+			}
+		}
+
+		//setEnabled(FALSE);
+		mMotionID.setNull();
+		mAnimPreview = NULL;
+	}
+
+	refresh();
+
+	delete loaderp;
+
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// LLFloaterBvhPreview()
+//-----------------------------------------------------------------------------
+LLFloaterBvhPreview::~LLFloaterBvhPreview()
+{
+	mAnimPreview = NULL;
+
+	setEnabled(FALSE);
+}
+
+//-----------------------------------------------------------------------------
+// draw()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::draw()
+{
+	LLFloater::draw();
+	LLRect r = getRect();
+
+	refresh();
+
+	if (mMotionID.notNull() && mAnimPreview)
+	{
+		gGL.color3f(1.f, 1.f, 1.f);
+
+		gGL.getTexUnit(0)->bind(mAnimPreview);
+
+		gGL.begin( LLRender::QUADS );
+		{
+			gGL.texCoord2f(0.f, 1.f);
+			gGL.vertex2i(PREVIEW_HPAD, PREVIEW_TEXTURE_HEIGHT);
+			gGL.texCoord2f(0.f, 0.f);
+			gGL.vertex2i(PREVIEW_HPAD, PREVIEW_HPAD + PREF_BUTTON_HEIGHT + PREVIEW_HPAD);
+			gGL.texCoord2f(1.f, 0.f);
+			gGL.vertex2i(r.getWidth() - PREVIEW_HPAD, PREVIEW_HPAD + PREF_BUTTON_HEIGHT + PREVIEW_HPAD);
+			gGL.texCoord2f(1.f, 1.f);
+			gGL.vertex2i(r.getWidth() - PREVIEW_HPAD, PREVIEW_TEXTURE_HEIGHT);
+		}
+		gGL.end();
+
+		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+
+		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+		if (!avatarp->areAnimationsPaused())
+		{
+			mAnimPreview->requestUpdate();
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// resetMotion()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::resetMotion()
+{
+	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+	BOOL paused = avatarp->areAnimationsPaused();
+
+	// *TODO: Fix awful casting hack
+	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
+	
+	// Set emotion
+	std::string emote = getChild<LLUICtrl>("emote_combo")->getValue().asString();
+	motionp->setEmote(mIDList[emote]);
+	
+	LLUUID base_id = mIDList[getChild<LLUICtrl>("preview_base_anim")->getValue().asString()];
+	avatarp->deactivateAllMotions();
+	avatarp->startMotion(mMotionID, 0.0f);
+	avatarp->startMotion(base_id, BASE_ANIM_TIME_OFFSET);
+	getChild<LLUICtrl>("playback_slider")->setValue(0.0f);
+
+	// Set pose
+	std::string handpose = getChild<LLUICtrl>("hand_pose_combo")->getValue().asString();
+	avatarp->startMotion( ANIM_AGENT_HAND_MOTION, 0.0f );
+	motionp->setHandPose(LLHandMotion::getHandPose(handpose));
+
+	if (paused)
+	{
+		mPauseRequest = avatarp->requestPause();
+	}
+	else
+	{
+		mPauseRequest = NULL;	
+	}
+}
+
+//-----------------------------------------------------------------------------
+// handleMouseDown()
+//-----------------------------------------------------------------------------
+BOOL LLFloaterBvhPreview::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+	if (mPreviewRect.pointInRect(x, y))
+	{
+		bringToFront( x, y );
+		gFocusMgr.setMouseCapture(this);
+		gViewerWindow->hideCursor();
+		mLastMouseX = x;
+		mLastMouseY = y;
+		return TRUE;
+	}
+
+	return LLFloater::handleMouseDown(x, y, mask);
+}
+
+//-----------------------------------------------------------------------------
+// handleMouseUp()
+//-----------------------------------------------------------------------------
+BOOL LLFloaterBvhPreview::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+	gFocusMgr.setMouseCapture(FALSE);
+	gViewerWindow->showCursor();
+	return LLFloater::handleMouseUp(x, y, mask);
+}
+
+//-----------------------------------------------------------------------------
+// handleHover()
+//-----------------------------------------------------------------------------
+BOOL LLFloaterBvhPreview::handleHover(S32 x, S32 y, MASK mask)
+{
+	MASK local_mask = mask & ~MASK_ALT;
+
+	if (mAnimPreview && hasMouseCapture())
+	{
+		if (local_mask == MASK_PAN)
+		{
+			// pan here
+			mAnimPreview->pan((F32)(x - mLastMouseX) * -0.005f, (F32)(y - mLastMouseY) * -0.005f);
+		}
+		else if (local_mask == MASK_ORBIT)
+		{
+			F32 yaw_radians = (F32)(x - mLastMouseX) * -0.01f;
+			F32 pitch_radians = (F32)(y - mLastMouseY) * 0.02f;
+			
+			mAnimPreview->rotate(yaw_radians, pitch_radians);
+		}
+		else 
+		{
+			F32 yaw_radians = (F32)(x - mLastMouseX) * -0.01f;
+			F32 zoom_amt = (F32)(y - mLastMouseY) * 0.02f;
+			
+			mAnimPreview->rotate(yaw_radians, 0.f);
+			mAnimPreview->zoom(zoom_amt);
+		}
+
+		mAnimPreview->requestUpdate();
+
+		LLUI::setMousePositionLocal(this, mLastMouseX, mLastMouseY);
+	}
+
+	if (!mPreviewRect.pointInRect(x, y) || !mAnimPreview)
+	{
+		return LLFloater::handleHover(x, y, mask);
+	}
+	else if (local_mask == MASK_ORBIT)
+	{
+		gViewerWindow->setCursor(UI_CURSOR_TOOLCAMERA);
+	}
+	else if (local_mask == MASK_PAN)
+	{
+		gViewerWindow->setCursor(UI_CURSOR_TOOLPAN);
+	}
+	else
+	{
+		gViewerWindow->setCursor(UI_CURSOR_TOOLZOOMIN);
+	}
+
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// handleScrollWheel()
+//-----------------------------------------------------------------------------
+BOOL LLFloaterBvhPreview::handleScrollWheel(S32 x, S32 y, S32 clicks)
+{
+	mAnimPreview->zoom((F32)clicks * -0.2f);
+	mAnimPreview->requestUpdate();
+
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// onMouseCaptureLost()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onMouseCaptureLost()
+{
+	gViewerWindow->showCursor();
+}
+
+//-----------------------------------------------------------------------------
+// onBtnPlay()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onBtnPlay()
+{
+	if (!getEnabled())
+		return;
+
+	if (mMotionID.notNull() && mAnimPreview)
+	{
+		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+		
+		if (!avatarp->isMotionActive(mMotionID))
+		{
+			resetMotion();
+			mPauseRequest = NULL;
+		}
+		else if (avatarp->areAnimationsPaused())
+		{			
+			mPauseRequest = NULL;
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// onBtnPause()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onBtnPause()
+{
+	if (!getEnabled())
+		return;
+	
+	if (mMotionID.notNull() && mAnimPreview)
+	{
+		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+
+		if (avatarp->isMotionActive(mMotionID))
+		{
+			if (!avatarp->areAnimationsPaused())
+			{
+				mPauseRequest = avatarp->requestPause();
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// onBtnStop()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onBtnStop()
+{
+	if (!getEnabled())
+		return;
+
+	if (mMotionID.notNull() && mAnimPreview)
+	{
+		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+		resetMotion();
+		mPauseRequest = avatarp->requestPause();
+	}
+}
+
+//-----------------------------------------------------------------------------
+// onSliderMove()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onSliderMove()
+{
+	if (!getEnabled())
+		return;
+
+	if (mAnimPreview)
+	{
+		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+		F32 slider_value = (F32)getChild<LLUICtrl>("playback_slider")->getValue().asReal();
+		LLUUID base_id = mIDList[getChild<LLUICtrl>("preview_base_anim")->getValue().asString()];
+		LLMotion* motionp = avatarp->findMotion(mMotionID);
+		F32 duration = motionp->getDuration();// + motionp->getEaseOutDuration();
+		F32 delta_time = duration * slider_value;
+		avatarp->deactivateAllMotions();
+		avatarp->startMotion(base_id, delta_time + BASE_ANIM_TIME_OFFSET);
+		avatarp->startMotion(mMotionID, delta_time);
+		mPauseRequest = avatarp->requestPause();
+		refresh();
+	}
+
+}
+
+//-----------------------------------------------------------------------------
+// onCommitBaseAnim()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onCommitBaseAnim()
+{
+	if (!getEnabled())
+		return;
+
+	if (mAnimPreview)
+	{
+		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+
+		BOOL paused = avatarp->areAnimationsPaused();
+
+		// stop all other possible base motions
+		avatarp->stopMotion(mIDList["Standing"], TRUE);
+		avatarp->stopMotion(mIDList["Walking"], TRUE);
+		avatarp->stopMotion(mIDList["Sitting"], TRUE);
+		avatarp->stopMotion(mIDList["Flying"], TRUE);
+
+		resetMotion();
+
+		if (!paused)
+		{
+			mPauseRequest = NULL;
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// onCommitLoop()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onCommitLoop()
+{
+	if (!getEnabled())
+		return;
+	
+	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
+
+	if (motionp)
+	{
+		motionp->setLoop(getChild<LLUICtrl>("loop_check")->getValue().asBoolean());
+		motionp->setLoopIn((F32)getChild<LLUICtrl>("loop_in_point")->getValue().asReal() * 0.01f * motionp->getDuration());
+		motionp->setLoopOut((F32)getChild<LLUICtrl>("loop_out_point")->getValue().asReal() * 0.01f * motionp->getDuration());
+	}
+}
+
+//-----------------------------------------------------------------------------
+// onCommitLoopIn()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onCommitLoopIn()
+{
+	if (!getEnabled())
+		return;
+
+	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
+
+	if (motionp)
+	{
+		motionp->setLoopIn((F32)getChild<LLUICtrl>("loop_in_point")->getValue().asReal() / 100.f);
+		resetMotion();
+		getChild<LLUICtrl>("loop_check")->setValue(LLSD(TRUE));
+		onCommitLoop();
+	}
+}
+
+//-----------------------------------------------------------------------------
+// onCommitLoopOut()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onCommitLoopOut()
+{
+	if (!getEnabled())
+		return;
+
+	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
+
+	if (motionp)
+	{
+		motionp->setLoopOut((F32)getChild<LLUICtrl>("loop_out_point")->getValue().asReal() * 0.01f * motionp->getDuration());
+		resetMotion();
+		getChild<LLUICtrl>("loop_check")->setValue(LLSD(TRUE));
+		onCommitLoop();
+	}
+}
+
+//-----------------------------------------------------------------------------
+// onCommitName()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onCommitName()
+{
+	if (!getEnabled())
+		return;
+
+	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
+
+	if (motionp)
+	{
+		motionp->setName(getChild<LLUICtrl>("name_form")->getValue().asString());
+	}
+
+	doCommit();
+}
+
+//-----------------------------------------------------------------------------
+// onCommitHandPose()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onCommitHandPose()
+{
+	if (!getEnabled())
+		return;
+
+	resetMotion(); // sets hand pose
+}
+
+//-----------------------------------------------------------------------------
+// onCommitEmote()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onCommitEmote()
+{
+	if (!getEnabled())
+		return;
+
+	resetMotion(); // ssts emote
+}
+
+//-----------------------------------------------------------------------------
+// onCommitPriority()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onCommitPriority()
+{
+	if (!getEnabled())
+		return;
+
+	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
+
+	motionp->setPriority(llfloor((F32)getChild<LLUICtrl>("priority")->getValue().asReal()));
+}
+
+//-----------------------------------------------------------------------------
+// onCommitEaseIn()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onCommitEaseIn()
+{
+	if (!getEnabled())
+		return;
+
+	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
+
+	motionp->setEaseIn((F32)getChild<LLUICtrl>("ease_in_time")->getValue().asReal());
+	resetMotion();
+}
+
+//-----------------------------------------------------------------------------
+// onCommitEaseOut()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onCommitEaseOut()
+{
+	if (!getEnabled())
+		return;
+
+	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
+
+	motionp->setEaseOut((F32)getChild<LLUICtrl>("ease_out_time")->getValue().asReal());
+	resetMotion();
+}
+
+//-----------------------------------------------------------------------------
+// validateEaseIn()
+//-----------------------------------------------------------------------------
+bool LLFloaterBvhPreview::validateEaseIn(const LLSD& data)
+{
+	if (!getEnabled())
+		return false;
+
+	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
+	
+	if (!motionp->getLoop())
+	{
+		F32 new_ease_in = llclamp((F32)getChild<LLUICtrl>("ease_in_time")->getValue().asReal(), 0.f, motionp->getDuration() - motionp->getEaseOutDuration());
+		getChild<LLUICtrl>("ease_in_time")->setValue(LLSD(new_ease_in));
+	}
+	
+	return true;
+}
+
+//-----------------------------------------------------------------------------
+// validateEaseOut()
+//-----------------------------------------------------------------------------
+bool LLFloaterBvhPreview::validateEaseOut(const LLSD& data)
+{
+	if (!getEnabled())
+		return false;
+
+	LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+	LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
+	
+	if (!motionp->getLoop())
+	{
+		F32 new_ease_out = llclamp((F32)getChild<LLUICtrl>("ease_out_time")->getValue().asReal(), 0.f, motionp->getDuration() - motionp->getEaseInDuration());
+		getChild<LLUICtrl>("ease_out_time")->setValue(LLSD(new_ease_out));
+	}
+
+	return true;
+}
+
+//-----------------------------------------------------------------------------
+// validateLoopIn()
+//-----------------------------------------------------------------------------
+bool LLFloaterBvhPreview::validateLoopIn(const LLSD& data)
+{
+	if (!getEnabled())
+		return false;
+
+	F32 loop_in_value = (F32)getChild<LLUICtrl>("loop_in_point")->getValue().asReal();
+	F32 loop_out_value = (F32)getChild<LLUICtrl>("loop_out_point")->getValue().asReal();
+
+	if (loop_in_value < 0.f)
+	{
+		loop_in_value = 0.f;
+	}
+	else if (loop_in_value > 100.f)
+	{
+		loop_in_value = 100.f;
+	}
+	else if (loop_in_value > loop_out_value)
+	{
+		loop_in_value = loop_out_value;
+	}
+
+	getChild<LLUICtrl>("loop_in_point")->setValue(LLSD(loop_in_value));
+	return true;
+}
+
+//-----------------------------------------------------------------------------
+// validateLoopOut()
+//-----------------------------------------------------------------------------
+bool LLFloaterBvhPreview::validateLoopOut(const LLSD& data)
+{
+	if (!getEnabled())
+		return false;
+
+	F32 loop_out_value = (F32)getChild<LLUICtrl>("loop_out_point")->getValue().asReal();
+	F32 loop_in_value = (F32)getChild<LLUICtrl>("loop_in_point")->getValue().asReal();
+
+	if (loop_out_value < 0.f)
+	{
+		loop_out_value = 0.f;
+	}
+	else if (loop_out_value > 100.f)
+	{
+		loop_out_value = 100.f;
+	}
+	else if (loop_out_value < loop_in_value)
+	{
+		loop_out_value = loop_in_value;
+	}
+
+	getChild<LLUICtrl>("loop_out_point")->setValue(LLSD(loop_out_value));
+	return true;
+}
+
+
+//-----------------------------------------------------------------------------
+// refresh()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::refresh()
+{
+	// Are we showing the play button (default) or the pause button?
+	bool show_play = true;
+	if (!mAnimPreview)
+	{
+		getChildView("bad_animation_text")->setVisible(TRUE);
+		// play button visible but disabled
+		mPlayButton->setEnabled(FALSE);
+		mStopButton->setEnabled(FALSE);
+		getChildView("ok_btn")->setEnabled(FALSE);
+	}
+	else
+	{
+		getChildView("bad_animation_text")->setVisible(FALSE);
+		// re-enabled in case previous animation was bad
+		mPlayButton->setEnabled(TRUE);
+		mStopButton->setEnabled(TRUE);
+		LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+		if (avatarp->isMotionActive(mMotionID))
+		{
+			mStopButton->setEnabled(TRUE);
+			LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
+			if (!avatarp->areAnimationsPaused())
+			{
+				// animation is playing
+				if (motionp)
+				{
+					F32 fraction_complete = motionp->getLastUpdateTime() / motionp->getDuration();
+					getChild<LLUICtrl>("playback_slider")->setValue(fraction_complete);
+				}
+				show_play = false;
+			}
+		}
+		else
+		{
+			// Motion just finished playing
+			mPauseRequest = avatarp->requestPause();
+		}
+		getChildView("ok_btn")->setEnabled(TRUE);
+		mAnimPreview->requestUpdate();
+	}
+	mPlayButton->setVisible(show_play);
+	mPauseButton->setVisible(!show_play);
+}
+
+//-----------------------------------------------------------------------------
+// onBtnOK()
+//-----------------------------------------------------------------------------
+void LLFloaterBvhPreview::onBtnOK(void* userdata)
+{
+	LLFloaterBvhPreview* floaterp = (LLFloaterBvhPreview*)userdata;
+	if (!floaterp->getEnabled()) return;
+
+	if (floaterp->mAnimPreview)
+	{
+		LLKeyframeMotion* motionp = (LLKeyframeMotion*)floaterp->mAnimPreview->getDummyAvatar()->findMotion(floaterp->mMotionID);
+
+		S32 file_size = motionp->getFileSize();
+		U8* buffer = new U8[file_size];
+
+		LLDataPackerBinaryBuffer dp(buffer, file_size);
+		if (motionp->serialize(dp))
+		{
+			LLVFile file(gVFS, motionp->getID(), LLAssetType::AT_ANIMATION, LLVFile::APPEND);
+
+			S32 size = dp.getCurrentSize();
+			file.setMaxSize(size);
+			if (file.write((U8*)buffer, size))
+			{
+				std::string name = floaterp->getChild<LLUICtrl>("name_form")->getValue().asString();
+				std::string desc = floaterp->getChild<LLUICtrl>("description_form")->getValue().asString();
+				LLAssetStorage::LLStoreAssetCallback callback = NULL;
+				S32 expected_upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
+				void *userdata = NULL;
+				upload_new_resource(floaterp->mTransactionID, // tid
+						    LLAssetType::AT_ANIMATION,
+						    name,
+						    desc,
+						    0,
+						    LLFolderType::FT_NONE,
+						    LLInventoryType::IT_ANIMATION,
+						    LLFloaterPerms::getNextOwnerPerms(), LLFloaterPerms::getGroupPerms(), LLFloaterPerms::getEveryonePerms(),
+						    name,
+						    callback, expected_upload_cost, userdata);
+
+			}
+			else
+			{
+				llwarns << "Failure writing animation data." << llendl;
+				LLNotificationsUtil::add("WriteAnimationFail");
+			}
+		}
+
+		delete [] buffer;
+		// clear out cache for motion data
+		floaterp->mAnimPreview->getDummyAvatar()->removeMotion(floaterp->mMotionID);
+		LLKeyframeDataCache::removeKeyframeData(floaterp->mMotionID);
+	}
+
+	floaterp->closeFloater(false);
+}
+
+//-----------------------------------------------------------------------------
+// LLPreviewAnimation
+//-----------------------------------------------------------------------------
+LLPreviewAnimation::LLPreviewAnimation(S32 width, S32 height) : LLViewerDynamicTexture(width, height, 3, ORDER_MIDDLE, FALSE)
+{
+	mNeedsUpdate = TRUE;
+	mCameraDistance = PREVIEW_CAMERA_DISTANCE;
+	mCameraYaw = 0.f;
+	mCameraPitch = 0.f;
+	mCameraZoom = 1.f;
+
+	mDummyAvatar = (LLVOAvatar*)gObjectList.createObjectViewer(LL_PCODE_LEGACY_AVATAR, gAgent.getRegion());
+	mDummyAvatar->createDrawable(&gPipeline);
+	mDummyAvatar->mIsDummy = TRUE;
+	mDummyAvatar->mSpecialRenderMode = 1;
+	mDummyAvatar->setPositionAgent(LLVector3::zero);
+	mDummyAvatar->slamPosition();
+	mDummyAvatar->updateJointLODs();
+	mDummyAvatar->updateGeometry(mDummyAvatar->mDrawable);
+	mDummyAvatar->startMotion(ANIM_AGENT_STAND, BASE_ANIM_TIME_OFFSET);
+	mDummyAvatar->hideSkirt();
+
+	// stop extraneous animations
+	mDummyAvatar->stopMotion( ANIM_AGENT_HEAD_ROT, TRUE );
+	mDummyAvatar->stopMotion( ANIM_AGENT_EYE, TRUE );
+	mDummyAvatar->stopMotion( ANIM_AGENT_BODY_NOISE, TRUE );
+	mDummyAvatar->stopMotion( ANIM_AGENT_BREATHE_ROT, TRUE );
+}
+
+//-----------------------------------------------------------------------------
+// LLPreviewAnimation()
+//-----------------------------------------------------------------------------
+LLPreviewAnimation::~LLPreviewAnimation()
+{
+	mDummyAvatar->markDead();
+}
+
+//virtual
+S8 LLPreviewAnimation::getType() const
+{
+	return LLViewerDynamicTexture::LL_PREVIEW_ANIMATION ;
+}
+
+//-----------------------------------------------------------------------------
+// update()
+//-----------------------------------------------------------------------------
+BOOL	LLPreviewAnimation::render()
+{
+	mNeedsUpdate = FALSE;
+	LLVOAvatar* avatarp = mDummyAvatar;
+	
+	gGL.matrixMode(LLRender::MM_PROJECTION);
+	gGL.pushMatrix();
+	gGL.loadIdentity();
+	gGL.ortho(0.0f, mFullWidth, 0.0f, mFullHeight, -1.0f, 1.0f);
+
+	gGL.matrixMode(LLRender::MM_MODELVIEW);
+	gGL.pushMatrix();
+	gGL.loadIdentity();
+
+	if (LLGLSLShader::sNoFixedFunction)
+	{
+		gUIProgram.bind();
+	}
+
+	LLGLSUIDefault def;
+	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+	gGL.color4f(0.15f, 0.2f, 0.3f, 1.f);
+
+	gl_rect_2d_simple( mFullWidth, mFullHeight );
+
+	gGL.matrixMode(LLRender::MM_PROJECTION);
+	gGL.popMatrix();
+
+	gGL.matrixMode(LLRender::MM_MODELVIEW);
+	gGL.popMatrix();
+
+	gGL.flush();
+
+	LLVector3 target_pos = avatarp->mRoot.getWorldPosition();
+
+	LLQuaternion camera_rot = LLQuaternion(mCameraPitch, LLVector3::y_axis) * 
+		LLQuaternion(mCameraYaw, LLVector3::z_axis);
+
+	LLQuaternion av_rot = avatarp->mRoot.getWorldRotation() * camera_rot;
+	LLViewerCamera::getInstance()->setOriginAndLookAt(
+		target_pos + ((LLVector3(mCameraDistance, 0.f, 0.f) + mCameraOffset) * av_rot),		// camera
+		LLVector3::z_axis,																	// up
+		target_pos + (mCameraOffset  * av_rot) );											// point of interest
+
+	LLViewerCamera::getInstance()->setView(LLViewerCamera::getInstance()->getDefaultFOV() / mCameraZoom);
+	LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mFullWidth, mFullHeight, FALSE);
+
+	mCameraRelPos = LLViewerCamera::getInstance()->getOrigin() - avatarp->mHeadp->getWorldPosition();
+
+	//avatarp->setAnimationData("LookAtPoint", (void *)&mCameraRelPos);
+
+	//SJB: Animation is updated in LLVOAvatar::updateCharacter
+	
+	if (avatarp->mDrawable.notNull())
+	{
+		avatarp->updateLOD();
+		
+		LLVertexBuffer::unbind();
+		LLGLDepthTest gls_depth(GL_TRUE);
+
+		LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)avatarp->mDrawable->getFace(0)->getPool();
+		avatarp->dirtyMesh();
+		avatarPoolp->renderAvatars(avatarp);  // renders only one avatar
+	}
+
+	gGL.color4f(1,1,1,1);
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// requestUpdate()
+//-----------------------------------------------------------------------------
+void LLPreviewAnimation::requestUpdate()
+{ 
+	mNeedsUpdate = TRUE; 
+}
+
+//-----------------------------------------------------------------------------
+// rotate()
+//-----------------------------------------------------------------------------
+void LLPreviewAnimation::rotate(F32 yaw_radians, F32 pitch_radians)
+{
+	mCameraYaw = mCameraYaw + yaw_radians;
+
+	mCameraPitch = llclamp(mCameraPitch + pitch_radians, F_PI_BY_TWO * -0.8f, F_PI_BY_TWO * 0.8f);
+}
+
+//-----------------------------------------------------------------------------
+// zoom()
+//-----------------------------------------------------------------------------
+void LLPreviewAnimation::zoom(F32 zoom_delta)
+{
+	setZoom(mCameraZoom + zoom_delta);
+}
+
+//-----------------------------------------------------------------------------
+// setZoom()
+//-----------------------------------------------------------------------------
+void LLPreviewAnimation::setZoom(F32 zoom_amt)
+{
+	mCameraZoom	= llclamp(zoom_amt, MIN_CAMERA_ZOOM, MAX_CAMERA_ZOOM);
+}
+
+//-----------------------------------------------------------------------------
+// pan()
+//-----------------------------------------------------------------------------
+void LLPreviewAnimation::pan(F32 right, F32 up)
+{
+	mCameraOffset.mV[VY] = llclamp(mCameraOffset.mV[VY] + right * mCameraDistance / mCameraZoom, -1.f, 1.f);
+	mCameraOffset.mV[VZ] = llclamp(mCameraOffset.mV[VZ] + up * mCameraDistance / mCameraZoom, -1.f, 1.f);
+}
+
+
+
diff --git a/indra/newview/llfloaterbvhpreview.h b/indra/newview/llfloaterbvhpreview.h
new file mode 100644
index 0000000000..bae98c95d9
--- /dev/null
+++ b/indra/newview/llfloaterbvhpreview.h
@@ -0,0 +1,131 @@
+/** 
+ * @file llfloaterbvhpreview.h
+ * @brief LLFloaterBvhPreview class definition
+ *
+ * $LicenseInfo:firstyear=2004&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATERBVHPREVIEW_H
+#define LL_LLFLOATERBVHPREVIEW_H
+
+#include "llassettype.h"
+#include "llfloaternamedesc.h"
+#include "lldynamictexture.h"
+#include "llcharacter.h"
+#include "llquaternion.h"
+
+class LLVOAvatar;
+class LLViewerJointMesh;
+
+class LLPreviewAnimation : public LLViewerDynamicTexture
+{
+protected:
+	virtual ~LLPreviewAnimation();
+
+public:
+	LLPreviewAnimation(S32 width, S32 height);	
+
+	/*virtual*/ S8 getType() const ;
+
+	BOOL	render();
+	void	requestUpdate();
+	void	rotate(F32 yaw_radians, F32 pitch_radians);
+	void	zoom(F32 zoom_delta);
+	void	setZoom(F32 zoom_amt);
+	void	pan(F32 right, F32 up);
+	virtual BOOL needsUpdate() { return mNeedsUpdate; }
+
+	LLVOAvatar* getDummyAvatar() { return mDummyAvatar; }
+
+protected:
+	BOOL				mNeedsUpdate;
+	F32					mCameraDistance;
+	F32					mCameraYaw;
+	F32					mCameraPitch;
+	F32					mCameraZoom;
+	LLVector3			mCameraOffset;
+	LLVector3			mCameraRelPos;
+	LLPointer<LLVOAvatar>			mDummyAvatar;
+};
+
+class LLFloaterBvhPreview : public LLFloaterNameDesc
+{
+public:
+	LLFloaterBvhPreview(const std::string& filename);
+	virtual ~LLFloaterBvhPreview();
+	
+	BOOL postBuild();
+
+	BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+	BOOL handleMouseUp(S32 x, S32 y, MASK mask);
+	BOOL handleHover(S32 x, S32 y, MASK mask);
+	BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); 
+	void onMouseCaptureLost();
+
+	void refresh();
+
+	void onBtnPlay();
+	void onBtnPause();	
+	void onBtnStop();
+	void onSliderMove();
+	void onCommitBaseAnim();
+	void onCommitLoop();
+	void onCommitLoopIn();
+	void onCommitLoopOut();
+	bool validateLoopIn(const LLSD& data);
+	bool validateLoopOut(const LLSD& data);
+	void onCommitName();
+	void onCommitHandPose();
+	void onCommitEmote();
+	void onCommitPriority();
+	void onCommitEaseIn();
+	void onCommitEaseOut();
+	bool validateEaseIn(const LLSD& data);
+	bool validateEaseOut(const LLSD& data);
+	static void	onBtnOK(void*);
+	static void onSaveComplete(const LLUUID& asset_uuid,
+									   LLAssetType::EType type,
+									   void* user_data,
+									   S32 status, LLExtStat ext_status);
+private:
+	void setAnimCallbacks() ;
+	
+protected:
+	void			draw();
+	void			resetMotion();
+
+	LLPointer< LLPreviewAnimation > mAnimPreview;
+	S32					mLastMouseX;
+	S32					mLastMouseY;
+	LLButton*			mPlayButton;
+	LLButton*			mPauseButton;	
+	LLButton*			mStopButton;
+	LLRect				mPreviewRect;
+	LLRectf				mPreviewImageRect;
+	LLAssetID			mMotionID;
+	LLTransactionID		mTransactionID;
+	LLAnimPauseRequest	mPauseRequest;
+
+	std::map<std::string, LLUUID>	mIDList;
+};
+
+#endif  // LL_LLFLOATERBVHPREVIEW_H
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp
index 66f0fc3cd7..27b1c3b9cd 100644
--- a/indra/newview/llfloaternamedesc.cpp
+++ b/indra/newview/llfloaternamedesc.cpp
@@ -206,6 +206,25 @@ BOOL LLFloaterSoundPreview::postBuild()
 }
 
 
+//-----------------------------------------------------------------------------
+// LLFloaterAnimPreview()
+//-----------------------------------------------------------------------------
+
+LLFloaterAnimPreview::LLFloaterAnimPreview(const LLSD& filename )
+	: LLFloaterNameDesc(filename)
+{
+}
+
+BOOL LLFloaterAnimPreview::postBuild()
+{
+	if (!LLFloaterNameDesc::postBuild())
+	{
+		return FALSE;
+	}
+	getChild<LLUICtrl>("ok_btn")->setCommitCallback(boost::bind(&LLFloaterNameDesc::onBtnOK, this));
+	return TRUE;
+}
+
 //-----------------------------------------------------------------------------
 // LLFloaterScriptPreview()
 //-----------------------------------------------------------------------------
diff --git a/indra/newview/llfloaternamedesc.h b/indra/newview/llfloaternamedesc.h
index 69bbccaf80..41643681ac 100644
--- a/indra/newview/llfloaternamedesc.h
+++ b/indra/newview/llfloaternamedesc.h
@@ -64,6 +64,13 @@ public:
 	virtual BOOL postBuild();
 };
 
+class LLFloaterAnimPreview : public LLFloaterNameDesc
+{
+public:
+	LLFloaterAnimPreview(const LLSD& filename );
+	virtual BOOL postBuild();
+};
+
 class LLFloaterScriptPreview : public LLFloaterNameDesc
 {
 public:
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index cca8f10515..c150a4d22d 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -35,7 +35,6 @@
 #include "llcallfloater.h"
 #include "llfasttimerview.h"
 #include "llfloaterabout.h"
-#include "llfloateranimpreview.h"
 #include "llfloaterauction.h"
 #include "llfloateravatar.h"
 #include "llfloateravatarpicker.h"
@@ -49,6 +48,7 @@
 #include "llfloaterbuyland.h"
 #include "llfloaterbulkpermission.h"
 #include "llfloaterbump.h"
+#include "llfloaterbvhpreview.h"
 #include "llfloatercamera.h"
 #include "llfloaterdeleteenvpreset.h"
 #include "llfloaterdisplayname.h"
@@ -292,7 +292,8 @@ void LLViewerFloaterReg::registerFloaters()
 
 	
 	LLFloaterUIPreviewUtil::registerFloater();
-	LLFloaterReg::add("upload_anim", "floater_animation_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAnimPreview>, "upload");
+	LLFloaterReg::add("upload_anim_bvh", "floater_animation_bvh_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBvhPreview>, "upload");
+	LLFloaterReg::add("upload_anim_anim", "floater_animation_anim_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAnimPreview>, "upload");
 	LLFloaterReg::add("upload_image", "floater_image_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterImagePreview>, "upload");
 	LLFloaterReg::add("upload_model", "floater_model_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterModelPreview>, "upload");
 	LLFloaterReg::add("upload_model_wizard", "floater_model_wizard.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterModelWizard>);
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 7e830e14bf..95e3bc9b89 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -183,7 +183,7 @@ void LLFilePickerThread::clearDead()
 #if LL_WINDOWS
 static std::string SOUND_EXTENSIONS = "wav";
 static std::string IMAGE_EXTENSIONS = "tga bmp jpg jpeg png";
-static std::string ANIM_EXTENSIONS =  "bvh";
+static std::string ANIM_EXTENSIONS =  "bvh anim";
 #ifdef _CORY_TESTING
 static std::string GEOMETRY_EXTENSIONS = "slg";
 #endif
@@ -385,7 +385,14 @@ class LLFileUploadAnim : public view_listener_t
 		const std::string filename = upload_pick((void*)LLFilePicker::FFLOAD_ANIM);
 		if (!filename.empty())
 		{
-			LLFloaterReg::showInstance("upload_anim", LLSD(filename));
+			if (filename.rfind(".anim") != std::string::npos)
+			{
+				LLFloaterReg::showInstance("upload_anim_anim", LLSD(filename));
+			}
+			else
+			{
+				LLFloaterReg::showInstance("upload_anim_bvh", LLSD(filename));
+			}
 		}
 		return true;
 	}
@@ -785,6 +792,11 @@ LLUUID upload_new_resource(
 		upload_error(error_message, "DoNotSupportBulkAnimationUpload", filename, args);
 		return LLUUID();
 	}
+	else if (exten == "anim")
+	{
+		asset_type = LLAssetType::AT_ANIMATION;
+		filename = src_filename;
+	}
 	else
 	{
 		// Unknown extension
diff --git a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
new file mode 100644
index 0000000000..b5538a511c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="190"
+ layout="topleft"
+ name="Anim Preview"
+ help_topic="animation_anim_preview"
+ title="ANIMATION.ANIM"
+ width="300">
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="15"
+     layout="topleft"
+     left="10"
+     mouse_opaque="false"
+     name="name_label"
+     top="20"
+     width="275">
+        Name:
+    </text>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|top|right"
+     height="19"
+     layout="topleft"
+     left_delta="0"
+     max_length_bytes="63"
+     name="name_form"
+     top_pad="0"
+     width="280" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="15"
+     layout="topleft"
+     left_delta="0"
+     mouse_opaque="false"
+     name="description_label"
+     top_pad="10"
+     width="270">
+        Description:
+    </text>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|top|right"
+     height="19"
+     layout="topleft"
+     left_delta="0"
+     max_length_bytes="127"
+     name="description_form"
+     top_pad="0"
+     width="280" />
+    <button
+     follows="left|bottom"
+     height="22"
+     label="Upload (L$[AMOUNT])"
+     layout="topleft"
+     left="45"
+     name="ok_btn"
+     top_pad="60"
+     width="150" />
+    <button
+     follows="right|bottom"
+     height="22"
+     label="Cancel"
+     label_selected="Cancel"
+     layout="topleft"
+     name="cancel_btn"
+     left_pad="5"
+     width="90" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
new file mode 100644
index 0000000000..cb6b2f6ebc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
@@ -0,0 +1,573 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="610"
+ layout="topleft"
+ name="Animation Preview"
+ help_topic="animation_preview"
+ width="280">
+    <floater.string
+     name="failed_to_initialize">
+        Failed to initialize motion
+    </floater.string>
+    <floater.string
+     name="anim_too_long">
+        Animation file is [LENGTH] seconds in length.
+
+Maximum animation length is [MAX_LENGTH] seconds.
+    </floater.string>
+    <floater.string
+     name="failed_file_read">
+        Unable to read animation file.
+
+[STATUS]
+    </floater.string>
+    <floater.string
+     name="E_ST_OK">
+        Ok
+    </floater.string>
+    <floater.string
+     name="E_ST_EOF">
+        Premature end of file.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_CONSTRAINT">
+        Cannot read constraint definition.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_FILE">
+        Cannot open BVH file.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_HIER">
+        Invalid HIERARCHY header.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_JOINT">
+        Cannot find ROOT or JOINT.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_NAME">
+        Cannot get JOINT name.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_OFFSET">
+        Cannot find OFFSET.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_CHANNELS">
+        Cannot find CHANNELS.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_ROTATION">
+        Cannot get rotation order.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_AXIS">
+        Cannot get rotation axis.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_MOTION">
+        Cannot find MOTION.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_FRAMES">
+        Cannot get number of frames.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_FRAME_TIME">
+        Cannot get frame time.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_POS">
+        Cannot get position values.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_ROT">
+        Cannot get rotation values.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_FILE">
+        Cannot open translation file.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_HEADER">
+        Cannot read translation header.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_NAME">
+        Cannot read translation names.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_IGNORE">
+        Cannot read translation ignore value.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_RELATIVE">
+        Cannot read translation relative value.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_OUTNAME">
+        Cannot read translation outname value.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_MATRIX">
+        Cannot read translation matrix.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_MERGECHILD">
+        Cannot get mergechild name.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_MERGEPARENT">
+        Cannot get mergeparent name.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_PRIORITY">
+        Cannot get priority value.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_LOOP">
+        Cannot get loop value.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_EASEIN">
+        Cannot get easeIn values.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_EASEOUT">
+        Cannot get easeOut values.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_HAND">
+        Cannot get hand morph value.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_EMOTE">
+        Cannot read emote name.
+    </floater.string>
+    <floater.string
+     name="E_ST_BAD_ROOT">
+        Incorrect root joint name, use "hip".
+    </floater.string>
+  <text
+     type="string"
+     length="1"
+     bottom="42"
+     follows="top|left"
+     height="23"
+     layout="topleft"
+     left="10"
+     name="name_label">
+        Name:
+    </text>
+    <line_editor
+     bottom_delta="0"
+     follows="top|left|right"
+     height="23"
+     layout="topleft"
+     left="100"
+     name="name_form"
+     right="-10" />
+    <text
+     type="string"
+     length="1"
+     top_pad="5"
+     follows="top|left"
+     height="23"
+     layout="topleft"
+     left="10"
+     name="description_label">
+        Description:
+    </text>
+    <line_editor
+     bottom_delta="0"
+     follows="top|left|right"
+     height="23"
+     layout="topleft"
+     left="100"
+     name="description_form"
+     right="-10" />
+    <spinner
+     decimal_digits="0"
+     follows="left|top"
+     height="23"
+     increment="1"
+     initial_value="0"
+     label="Priority"
+     label_width="88"
+     layout="topleft"
+     left="10"
+     max_val="4"
+     name="priority"
+     tool_tip="Controls which other animations can be overridden by this animation"
+     width="160" />
+    <check_box
+     top_pad="0"
+     height="14"
+     label="Loop"
+     layout="topleft"
+     left="10"
+     width="100"
+     name="loop_check"
+     tool_tip="Makes this animation loop" />
+    <spinner
+     follows="left|top"
+     height="23"
+     increment="1"
+     initial_value="0"
+     label="In(%)"
+     label_width="70"
+     layout="topleft"
+     top_pad="5"
+     left="15"
+     max_val="100"
+     name="loop_in_point"
+     tool_tip="Sets point in animation that looping returns to"
+     width="130" />
+    <spinner
+     bottom_delta="0"
+     follows="left|top"
+     height="23"
+     increment="1"
+     initial_value="0"
+     label="Out(%)"
+     layout="topleft"
+     left_pad="10"
+     max_val="100"
+     name="loop_out_point"
+     tool_tip="Sets point in animation that ends a loop"
+     label_width="60"
+     width="120" />
+    <text
+     type="string"
+     length="1"
+     top_pad="0"
+     follows="top|left"
+     height="23"
+     width="110"
+     word_wrap="true"
+     layout="topleft"
+     left="10"
+     name="hand_label">
+        Hand Pose
+    </text>
+    <combo_box
+     height="23"
+     layout="topleft"
+     left_pad="20"
+     name="hand_pose_combo"
+     tool_tip="Controls what hands do during animation"
+     width="130">
+        <combo_box.item
+         label="Spread"
+         name="Spread"
+         value="" />
+        <combo_box.item
+         label="Relaxed"
+         name="Relaxed"
+         value="Hands_Relaxed" />
+        <combo_box.item
+         label="Point Both"
+         name="PointBoth"
+         value="Hands_Point" />
+        <combo_box.item
+         label="Fist"
+         name="Fist"
+         value="Hands_Fist" />
+        <combo_box.item
+         label="Relaxed Left"
+         name="RelaxedLeft"
+         value="Hands_Relaxed_L" />
+        <combo_box.item
+         label="Point Left"
+         name="PointLeft"
+         value="Hands_Point_L" />
+        <combo_box.item
+         label="Fist Left"
+         name="FistLeft"
+         value="Hands_Fist_L" />
+        <combo_box.item
+         label="Relaxed Right"
+         name="RelaxedRight"
+         value="Hands_Relaxed_R" />
+        <combo_box.item
+         label="Point Right"
+         name="PointRight"
+         value="Hands_Point_R" />
+        <combo_box.item
+         label="Fist Right"
+         name="FistRight"
+         value="Hands_Fist_R" />
+        <combo_box.item
+         label="Salute Right"
+         name="SaluteRight"
+         value="Hands_Salute_R" />
+        <combo_box.item
+         label="Typing"
+         name="Typing"
+         value="Hands_Typing" />
+        <combo_box.item
+         label="Peace Right"
+         name="PeaceRight"
+         value="Hands_Peace_R" />
+    </combo_box>
+    <text
+     type="string"
+     length="1"
+     top_pad="5"
+     follows="top|left"
+     height="23"
+     width="110"
+     word_wrap="true"
+     layout="topleft"
+     left="10"
+     name="emote_label">
+        Expression
+    </text>
+    <combo_box
+     height="23"
+     width="130"
+     layout="topleft"
+     left_pad="20"
+     name="emote_combo"
+     tool_tip="Controls what face does during animation">
+      <item
+       label="(None)"
+       value=""
+       name="[None]" />
+      <item
+       label="Aaaaah"
+       value="Aaaaah"
+       name="Aaaaah" />
+      <item
+       label="Afraid"
+       value="Afraid"
+       name="Afraid" />
+      <item
+       label="Angry"
+       value="Angry"
+       name="Angry" />
+      <item
+       label="Big Smile"
+       value="Big Smile"
+       name="BigSmile" />
+      <item
+       label="Bored"
+       value="Bored"
+       name="Bored" />
+      <item
+       label="Cry"
+       value="Cry"
+       name="Cry" />
+      <item
+       label="Disdain"
+       value="Disdain"
+       name="Disdain" />
+      <item
+       label="Embarrassed"
+       value="Embarrassed"
+       name="Embarrassed" />
+      <item
+       label="Frown"
+       value="Frown"
+       name="Frown" />
+      <item
+       label="Kiss"
+       value="Kiss"
+       name="Kiss" />
+      <item
+       label="Laugh"
+       value="Laugh"
+       name="Laugh" />
+      <item
+       label="Plllppt"
+       value="Plllppt"
+       name="Plllppt" />
+      <item
+       label="Repulsed"
+       value="Repulsed"
+       name="Repulsed" />
+      <item
+       label="Sad"
+       value="Sad"
+       name="Sad" />
+      <item
+       label="Shrug"
+       value="Shrug"
+       name="Shrug" />
+      <item
+       label="Smile"
+       value="Smile" 
+       name="Smile" />
+      <item
+       label="Surprise"
+       value="Surprise" 
+       name="Surprise" />
+      <item
+       label="Wink"
+       value="Wink"
+       name="Wink" />
+      <item
+       label="Worry"
+       value="Worry"
+       name="Worry" />
+    </combo_box>
+    <text
+     type="string"
+     length="1"
+     top_pad="5"
+     follows="top|left"
+     height="23"
+     width="110"
+     word_wrap="true"
+     layout="topleft"
+     left="10"
+     name="preview_label">
+        Preview while
+    </text>
+    <combo_box
+     height="23"
+     width="130"
+     layout="topleft"
+     left_pad="20"
+     name="preview_base_anim"
+     tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
+        <item
+         label="Standing"
+         value="Standing"
+         name="Standing" />
+        <item
+         label="Walking"
+         value="Walking"
+         name="Walking" />
+        <item
+         label="Sitting"
+         value="Sitting"
+         name="Sitting" />
+        <item
+         label="Flying"
+         value="Flying"
+         name="Flying" />
+    </combo_box>
+    <spinner
+     follows="left|top"
+     height="23"
+     increment="0.01"
+     initial_value="0"
+     label="Ease In (sec)"
+     label_width="140"
+     layout="topleft"
+     left="10"
+     max_val="10"
+     name="ease_in_time"
+     tool_tip="Amount of time (in seconds) over which animations blends in"
+     top_pad="10"
+     width="210" />
+    <spinner
+     follows="left|top"
+     height="23"
+     increment="0.01"
+     initial_value="0"
+     label="Ease Out (sec)"
+     label_width="140"
+     layout="topleft"
+     top_pad="0"
+     max_val="10"
+     name="ease_out_time"
+     tool_tip="Amount of time (in seconds) over which animations blends out"
+     width="210" />
+    <button
+     follows="top|right"
+     height="23"
+     image_overlay="Play_Over"
+     image_unselected="SegmentedBtn_Left_Off"
+     image_selected="SegmentedBtn_Left_On_Selected"
+	 image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
+	 image_disabled="SegmentedBtn_Left_Disabled"
+	 image_pressed="SegmentedBtn_Left_Press"
+	 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
+     layout="topleft"
+     left="10"
+     name="play_btn"
+     tool_tip="Play your animation"
+     top_pad="0"
+     width="23" />
+    <button
+	 visible = "false"
+     follows="top|right"
+     height="23"
+     image_overlay="Pause_Over"
+     image_unselected="SegmentedBtn_Left_Off"
+     image_selected="SegmentedBtn_Left_On_Selected"
+	 image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
+	 image_disabled="SegmentedBtn_Left_Disabled"
+	 image_pressed="SegmentedBtn_Left_Press"
+	 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
+     layout="topleft"
+     left="10"
+     name="pause_btn"
+     tool_tip="Pause your animation"
+     top_pad="-23"
+     width="23" />	 
+    <button
+     follows="top|right"
+     height="23"
+     image_overlay="StopReload_Over"
+     image_unselected="SegmentedBtn_Right_Off"
+     image_selected="SegmentedBtn_Right_On_Selected"
+	 image_disabled_selected="SegmentedBtn_Right_Selected_Disabled"
+	 image_disabled="SegmentedBtn_Right_Disabled"
+	 image_pressed="SegmentedBtn_Right_Press"
+	 image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+     layout="topleft"
+     name="stop_btn"
+     tool_tip="Stop animation playback"
+     top_delta="0"
+     left_delta="23"
+     width="23" />
+    <slider
+     left_pad="10"
+     follows="top|right"
+     height="23"
+     width="200"
+     increment="0.0001"
+     initial_value="0"
+     layout="topleft"
+     name="playback_slider"
+     show_text="false" />
+    <text
+     type="string"
+     length="1"
+     height="72"
+     word_wrap="true"
+     top_pad="5"
+     text_color="EmphasisColor"
+     follows="top|left"
+     layout="topleft"
+     left="70"
+     name="bad_animation_text">
+        Unable to read animation file.
+
+We recommend BVH files exported from Poser 4.
+    </text>
+    <button
+    	top="580"
+     follows="bottom|left"
+     height="23"
+     label="Upload (L$[AMOUNT])"
+     layout="topleft"
+     left="10"
+     name="ok_btn"
+     width="128" />
+    <button
+    	top="580"
+     follows="bottom|left"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     name="cancel_btn"
+     left="142"
+     width="128" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
deleted file mode 100644
index cb6b2f6ebc..0000000000
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ /dev/null
@@ -1,573 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_minimize="false"
- height="610"
- layout="topleft"
- name="Animation Preview"
- help_topic="animation_preview"
- width="280">
-    <floater.string
-     name="failed_to_initialize">
-        Failed to initialize motion
-    </floater.string>
-    <floater.string
-     name="anim_too_long">
-        Animation file is [LENGTH] seconds in length.
-
-Maximum animation length is [MAX_LENGTH] seconds.
-    </floater.string>
-    <floater.string
-     name="failed_file_read">
-        Unable to read animation file.
-
-[STATUS]
-    </floater.string>
-    <floater.string
-     name="E_ST_OK">
-        Ok
-    </floater.string>
-    <floater.string
-     name="E_ST_EOF">
-        Premature end of file.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_CONSTRAINT">
-        Cannot read constraint definition.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_FILE">
-        Cannot open BVH file.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_HIER">
-        Invalid HIERARCHY header.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_JOINT">
-        Cannot find ROOT or JOINT.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_NAME">
-        Cannot get JOINT name.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_OFFSET">
-        Cannot find OFFSET.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_CHANNELS">
-        Cannot find CHANNELS.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_ROTATION">
-        Cannot get rotation order.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_AXIS">
-        Cannot get rotation axis.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_MOTION">
-        Cannot find MOTION.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_FRAMES">
-        Cannot get number of frames.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_FRAME_TIME">
-        Cannot get frame time.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_POS">
-        Cannot get position values.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_ROT">
-        Cannot get rotation values.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_FILE">
-        Cannot open translation file.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_HEADER">
-        Cannot read translation header.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_NAME">
-        Cannot read translation names.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_IGNORE">
-        Cannot read translation ignore value.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_RELATIVE">
-        Cannot read translation relative value.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_OUTNAME">
-        Cannot read translation outname value.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_MATRIX">
-        Cannot read translation matrix.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_MERGECHILD">
-        Cannot get mergechild name.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_MERGEPARENT">
-        Cannot get mergeparent name.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_PRIORITY">
-        Cannot get priority value.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_LOOP">
-        Cannot get loop value.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_EASEIN">
-        Cannot get easeIn values.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_EASEOUT">
-        Cannot get easeOut values.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_HAND">
-        Cannot get hand morph value.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_EMOTE">
-        Cannot read emote name.
-    </floater.string>
-    <floater.string
-     name="E_ST_BAD_ROOT">
-        Incorrect root joint name, use "hip".
-    </floater.string>
-  <text
-     type="string"
-     length="1"
-     bottom="42"
-     follows="top|left"
-     height="23"
-     layout="topleft"
-     left="10"
-     name="name_label">
-        Name:
-    </text>
-    <line_editor
-     bottom_delta="0"
-     follows="top|left|right"
-     height="23"
-     layout="topleft"
-     left="100"
-     name="name_form"
-     right="-10" />
-    <text
-     type="string"
-     length="1"
-     top_pad="5"
-     follows="top|left"
-     height="23"
-     layout="topleft"
-     left="10"
-     name="description_label">
-        Description:
-    </text>
-    <line_editor
-     bottom_delta="0"
-     follows="top|left|right"
-     height="23"
-     layout="topleft"
-     left="100"
-     name="description_form"
-     right="-10" />
-    <spinner
-     decimal_digits="0"
-     follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="0"
-     label="Priority"
-     label_width="88"
-     layout="topleft"
-     left="10"
-     max_val="4"
-     name="priority"
-     tool_tip="Controls which other animations can be overridden by this animation"
-     width="160" />
-    <check_box
-     top_pad="0"
-     height="14"
-     label="Loop"
-     layout="topleft"
-     left="10"
-     width="100"
-     name="loop_check"
-     tool_tip="Makes this animation loop" />
-    <spinner
-     follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="0"
-     label="In(%)"
-     label_width="70"
-     layout="topleft"
-     top_pad="5"
-     left="15"
-     max_val="100"
-     name="loop_in_point"
-     tool_tip="Sets point in animation that looping returns to"
-     width="130" />
-    <spinner
-     bottom_delta="0"
-     follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="0"
-     label="Out(%)"
-     layout="topleft"
-     left_pad="10"
-     max_val="100"
-     name="loop_out_point"
-     tool_tip="Sets point in animation that ends a loop"
-     label_width="60"
-     width="120" />
-    <text
-     type="string"
-     length="1"
-     top_pad="0"
-     follows="top|left"
-     height="23"
-     width="110"
-     word_wrap="true"
-     layout="topleft"
-     left="10"
-     name="hand_label">
-        Hand Pose
-    </text>
-    <combo_box
-     height="23"
-     layout="topleft"
-     left_pad="20"
-     name="hand_pose_combo"
-     tool_tip="Controls what hands do during animation"
-     width="130">
-        <combo_box.item
-         label="Spread"
-         name="Spread"
-         value="" />
-        <combo_box.item
-         label="Relaxed"
-         name="Relaxed"
-         value="Hands_Relaxed" />
-        <combo_box.item
-         label="Point Both"
-         name="PointBoth"
-         value="Hands_Point" />
-        <combo_box.item
-         label="Fist"
-         name="Fist"
-         value="Hands_Fist" />
-        <combo_box.item
-         label="Relaxed Left"
-         name="RelaxedLeft"
-         value="Hands_Relaxed_L" />
-        <combo_box.item
-         label="Point Left"
-         name="PointLeft"
-         value="Hands_Point_L" />
-        <combo_box.item
-         label="Fist Left"
-         name="FistLeft"
-         value="Hands_Fist_L" />
-        <combo_box.item
-         label="Relaxed Right"
-         name="RelaxedRight"
-         value="Hands_Relaxed_R" />
-        <combo_box.item
-         label="Point Right"
-         name="PointRight"
-         value="Hands_Point_R" />
-        <combo_box.item
-         label="Fist Right"
-         name="FistRight"
-         value="Hands_Fist_R" />
-        <combo_box.item
-         label="Salute Right"
-         name="SaluteRight"
-         value="Hands_Salute_R" />
-        <combo_box.item
-         label="Typing"
-         name="Typing"
-         value="Hands_Typing" />
-        <combo_box.item
-         label="Peace Right"
-         name="PeaceRight"
-         value="Hands_Peace_R" />
-    </combo_box>
-    <text
-     type="string"
-     length="1"
-     top_pad="5"
-     follows="top|left"
-     height="23"
-     width="110"
-     word_wrap="true"
-     layout="topleft"
-     left="10"
-     name="emote_label">
-        Expression
-    </text>
-    <combo_box
-     height="23"
-     width="130"
-     layout="topleft"
-     left_pad="20"
-     name="emote_combo"
-     tool_tip="Controls what face does during animation">
-      <item
-       label="(None)"
-       value=""
-       name="[None]" />
-      <item
-       label="Aaaaah"
-       value="Aaaaah"
-       name="Aaaaah" />
-      <item
-       label="Afraid"
-       value="Afraid"
-       name="Afraid" />
-      <item
-       label="Angry"
-       value="Angry"
-       name="Angry" />
-      <item
-       label="Big Smile"
-       value="Big Smile"
-       name="BigSmile" />
-      <item
-       label="Bored"
-       value="Bored"
-       name="Bored" />
-      <item
-       label="Cry"
-       value="Cry"
-       name="Cry" />
-      <item
-       label="Disdain"
-       value="Disdain"
-       name="Disdain" />
-      <item
-       label="Embarrassed"
-       value="Embarrassed"
-       name="Embarrassed" />
-      <item
-       label="Frown"
-       value="Frown"
-       name="Frown" />
-      <item
-       label="Kiss"
-       value="Kiss"
-       name="Kiss" />
-      <item
-       label="Laugh"
-       value="Laugh"
-       name="Laugh" />
-      <item
-       label="Plllppt"
-       value="Plllppt"
-       name="Plllppt" />
-      <item
-       label="Repulsed"
-       value="Repulsed"
-       name="Repulsed" />
-      <item
-       label="Sad"
-       value="Sad"
-       name="Sad" />
-      <item
-       label="Shrug"
-       value="Shrug"
-       name="Shrug" />
-      <item
-       label="Smile"
-       value="Smile" 
-       name="Smile" />
-      <item
-       label="Surprise"
-       value="Surprise" 
-       name="Surprise" />
-      <item
-       label="Wink"
-       value="Wink"
-       name="Wink" />
-      <item
-       label="Worry"
-       value="Worry"
-       name="Worry" />
-    </combo_box>
-    <text
-     type="string"
-     length="1"
-     top_pad="5"
-     follows="top|left"
-     height="23"
-     width="110"
-     word_wrap="true"
-     layout="topleft"
-     left="10"
-     name="preview_label">
-        Preview while
-    </text>
-    <combo_box
-     height="23"
-     width="130"
-     layout="topleft"
-     left_pad="20"
-     name="preview_base_anim"
-     tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
-        <item
-         label="Standing"
-         value="Standing"
-         name="Standing" />
-        <item
-         label="Walking"
-         value="Walking"
-         name="Walking" />
-        <item
-         label="Sitting"
-         value="Sitting"
-         name="Sitting" />
-        <item
-         label="Flying"
-         value="Flying"
-         name="Flying" />
-    </combo_box>
-    <spinner
-     follows="left|top"
-     height="23"
-     increment="0.01"
-     initial_value="0"
-     label="Ease In (sec)"
-     label_width="140"
-     layout="topleft"
-     left="10"
-     max_val="10"
-     name="ease_in_time"
-     tool_tip="Amount of time (in seconds) over which animations blends in"
-     top_pad="10"
-     width="210" />
-    <spinner
-     follows="left|top"
-     height="23"
-     increment="0.01"
-     initial_value="0"
-     label="Ease Out (sec)"
-     label_width="140"
-     layout="topleft"
-     top_pad="0"
-     max_val="10"
-     name="ease_out_time"
-     tool_tip="Amount of time (in seconds) over which animations blends out"
-     width="210" />
-    <button
-     follows="top|right"
-     height="23"
-     image_overlay="Play_Over"
-     image_unselected="SegmentedBtn_Left_Off"
-     image_selected="SegmentedBtn_Left_On_Selected"
-	 image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
-	 image_disabled="SegmentedBtn_Left_Disabled"
-	 image_pressed="SegmentedBtn_Left_Press"
-	 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
-     layout="topleft"
-     left="10"
-     name="play_btn"
-     tool_tip="Play your animation"
-     top_pad="0"
-     width="23" />
-    <button
-	 visible = "false"
-     follows="top|right"
-     height="23"
-     image_overlay="Pause_Over"
-     image_unselected="SegmentedBtn_Left_Off"
-     image_selected="SegmentedBtn_Left_On_Selected"
-	 image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
-	 image_disabled="SegmentedBtn_Left_Disabled"
-	 image_pressed="SegmentedBtn_Left_Press"
-	 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
-     layout="topleft"
-     left="10"
-     name="pause_btn"
-     tool_tip="Pause your animation"
-     top_pad="-23"
-     width="23" />	 
-    <button
-     follows="top|right"
-     height="23"
-     image_overlay="StopReload_Over"
-     image_unselected="SegmentedBtn_Right_Off"
-     image_selected="SegmentedBtn_Right_On_Selected"
-	 image_disabled_selected="SegmentedBtn_Right_Selected_Disabled"
-	 image_disabled="SegmentedBtn_Right_Disabled"
-	 image_pressed="SegmentedBtn_Right_Press"
-	 image_pressed_selected="SegmentedBtn_Right_Selected_Press"
-     layout="topleft"
-     name="stop_btn"
-     tool_tip="Stop animation playback"
-     top_delta="0"
-     left_delta="23"
-     width="23" />
-    <slider
-     left_pad="10"
-     follows="top|right"
-     height="23"
-     width="200"
-     increment="0.0001"
-     initial_value="0"
-     layout="topleft"
-     name="playback_slider"
-     show_text="false" />
-    <text
-     type="string"
-     length="1"
-     height="72"
-     word_wrap="true"
-     top_pad="5"
-     text_color="EmphasisColor"
-     follows="top|left"
-     layout="topleft"
-     left="70"
-     name="bad_animation_text">
-        Unable to read animation file.
-
-We recommend BVH files exported from Poser 4.
-    </text>
-    <button
-    	top="580"
-     follows="bottom|left"
-     height="23"
-     label="Upload (L$[AMOUNT])"
-     layout="topleft"
-     left="10"
-     name="ok_btn"
-     width="128" />
-    <button
-    	top="580"
-     follows="bottom|left"
-     height="23"
-     label="Cancel"
-     layout="topleft"
-     name="cancel_btn"
-     left="142"
-     width="128" />
-</floater>
-- 
cgit v1.2.3


From 4f58bd82a317d5f0748d700da07dadbd82c47c87 Mon Sep 17 00:00:00 2001
From: Hitomi Tiponi <none@none>
Date: Tue, 31 Jan 2012 13:06:53 -0500
Subject: STORM-1741 Collection of color and skinning issues With help from
 Jonathan Yap

---
 indra/newview/skins/default/colors.xml                 |  6 ++++++
 .../skins/default/xui/en/floater_about_land.xml        |  8 ++++----
 .../skins/default/xui/en/floater_buy_contents.xml      |  2 +-
 .../skins/default/xui/en/floater_buy_currency.xml      |  8 ++++----
 .../skins/default/xui/en/floater_buy_object.xml        |  4 ++--
 .../skins/default/xui/en/floater_voice_controls.xml    |  2 +-
 indra/newview/skins/default/xui/en/inspect_object.xml  |  2 +-
 .../skins/default/xui/en/panel_block_list_sidetray.xml |  2 +-
 .../default/xui/en/panel_dummy_clothing_list_item.xml  |  2 +-
 .../skins/default/xui/en/panel_edit_wearable.xml       |  6 +++---
 .../skins/default/xui/en/panel_instant_message.xml     |  6 +++---
 .../skins/default/xui/en/panel_notification.xml        | 18 +++++++++---------
 .../skins/default/xui/en/panel_online_status_toast.xml |  2 +-
 .../skins/default/xui/en/panel_sys_well_item.xml       |  4 ++--
 .../default/xui/en/panel_teleport_history_item.xml     |  2 +-
 indra/newview/skins/default/xui/en/panel_toast.xml     |  2 +-
 .../skins/default/xui/en/widgets/avatar_list_item.xml  |  8 ++++----
 .../default/xui/en/widgets/bodyparts_list_item.xml     |  2 +-
 .../default/xui/en/widgets/clothing_list_item.xml      |  2 +-
 .../xui/en/widgets/dummy_clothing_list_item.xml        |  2 +-
 20 files changed, 48 insertions(+), 42 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 8baaa14595..b616e2327b 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -614,6 +614,9 @@
     <color
      name="PanelFocusBackgroundColor"
      reference="DkGray2" />
+    <color
+     name="PanelNotificationBackground"
+     value="1 0.3 0.3 0" />
     <color
      name="ParcelHoverColor"
      reference="White" />
@@ -746,6 +749,9 @@
     <color
      name="TitleBarFocusColor"
      reference="White_10" />
+    <color
+     name="ToastBackground"
+     value="0.3 0.3 0.3 0" />
     <color
      name="ToolTipBgColor"
      value="0.937 0.89 0.655 1" />
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 4772f744ea..2549a40586 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1214,7 +1214,7 @@ Only large parcels can be listed in search.
              type="string"
              length="1"
              follows="left|top"
-             text_color="white"
+             text_color="White"
              height="16"
              layout="topleft"
              left="10"
@@ -1504,7 +1504,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="20"
              name="Snapshot:"
-             text_color="white"
+             text_color="White"
              top="225"
              width="200">
                 Snapshot:
@@ -1550,7 +1550,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="255"
              top="282"
-             text_color="white"
+             text_color="White"
              name="landing_point"
              word_wrap="true"
              width="200">
@@ -1580,7 +1580,7 @@ Only large parcels can be listed in search.
             <text
              type="string"
              length="1"
-             text_color="white"
+             text_color="White"
              follows="left|top"
              height="16"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
index 92001534e7..ac96a70805 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
@@ -62,7 +62,7 @@
      layout="topleft"
      left="10"
      name="buy_text"
-     text_color="white"
+     text_color="White"
      top="220"
      use_ellipses="true" 
      width="260">
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 6afa24d04a..553c5d51d0 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -215,7 +215,7 @@
     <text
      type="string"
      length="1"
-     text_color="0.7 0.7 0.7 0.5"
+     text_color="LtGray_50"
      follows="top|left"
      layout="topleft"
      halign="right"
@@ -229,7 +229,7 @@
     <text
      type="string"
      length="1"
-     text_color="0.7 0.7 0.7 0.5"
+     text_color="LtGray_50"
      follows="top|left"
      layout="topleft"
      halign="right"
@@ -243,7 +243,7 @@ Re-enter amount to see the latest exchange rate.
     <text
      type="string"
      length="1"
-     text_color="0.7 0.7 0.7 0.5"
+     text_color="LtGray_50"
      follows="top|left"
      layout="topleft"
      halign="right"
@@ -257,7 +257,7 @@ Re-enter amount to see the latest exchange rate.
     <text
      type="string"
      length="1"
-     text_color="0.7 0.7 0.7 0.5"
+     text_color="LtGray_50"
      follows="top|left"
      layout="topleft"
      halign="right"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
index 8dfb6ba00c..5fdd4aa49d 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
@@ -89,7 +89,7 @@
      left_delta="0"
 	 line_spacing.pixels="7"
      name="buy_text"
-     text_color="white"
+     text_color="White"
      top_pad="5"
      use_ellipses="true"
      width="260"
@@ -106,7 +106,7 @@ Buy for L$[AMOUNT] from:
      left_delta="0"
 	 line_spacing.pixels="7"
      name="buy_name_text"
-     text_color="white"
+     text_color="White"
      top_pad="5"
      use_ellipses="true"
      width="260">
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 6807b01fa3..463af4002b 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -72,7 +72,7 @@
              layout="topleft"
              left_pad="10"
              name="user_text"
-             text_color="white"
+             text_color="White"
              top="4"
              use_ellipses="true"
              value="My Avatar:"
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index 8d14c974b4..880dddce19 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -56,7 +56,7 @@ owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
    halign="right"
    right="-5"
    name="price_text"
-   text_color="white"
+   text_color="White"
    top="60"
    font_shadow="none"
    width="60">
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 1e6a31d388..7c67fd7f83 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -28,7 +28,7 @@
      layout="topleft"
      left_pad="10"
      name="title_text"
-     text_color="white"
+     text_color="White"
      top="5"
      width="250">
         Block List
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index df459b4083..4b05ab27e4 100644
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -29,7 +29,7 @@
      width="380" />
     <icon
      height="16"
-     color="0.75 0.75 0.75 1"
+     color="LtGray"
      follows="top|left"
      image_name="Inv_Object"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index c8764a6a84..68f1fa1014 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -164,7 +164,7 @@
      layout="topleft"
      left_pad="8"
      name="edit_wearable_title"
-     text_color="white"
+     text_color="White"
      top="3"
      value="Editing Shape"
      use_ellipses="true"
@@ -190,7 +190,7 @@
          layout="topleft"
          left="10"
          name="description_text"
-         text_color="white"
+         text_color="White"
          top="10"
          value="Shape:"
          width="150" />
@@ -254,7 +254,7 @@
          name="description"
          prevalidate_callback="ascii"
          select_on_focus="true"
-         text_color="black"
+         text_color="Black"
          top_pad="3"
          width="290" />
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 4251128714..2e5d650902 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -15,7 +15,7 @@
     <panel
      background_visible="true"
      bevel_style="in"
-     bg_alpha_color="black"
+     bg_alpha_color="Black"
      follows="top"
      height="24"
      label="im_header"
@@ -64,7 +64,7 @@
          left_pad="5"
          name="user_name"
          parse_urls="false"
-         text_color="white"
+         text_color="White"
          top="8"
          translate="false"
          use_ellipses="true"
@@ -90,7 +90,7 @@
      layout="topleft"
      left="10"
      name="message"
-     text_color="white"
+     text_color="White"
      top="33"
      use_ellipses="true"
      value=""
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index f6f62ac54e..94c468e1bb 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -3,8 +3,8 @@
   background_opaque="false"
       border_visible="false"
   background_visible="true"
-  bg_alpha_color="1 0.3 0.3 0"
-  bg_opaque_color="1 0.3 0.3 0"
+  bg_alpha_color="PanelNotificationBackground"
+  bg_opaque_color="PanelNotificationBackground"
   label="notification_panel"
   layout="topleft"
   left="0"
@@ -20,8 +20,8 @@
       border_visible="false"
  bevel_style="none"
     background_visible="true"
-  bg_alpha_color="0.3 0.3 0.3 0"
-  bg_opaque_color="0.3 0.3 0.3 0"
+  bg_alpha_color="ToastBackground"
+  bg_opaque_color="ToastBackground"
     follows="left|right|top"
     height="100"
     label="info_panel"
@@ -39,7 +39,7 @@
       left="10"
       name="text_box"
       read_only="true"
-      text_color="white"
+      text_color="White"
       top="10"
       visible="false" 
       width="285"
@@ -52,7 +52,7 @@
       layout="topleft"
       left="10"
       name="caution_text_box"
-      text_color="1 0.82 0.46 1"
+      text_color="NotifyCautionBoxColor"
       top="10"
       visible="false"
       width="285"
@@ -60,7 +60,7 @@
     <text_editor
     	h_pad="0"
 	v_pad="0"
-      bg_readonly_color="0.0 0.0 0.0 0"
+      bg_readonly_color="Transparent"
       border_visible="false"
       embedded_items="false"
       enabled="false"
@@ -73,8 +73,8 @@
       name="text_editor_box"
       read_only="true"
       tab_stop="false"
-      text_color="white"
-      text_readonly_color="white"
+      text_color="White"
+      text_readonly_color="White"
       top="10"
       visible="false"
       width="285"
diff --git a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
index b1a7697e83..dadbd9c9ab 100644
--- a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
@@ -25,7 +25,7 @@
      layout="topleft"
      left_pad="5"
      name="message"
-     text_color="white"
+     text_color="White"
      top="15"
      use_ellipses="true"
      value=""
diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
index 5e74689c5a..007b73a4bc 100644
--- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
@@ -13,7 +13,7 @@
   follows="left|right"
   background_opaque="false"
   background_visible="true"
-  bg_alpha_color="0.0 0.0 0.0 0.0" >
+  bg_alpha_color="SysWellItemUnselected" >
   <text
     clip_partial="true" 
     top="2"
@@ -22,7 +22,7 @@
     height="28"
     layout="topleft"
     follows="right|left"
-    text_color="white"
+    text_color="White"
     use_ellipses="true"
     word_wrap="true"
     mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
index c89e1dc215..c5b0be0616 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
@@ -44,7 +44,7 @@
      parse_urls="false"
      use_ellipses="true"
      name="region"
-     text_color="white"
+     text_color="White"
      top="4"
      value="..."
      width="330" />
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 062c403a26..0b5aff54ca 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -59,7 +59,7 @@
    left="20"
    name="toast_text"
    word_wrap="true"
-   text_color="white"
+   text_color="White"
    top="5"
    translate="false"
    use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
index 1bb3188cc8..8a4ccb19f9 100644
--- a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
@@ -17,13 +17,13 @@
   <voice_call_invited_style
    font="SansSerifSmall"
    font.style="NORMAL"
-   color="0.5 0.5 0.5 0.5"/>
+   color="AvatarListItemIconVoiceInvitedColor"/>
 
   <!-- styles for avatar item JOINED to voice call -->
   <voice_call_joined_style
    font="SansSerifSmall"
    font.style="NORMAL"
-   color="white"/>
+   color="White"/>
 
   <!-- styles for avatar item which HAS LEFT voice call -->
   <voice_call_left_style
@@ -35,11 +35,11 @@
   <online_style
    font="SansSerifSmall"
    font.style="NORMAL"
-   color="white"/>
+   color="White"/>
 
   <!-- styles for OFFLINE avatar item -->
   <offline_style
    font="SansSerifSmall"
    font.style="NORMAL"
-   color="0.5 0.5 0.5 1.0"/>
+   color="Gray"/>
 </avatar_list_item>
diff --git a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
index 0eec002006..0016a8cf53 100644
--- a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
@@ -24,7 +24,7 @@
    parse_urls="false"
    use_ellipses="true"
    name="item_name"
-   text_color="white"
+   text_color="White"
    top="5"
    value="..."
    width="359" />
diff --git a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
index 96d72c78a6..d83f44737e 100644
--- a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
@@ -24,7 +24,7 @@
    parse_urls="false"
    use_ellipses="true"
    name="item_name"
-   text_color="white"
+   text_color="White"
    top="5"
    value="..."
    width="359" />
diff --git a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
index 6c60624805..8c805da048 100644
--- a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
@@ -9,7 +9,7 @@
  width="380">
   <item_icon
     height="16"
-    color="0.75 0.75 0.75 1"
+    color="LtGray"
     follows="top|left"
     image_name="Inv_Object"
     layout="topleft"
-- 
cgit v1.2.3


From bb5dc767f7017089368d5164cd16cf983282b9de Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 31 Jan 2012 16:57:46 -0500
Subject: STORM-1803 Adjust messages in notifications.xml

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 1daf2e6948..9bf93fd0b6 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1621,7 +1621,7 @@ Unable to create output file: [FILE]
    icon="alertmodal.tga"
    name="DoNotSupportBulkAnimationUpload"
    type="alertmodal">
-[APP_NAME] does not currently support bulk upload of animation files.
+[APP_NAME] does not currently support bulk upload of BVH format animation files.
   <tag>fail</tag>
   </notification>
 
-- 
cgit v1.2.3


From 449d2b106fd18bfb6f0e516eaedd395de18c7608 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 7 Feb 2012 10:25:18 -0500
Subject: STORM-1803 Fix syntax error that the Windows compiler did not
 complain about

---
 indra/newview/llfilepicker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index b426bcf84b..f741b9b810 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -1203,7 +1203,7 @@ static std::string add_anim_filter_to_gtkchooser(GtkWindow *picker)
 	GtkFileFilter *gfilter = gtk_file_filter_new();
 	gtk_file_filter_add_pattern(gfilter, "*.bvh");
 	gtk_file_filter_add_pattern(gfilter, "*.anim");
-	std::string filtername = LLTrans::getString("animation_files") + " (*.bvh; *.anim)");
+	std::string filtername = LLTrans::getString("animation_files") + " (*.bvh; *.anim)";
 	add_common_filters_to_gtkchooser(gfilter, picker, filtername);
 	return filtername;
 }
-- 
cgit v1.2.3