Merge branch 'master' of github.com:singularity-viewer/SingularityViewer

2013-01-20 01:49:14 +01:00
parent cddd21d879 7a8a2757db
commit d5eb2432ef
49 changed files with 1049 additions and 750 deletions
--- a/indra/llcharacter/llbvhconsts.h
+++ b/indra/llcharacter/llbvhconsts.h
@@ -33,7 +33,7 @@
 #ifndef LL_LLBVHCONSTS_H
 #define LL_LLBVHCONSTS_H

-const F32 MAX_ANIM_DURATION = 30.f;
+const F32 MAX_ANIM_DURATION = 60.f;

 typedef enum e_constraint_type
 	{
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -3055,15 +3055,29 @@ S32 sculpt_sides(F32 detail)


 // determine the number of vertices in both s and t direction for this sculpt
-void sculpt_calc_mesh_resolution(U16 width, U16 height, U8 type, F32 detail, S32& s, S32& t)
+bool sculpt_calc_mesh_resolution(U16 width, U16 height, U8 type, F32 detail, S32& s, S32& t)
 {
+	//Singu Note: minimum number of vertices depend on stitching type.
+	S32 min_s = 1;
+	S32 min_t = 1;
+
+  	if ((type == LL_SCULPT_TYPE_SPHERE) ||
+		(type == LL_SCULPT_TYPE_TORUS) ||
+		(type == LL_SCULPT_TYPE_CYLINDER))
+		min_s = 4;
+
+	if (type == LL_SCULPT_TYPE_TORUS)
+		min_t = 4;
+
 	// this code has the following properties:
 	// 1) the aspect ratio of the mesh is as close as possible to the ratio of the map
 	//    while still using all available verts
 	// 2) the mesh cannot have more verts than is allowed by LOD
 	// 3) the mesh cannot have more verts than is allowed by the map
-	
-	S32 max_vertices_lod = (S32)pow((double)sculpt_sides(detail), 2.0);
+
+	//Singu Note: Replaced float math mangling to get an integer square with just one multiplication.
+	S32 const sculptsides = sculpt_sides(detail);
+	S32 max_vertices_lod = sculptsides * sculptsides;
 	S32 max_vertices_map = width * height / 4;
 	
 	S32 vertices;
@@ -3082,11 +3096,22 @@ void sculpt_calc_mesh_resolution(U16 width, U16 height, U8 type, F32 detail, S32
 	
 	s = (S32)(F32) sqrt(((F32)vertices / ratio));

-	s = llmax(s, 4);              // no degenerate sizes, please
+	s = llmax(s, min_s);          // no degenerate sizes, please
 	t = vertices / s;

-	t = llmax(t, 4);              // no degenerate sizes, please
+	t = llmax(t, min_t);          // no degenerate sizes, please
 	s = vertices / t;
+
+	// Singu Note: return false if we failed to get enough vertices for this stitching
+	// type (due to not enough data, ie while the sculpt is still loading).
+	bool enough_data = s >= min_s;
+	if (!enough_data)
+	{
+		// Uses standard lod stepping for the sphere that will be shown.
+		s = t = sculptsides;
+	}
+
+	return enough_data;
 }

 // sculpt replaces generate() for sculpted surfaces
@@ -3113,7 +3138,14 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components,
 		sculpt_detail = 4.0;
 	}

-	sculpt_calc_mesh_resolution(sculpt_width, sculpt_height, sculpt_type, sculpt_detail, requested_sizeS, requested_sizeT);
+	//Singu Note: this function returns false when sculpt_width and sculpt_height are too small.
+	// In that case requested_sizeS and requested_sizeT are set to the same values as should have happened
+	// when either of sculpt_width or sculpt_height had been zero.
+	if (!sculpt_calc_mesh_resolution(sculpt_width, sculpt_height, sculpt_type, sculpt_detail, requested_sizeS, requested_sizeT))
+	{
+		sculpt_level = -1;
+		data_is_empty = TRUE;
+	}

 	mPathp->generate(mParams.getPathParams(), sculpt_detail, 0, TRUE, requested_sizeS);
 	mProfilep->generate(mParams.getProfileParams(), mPathp->isOpen(), sculpt_detail, 0, TRUE, requested_sizeT);
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -752,7 +752,12 @@ LLScrollListCtrl::LLScrollListCtrl(const std::string& name, const LLRect& rect,
 		addChild(mBorder);
 	}

-
+	LLTextBox* textBox = new LLTextBox("comment_text",mItemListRect,std::string());
+	textBox->setBorderVisible(false);
+	textBox->setFollowsAll();
+	textBox->setFontShadow(LLFontGL::NO_SHADOW);
+	textBox->setColor(LLUI::sColorsGroup->getColor("DefaultListText"));
+	addChild(textBox);
 }

 S32 LLScrollListCtrl::getSearchColumn()
@@ -1688,7 +1693,7 @@ void LLScrollListCtrl::deselectAllItems(BOOL no_commit_on_change)

 void LLScrollListCtrl::setCommentText(const std::string& comment_text)
 {
-	getChild<LLTextBox>("comment_text")->setValue(comment_text);
+	getChild<LLTextBox>("comment_text")->setWrappedText(comment_text);
 }

 LLScrollListItem* LLScrollListCtrl::addSeparator(EAddPosition pos)
@@ -2045,6 +2050,7 @@ void LLScrollListCtrl::draw()

 	updateColumns();

+	getChildView("comment_text")->setVisible(mItemList.empty());

 	drawItems();

@@ -3218,16 +3224,20 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac

 	for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
 	{
-		if (child->hasName("row"))
+		if (child->hasName("row") || child->hasName("rows"))
 		{
 			LLUUID id;
-			child->getAttributeUUID("id", id);
-
 			LLSD row;
-
-			row["id"] = id;
+			std::string value;
+			child->getAttributeString("value",value);
+			bool id_found = child->getAttributeUUID("id", id);
+			if(id_found)
+				row["id"] = id;
+			else
+				row["id"] = value;

 			S32 column_idx = 0;
+			bool explicit_column = false;
 			LLXMLNodePtr row_child;
 			for (row_child = child->getFirstChild(); row_child.notNull(); row_child = row_child->getNextSibling())
 			{
@@ -3249,28 +3259,24 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 					row["columns"][column_idx]["font"] = font;
 					row["columns"][column_idx]["font-style"] = font_style;
 					column_idx++;
+					explicit_column = true;
 				}
 			}
-			scroll_list->addElement(row);
+			if(explicit_column)
+				scroll_list->addElement(row);
+			else
+			{
+				LLSD entry_id;
+				if(id_found)
+					entry_id = id;
+				scroll_list->addSimpleElement(value,ADD_BOTTOM,entry_id);
+			}
 		}
 	}

 	std::string contents = node->getTextContents();
-	if (!contents.empty())
-	{
-		typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-		boost::char_separator<char> sep("\t\n");
-		tokenizer tokens(contents, sep);
-		tokenizer::iterator token_iter = tokens.begin();
+	scroll_list->setCommentText(contents);

-		while(token_iter != tokens.end())
-		{
-			const std::string& line = *token_iter;
-			scroll_list->addSimpleElement(line);
-			++token_iter;
-		}
-	}
-	
 	return scroll_list;
 }

--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6575,6 +6575,17 @@ This should be as low as possible, but too low may break functionality</string>
      <key>Value</key>
      <integer>52</integer>
    </map>
+    <key>RadarColumnNameWidth</key>
+    <map>
+      <key>Comment</key>
+      <string>Width for radar's name column</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>80</integer>
+    </map>
    <key>RadarColumnMarkHidden</key>
    <map>
      <key>Comment</key>
@@ -6754,7 +6765,18 @@ This should be as low as possible, but too low may break functionality</string>
    <key>RadarChatKeys</key>
    <map>
      <key>Comment</key>
-      <string>Enable private chat alerts for avatars entering the region</string>
+      <string>Enable alerting scripts about avatars detected by the radar</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>RadarChatKeysStopAsking</key>
+    <map>
+      <key>Comment</key>
+      <string>Do not ask if RadarChatKeys should be enabled when a script requests for the radar's keys.</string>
      <key>Persist</key>
      <integer>1</integer>
      <key>Type</key>
--- a/indra/newview/chatbar_as_cmdline.cpp
+++ b/indra/newview/chatbar_as_cmdline.cpp
@@ -461,7 +461,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
 	return true;
 }

-//case insensative search for avatar in draw distance
+//case insensitive search for avatar in draw distance
 //TODO: make this use the avatar list floaters list so we have EVERYONE
 // even if they are out of draw distance.
 LLUUID cmdline_partial_name2key(std::string partial_name)
@@ -471,7 +471,7 @@ LLUUID cmdline_partial_name2key(std::string partial_name)
 	LLStringUtil::toLower(partial_name);
 	LLWorld::getInstance()->getAvatars(&avatars);
 	typedef std::vector<LLUUID>::const_iterator av_iter;
-	bool has_avatarlist = (LLFloaterAvatarList::getInstance() ? true : false);
+	bool has_avatarlist = LLFloaterAvatarList::instanceExists();
 	if(has_avatarlist)
 		LLFloaterAvatarList::getInstance()->updateAvatarList();
 	for(av_iter i = avatars.begin(); i != avatars.end(); ++i)
@@ -511,7 +511,7 @@ void cmdline_tp2name(std::string target)
 		cmdline_printchat("Avatar not found.");
 		return;
 	}
-	LLFloaterAvatarList* avlist = LLFloaterAvatarList::getInstance();
+	LLFloaterAvatarList* avlist = LLFloaterAvatarList::instanceExists() ? LLFloaterAvatarList::getInstance() : NULL;
 	LLVOAvatar* avatarp = gObjectList.findAvatar(avkey);
 	if(avatarp)
 	{
--- a/indra/newview/llcompilequeue.cpp
+++ b/indra/newview/llcompilequeue.cpp
@@ -515,6 +515,7 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
 	delete data;
 }

+#if 0 //Client side compiling disabled.
 // static
 void LLFloaterCompileQueue::onSaveTextComplete(const LLUUID& asset_id, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
@@ -551,7 +552,6 @@ void LLFloaterCompileQueue::onSaveBytecodeComplete(const LLUUID& asset_id, void*
 }

 // compile the file given and save it out.
-#if 0 //Client side compiling disabled.
 void LLFloaterCompileQueue::compile(const std::string& filename,
 									const LLUUID& item_id)
 {
--- a/indra/newview/llcompilequeue.h
+++ b/indra/newview/llcompilequeue.h
@@ -136,10 +136,6 @@ public:
 	// will be responsible for it's own destruction.
 	static LLFloaterCompileQueue* create(BOOL mono);

-	static void onSaveBytecodeComplete(const LLUUID& asset_id,
-									void* user_data,
-									S32 status);
-									
 	// remove any object in mScriptScripts with the matching uuid.
 	void removeItemByItemID(const LLUUID& item_id);

@@ -158,6 +154,7 @@ protected:
 								LLAssetType::EType type,
 								void* user_data, S32 status, LLExtStat ext_status);

+#if 0 //Client side compiling disabled.
 	static void onSaveTextComplete(const LLUUID& asset_id, void* user_data, S32 status, LLExtStat ext_status);

 	static void onSaveBytecodeComplete(const LLUUID& asset_id,
@@ -165,7 +162,6 @@ protected:
 									   S32 status, LLExtStat ext_status);

 	// compile the file given and save it out.
-#if 0 //Client side compiling disabled.
 	void compile(const std::string& filename, const LLUUID& asset_id);
 #endif
 	
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -84,6 +84,8 @@ typedef enum e_radar_alert_type
 	ALERT_TYPE_AGE = 16,
 } ERadarAlertType;

+namespace
+{
 void chat_avatar_status(std::string name, LLUUID key, ERadarAlertType type, bool entering)
 {
 	if(gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) return; //RLVa:LF Don't announce people are around when blind, that cheats the system.
@@ -94,7 +96,6 @@ void chat_avatar_status(std::string name, LLUUID key, ERadarAlertType type, bool
 	static LLCachedControl<bool> radar_alert_shout_range(gSavedSettings, "RadarAlertShoutRange");
 	static LLCachedControl<bool> radar_alert_chat_range(gSavedSettings, "RadarAlertChatRange");
 	static LLCachedControl<bool> radar_alert_age(gSavedSettings, "RadarAlertAge");
-	static LLCachedControl<bool> radar_chat_keys(gSavedSettings, "RadarChatKeys");

 	LLFloaterAvatarList* self = LLFloaterAvatarList::getInstance();
 	LLStringUtil::format_map_t args;
@@ -153,6 +154,21 @@ void chat_avatar_status(std::string name, LLUUID key, ERadarAlertType type, bool
 	}
 }

+	void send_keys_message(const int transact_num, const int num_ids, const std::string ids)
+	{
+		gMessageSystem->newMessage("ScriptDialogReply");
+		gMessageSystem->nextBlock("AgentData");
+		gMessageSystem->addUUID("AgentID", gAgent.getID());
+		gMessageSystem->addUUID("SessionID", gAgent.getSessionID());
+		gMessageSystem->nextBlock("Data");
+		gMessageSystem->addUUID("ObjectID", gAgent.getID());
+		gMessageSystem->addS32("ChatChannel", -777777777);
+		gMessageSystem->addS32("ButtonIndex", 1);
+		gMessageSystem->addString("ButtonLabel", llformat("%d,%d", transact_num, num_ids) + ids);
+		gAgent.sendReliableMessage();
+	}
+} //namespace
+
 LLAvatarListEntry::LLAvatarListEntry(const LLUUID& id, const std::string &name, const LLVector3d &position) :
 		mID(id), mName(name), mPosition(position), mDrawPosition(), mMarked(false), mFocused(false),
 		mUpdateTimer(), mFrame(gFrameCount), mInSimFrame(U32_MAX), mInDrawFrame(U32_MAX),
@@ -427,7 +443,7 @@ BOOL LLFloaterAvatarList::postBuild()
 	return TRUE;
 }

-void col_helper(const bool hide, const std::string width_ctrl_name, LLScrollListColumn* col)
+void col_helper(const bool hide, LLCachedControl<S32> &setting, LLScrollListColumn* col)
 {
 	// Brief Explanation:
 	// Check if we want the column hidden, and if it's still showing. If so, hide it, but save its width.
@@ -437,44 +453,55 @@ void col_helper(const bool hide, const std::string width_ctrl_name, LLScrollList

 	if (hide && width)
 	{
-		gSavedSettings.setS32(width_ctrl_name, width);
+		setting = width;
 		col->setWidth(0);
 	}
 	else if(!hide && !width)
 	{
-		llinfos << "We got into the setter!!" << llendl;
-		col->setWidth(gSavedSettings.getS32(width_ctrl_name));
+		col->setWidth(setting);
 	}
 }

+//Macro to reduce redundant lines. Preprocessor concatenation and stringizing avoids bloat that
+//wrapping in a class would create.
+#define BIND_COLUMN_TO_SETTINGS(col, name)\
+	static const LLCachedControl<bool> hide_##name(gSavedSettings, "RadarColumn"#name"Hidden");\
+	static LLCachedControl<S32> width_##name(gSavedSettings, "RadarColumn"#name"Width");\
+	col_helper(hide_##name, width_##name, mAvatarList->getColumn(col));
+
 void LLFloaterAvatarList::assessColumns()
 {
-	static LLCachedControl<bool> hide_mark(gSavedSettings, "RadarColumnMarkHidden");
-	col_helper(hide_mark, "RadarColumnMarkWidth", mAvatarList->getColumn(LIST_MARK));
+	BIND_COLUMN_TO_SETTINGS(LIST_MARK,Mark);
+	BIND_COLUMN_TO_SETTINGS(LIST_POSITION,Position);
+	BIND_COLUMN_TO_SETTINGS(LIST_ALTITUDE,Altitude);
+	BIND_COLUMN_TO_SETTINGS(LIST_ACTIVITY,Activity);
+	BIND_COLUMN_TO_SETTINGS(LIST_AGE,Age);
+	BIND_COLUMN_TO_SETTINGS(LIST_TIME,Time);

-	static LLCachedControl<bool> hide_pos(gSavedSettings, "RadarColumnPositionHidden");
-	col_helper(hide_pos, "RadarColumnPositionWidth", mAvatarList->getColumn(LIST_POSITION));
+	static const LLCachedControl<bool> hide_client(gSavedSettings, "RadarColumnClientHidden");
+	static LLCachedControl<S32> width_name(gSavedSettings, "RadarColumnNameWidth");
+	bool client_hidden = hide_client || gHippoGridManager->getConnectedGrid()->isSecondLife();
+	LLScrollListColumn* name_col = mAvatarList->getColumn(LIST_AVATAR_NAME);
+	LLScrollListColumn* client_col = mAvatarList->getColumn(LIST_CLIENT);

-	static LLCachedControl<bool> hide_alt(gSavedSettings, "RadarColumnAltitudeHidden");
-	col_helper(hide_alt, "RadarColumnAltitudeWidth", mAvatarList->getColumn(LIST_ALTITUDE));
+	if (client_hidden != !!name_col->mDynamicWidth)
+	{
+		//Don't save if its being hidden because of detected grid. Not that it really matters, as this setting(along with the other RadarColumn*Width settings)
+		//isn't handled in a way that allows it to carry across sessions, but I assume that may want to be fixed in the future..
+		if(client_hidden && !gHippoGridManager->getConnectedGrid()->isSecondLife() && name_col->getWidth() > 0)
+			width_name = name_col->getWidth();

-	static LLCachedControl<bool> hide_act(gSavedSettings, "RadarColumnActivityHidden");
-	col_helper(hide_act, "RadarColumnActivityWidth", mAvatarList->getColumn(LIST_ACTIVITY));
+		//MUST call setWidth(0) first to clear out mTotalStaticColumnWidth accumulation in parent before changing the mDynamicWidth value
+		client_col->setWidth(0);
+		name_col->setWidth(0);

-	static LLCachedControl<bool> hide_age(gSavedSettings, "RadarColumnAgeHidden");
-	col_helper(hide_age, "RadarColumnAgeWidth", mAvatarList->getColumn(LIST_AGE));
+		client_col->mDynamicWidth =	!client_hidden;
+		name_col->mDynamicWidth =	 client_hidden;

-	static LLCachedControl<bool> hide_time(gSavedSettings, "RadarColumnTimeHidden");
-	col_helper(hide_time, "RadarColumnTimeWidth", mAvatarList->getColumn(LIST_TIME));
-
-	static LLCachedControl<bool> hide_client(gSavedSettings, "RadarColumnClientHidden");
-	if (gHippoGridManager->getConnectedGrid()->isSecondLife() || hide_client){
-		mAvatarList->getColumn(LIST_AVATAR_NAME)->setWidth(0);
-		mAvatarList->getColumn(LIST_CLIENT)->setWidth(0);
-		mAvatarList->getColumn(LIST_CLIENT)->mDynamicWidth = FALSE;
-		mAvatarList->getColumn(LIST_CLIENT)->mRelWidth = 0;
-		mAvatarList->getColumn(LIST_AVATAR_NAME)->mDynamicWidth = TRUE;
-		mAvatarList->getColumn(LIST_AVATAR_NAME)->mRelWidth = -1;
+		if(!client_hidden)
+		{
+			name_col->setWidth(width_name);
+		}
 	}
 	else if (!hide_client)
 	{
@@ -567,7 +594,7 @@ void LLFloaterAvatarList::updateAvatarList()
 		size_t i;
 		size_t count = avatar_ids.size();

-		bool announce = gSavedSettings.getBOOL("RadarChatKeys");
+		static LLCachedControl<bool> announce(gSavedSettings, "RadarChatKeys");
 		std::queue<LLUUID> announce_keys;

 		for (i = 0; i < count; ++i)
@@ -659,8 +686,9 @@ void LLFloaterAvatarList::updateAvatarList()
 			}
 		}
 		//let us send the keys in a more timely fashion
-		if(announce && !announce_keys.empty())
+		if (announce && !announce_keys.empty())
 		{
+			// NOTE: This fragment is repeated in sendKey
 			std::ostringstream ids;
 			int transact_num = (int)gFrameCount;
 			int num_ids = 0;
@@ -672,37 +700,17 @@ void LLFloaterAvatarList::updateAvatarList()
 				ids << "," << id.asString();
 				++num_ids;

-				if(ids.tellp() > 200)
+				if (ids.tellp() > 200)
 				{
-					gMessageSystem->newMessage("ScriptDialogReply");
-					gMessageSystem->nextBlock("AgentData");
-					gMessageSystem->addUUID("AgentID", gAgent.getID());
-					gMessageSystem->addUUID("SessionID", gAgent.getSessionID());
-					gMessageSystem->nextBlock("Data");
-					gMessageSystem->addUUID("ObjectID", gAgent.getID());
-					gMessageSystem->addS32("ChatChannel", -777777777);
-					gMessageSystem->addS32("ButtonIndex", 1);
-					gMessageSystem->addString("ButtonLabel",llformat("%d,%d", transact_num, num_ids) + ids.str());
-					gAgent.sendReliableMessage();
+					send_keys_message(transact_num, num_ids, ids.str());

 					num_ids = 0;
 					ids.seekp(0);
 					ids.str("");
 				}
 			}
-			if(num_ids > 0)
-			{
-				gMessageSystem->newMessage("ScriptDialogReply");
-				gMessageSystem->nextBlock("AgentData");
-				gMessageSystem->addUUID("AgentID", gAgent.getID());
-				gMessageSystem->addUUID("SessionID", gAgent.getSessionID());
-				gMessageSystem->nextBlock("Data");
-				gMessageSystem->addUUID("ObjectID", gAgent.getID());
-				gMessageSystem->addS32("ChatChannel", -777777777);
-				gMessageSystem->addS32("ButtonIndex", 1);
-				gMessageSystem->addString("ButtonLabel",llformat("%d,%d", transact_num, num_ids) + ids.str());
-				gAgent.sendReliableMessage();
-			}
+			if (num_ids > 0)
+				send_keys_message(transact_num, num_ids, ids.str());
 		}
 	}

@@ -1396,19 +1404,17 @@ void LLFloaterAvatarList::onClickGetKey()

 void LLFloaterAvatarList::sendKeys()
 {
+	// This would break for send_keys_btn callback, check this beforehand, if it matters.
+	//static LLCachedControl<bool> radar_chat_keys(gSavedSettings, "RadarChatKeys");
+	//if (radar_chat_keys) return;
+
 	LLViewerRegion* regionp = gAgent.getRegion();
-	if(!regionp)return;//ALWAYS VALIDATE DATA
-	std::ostringstream ids;
+	if (!regionp) return;//ALWAYS VALIDATE DATA
+
 	static int last_transact_num = 0;
 	int transact_num = (int)gFrameCount;
-	int num_ids = 0;

-	if(!gSavedSettings.getBOOL("RadarChatKeys"))
-	{
-		return;
-	}
-
-	if(transact_num > last_transact_num)
+	if (transact_num > last_transact_num)
 	{
 		last_transact_num = transact_num;
 	}
@@ -1419,7 +1425,9 @@ void LLFloaterAvatarList::sendKeys()
 		return;
 	}

-	if (!regionp) return; // caused crash if logged out/connection lost
+	std::ostringstream ids;
+	int num_ids = 0;
+
 	for (int i = 0; i < regionp->mMapAvatarIDs.count(); i++)
 	{
 		const LLUUID &id = regionp->mMapAvatarIDs.get(i);
@@ -1428,67 +1436,54 @@ void LLFloaterAvatarList::sendKeys()
 		++num_ids;


-		if(ids.tellp() > 200)
+		if (ids.tellp() > 200)
 		{
-			gMessageSystem->newMessage("ScriptDialogReply");
-			gMessageSystem->nextBlock("AgentData");
-			gMessageSystem->addUUID("AgentID", gAgent.getID());
-			gMessageSystem->addUUID("SessionID", gAgent.getSessionID());
-			gMessageSystem->nextBlock("Data");
-			gMessageSystem->addUUID("ObjectID", gAgent.getID());
-			gMessageSystem->addS32("ChatChannel", -777777777);
-			gMessageSystem->addS32("ButtonIndex", 1);
-			gMessageSystem->addString("ButtonLabel",llformat("%d,%d", transact_num, num_ids) + ids.str());
-			gAgent.sendReliableMessage();
+			send_keys_message(transact_num, num_ids, ids.str());

 			num_ids = 0;
 			ids.seekp(0);
 			ids.str("");
 		}
 	}
-	if(num_ids > 0)
-	{
-		gMessageSystem->newMessage("ScriptDialogReply");
-		gMessageSystem->nextBlock("AgentData");
-		gMessageSystem->addUUID("AgentID", gAgent.getID());
-		gMessageSystem->addUUID("SessionID", gAgent.getSessionID());
-		gMessageSystem->nextBlock("Data");
-		gMessageSystem->addUUID("ObjectID", gAgent.getID());
-		gMessageSystem->addS32("ChatChannel", -777777777);
-		gMessageSystem->addS32("ButtonIndex", 1);
-		gMessageSystem->addString("ButtonLabel",llformat("%d,%d", transact_num, num_ids) + ids.str());
-		gAgent.sendReliableMessage();
-	}
+	if (num_ids > 0)
+		send_keys_message(transact_num, num_ids, ids.str());
 }
 //static
 void LLFloaterAvatarList::sound_trigger_hook(LLMessageSystem* msg,void **)
 {
+	if (!LLFloaterAvatarList::instanceExists()) return; // Don't bother if we're closed.
+
 	LLUUID  sound_id,owner_id;
 	msg->getUUIDFast(_PREHASH_SoundData, _PREHASH_SoundID, sound_id);
 	msg->getUUIDFast(_PREHASH_SoundData, _PREHASH_OwnerID, owner_id);
-	if(owner_id == gAgent.getID() && sound_id == LLUUID("76c78607-93f9-f55a-5238-e19b1a181389"))
+	if (owner_id == gAgent.getID() && sound_id == LLUUID("76c78607-93f9-f55a-5238-e19b1a181389"))
 	{
-		//let's ask if they want to turn it on.
-		if(gSavedSettings.getBOOL("RadarChatKeys"))
-		{
+		static LLCachedControl<bool> on("RadarChatKeys");
+		static LLCachedControl<bool> do_not_ask("RadarChatKeysStopAsking");
+		if (on)
 			LLFloaterAvatarList::getInstance()->sendKeys();
-		}else
-		{
-			LLSD args;
-			args["MESSAGE"] = "An object owned by you has request the keys from your radar.\nWould you like to enable announcing keys to objects in the sim?";
-			LLNotificationsUtil::add("GenericAlertYesCancel", args, LLSD(), onConfirmRadarChatKeys);
-		}
+		else if (!do_not_ask) // Let's ask if they want to turn it on, but not pester them.
+			LLNotificationsUtil::add("RadarChatKeysRequest", LLSD(), LLSD(), onConfirmRadarChatKeys);
 	}
 }
 // static
 bool LLFloaterAvatarList::onConfirmRadarChatKeys(const LLSD& notification, const LLSD& response )
 {
 	S32 option = LLNotification::getSelectedOption(notification, response);
-	if(option == 0) // yes
+	if (option == 1) // no
 	{
-		gSavedSettings.setBOOL("RadarChatKeys",TRUE);
+		return false;
+	}
+	else if (option == 0) // yes
+	{
+		gSavedSettings.setBOOL("RadarChatKeys", true);
 		LLFloaterAvatarList::getInstance()->sendKeys();
 	}
+	else if (option == 2) // No, and stop asking!!
+	{
+		gSavedSettings.setBOOL("RadarChatKeysStopAsking", true);
+	}
+
 	return false;
 }

--- a/indra/newview/llfloaterbulkpermission.cpp
+++ b/indra/newview/llfloaterbulkpermission.cpp
@@ -180,7 +180,7 @@ void LLFloaterBulkPermission::onCommitCopy(LLUICtrl* ctrl, void* data)
 BOOL LLFloaterBulkPermission::start()
 {
 	// note: number of top-level objects to modify is mObjectIDs.count().
-	getChild<LLScrollListCtrl>("queue output")->setCommentText(getString("start_text"));
+	getChild<LLScrollListCtrl>("queue output")->addSimpleElement(getString("start_text"));
 	return nextObject();
 }

@@ -203,7 +203,7 @@ BOOL LLFloaterBulkPermission::nextObject()

 	if(isDone() && !mDone)
 	{
-		getChild<LLScrollListCtrl>("queue output")->setCommentText(getString("done_text"));
+		getChild<LLScrollListCtrl>("queue output")->addSimpleElement(getString("done_text"));
 		mDone = TRUE;
 	}
 	return successful_start;
@@ -349,7 +349,7 @@ void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj,  LLInv
 					status_text.setArg("[STATUS]", "");
 				}
 				
-				list->setCommentText(status_text.getString());
+				list->addSimpleElement(status_text.getString());

 				//TODO if we are an object inside an object we should check a recuse flag and if set
 				//open the inventory of the object and recurse - Michelle2 Zenovka
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -345,6 +345,7 @@ public:

 	LLToolset*	mLastToolset;
 	boost::signals2::connection mQualityMouseUpConnection;
+	LLFocusableElement* mPrevDefaultKeyboardFocus;
 };

 //----------------------------------------------------------------------------
@@ -1688,8 +1689,8 @@ void LLFloaterSnapshot::Impl::freezeTime(bool on)
 	LLSnapshotLivePreview* previewp = getPreviewView();
 	if (on)
 	{
-		// stop all mouse events at fullscreen preview layer
-		sInstance->getParent()->setMouseOpaque(TRUE);
+		// Stop all mouse events at fullscreen preview layer.
+		gSnapshotFloaterView->setMouseOpaque(TRUE);

 		// can see and interact with fullscreen preview now
 		if (previewp)
@@ -1713,10 +1714,19 @@ void LLFloaterSnapshot::Impl::freezeTime(bool on)
 			sInstance->impl.mLastToolset = LLToolMgr::getInstance()->getCurrentToolset();
 			LLToolMgr::getInstance()->setCurrentToolset(gCameraToolset);
 		}
+
+		// Make sure the floater keeps focus so that pressing ESC stops Freeze Time mode.
+		sInstance->impl.mPrevDefaultKeyboardFocus = gFocusMgr.getDefaultKeyboardFocus();
+		gFocusMgr.setDefaultKeyboardFocus(sInstance);
 	}
-	else // turning off freeze frame mode
+	else if (gSavedSettings.getBOOL("FreezeTime")) // turning off freeze frame mode
 	{
-		sInstance->getParent()->setMouseOpaque(FALSE);
+		// Restore default keyboard focus.
+		gFocusMgr.setDefaultKeyboardFocus(sInstance->impl.mPrevDefaultKeyboardFocus);
+		sInstance->impl.mPrevDefaultKeyboardFocus = NULL;
+
+		gSnapshotFloaterView->setMouseOpaque(FALSE);
+
 		if (previewp)
 		{
 			previewp->setVisible(FALSE);
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -457,18 +457,7 @@ LLView* LLNameListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
 	}

 	std::string contents = node->getTextContents();
-
-	typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-	boost::char_separator<char> sep("\t\n");
-	tokenizer tokens(contents, sep);
-	tokenizer::iterator token_iter = tokens.begin();
-
-	while(token_iter != tokens.end())
-	{
-		const std::string& line = *token_iter;
-		name_list->setCommentText(line);
-		++token_iter;
-	}
+	name_list->setCommentText(contents);

 	return name_list;
 }
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -130,6 +130,10 @@ LLVector3 LLPanelObject::mClipboardPos;
 LLVector3 LLPanelObject::mClipboardSize;
 LLVector3 LLPanelObject::mClipboardRot;
 LLVolumeParams LLPanelObject::mClipboardVolumeParams;
+LLFlexibleObjectData* LLPanelObject::mClipboardFlexiParams = NULL;
+LLLightParams* LLPanelObject::mClipboardLightParams = NULL;
+LLSculptParams* LLPanelObject::mClipboardSculptParams = NULL;
+LLLightImageParams* LLPanelObject::mClipboardLightImageParams = NULL;
 BOOL LLPanelObject::hasParamClipboard = FALSE;

 BOOL	LLPanelObject::postBuild()
@@ -2493,15 +2497,65 @@ void LLPanelObject::onCopyRot(void* user_data)
 void LLPanelObject::onCopyParams(void* user_data)
 {
 	LLPanelObject* self = (LLPanelObject*) user_data;
+	if (!self) return;
+
 	self->getVolumeParams(mClipboardVolumeParams);
 	hasParamClipboard = TRUE;
+
+	LLViewerObject* objp = self->mObject;
+
+	mClipboardFlexiParams = (LLFlexibleObjectData*)objp->getParameterEntry(LLNetworkData::PARAMS_FLEXIBLE);
+	mClipboardLightParams = (LLLightParams*)objp->getParameterEntry(LLNetworkData::PARAMS_LIGHT);
+	mClipboardSculptParams = (LLSculptParams*)objp->getParameterEntry(LLNetworkData::PARAMS_SCULPT);
+	if (mClipboardSculptParams)
+	{
+		LLUUID id = mClipboardSculptParams->getSculptTexture();
+
+		// Texture perms check
+		if (!(id.isNull() || gInventory.isObjectDescendentOf(id, gInventory.getLibraryRootFolderID())
+			 || id == LLUUID(gSavedSettings.getString("UIImgWhiteUUID"))
+			 || id == LLUUID(gSavedSettings.getString("UIImgInvisibleUUID"))
+			 || id == LLUUID(std::string("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"))) // alpha
+			&& findItemID(id).isNull())
+		{
+			mClipboardSculptParams->setSculptTexture(LLUUID(SCULPT_DEFAULT_TEXTURE));
+		}
+	}
+	mClipboardLightImageParams = (LLLightImageParams*)objp->getParameterEntry(LLNetworkData::PARAMS_LIGHT_IMAGE);
+	if (mClipboardLightImageParams)
+	{
+		LLUUID id = mClipboardLightImageParams->getLightTexture();
+
+		// Texture perms check
+		if (!(id.isNull() || gInventory.isObjectDescendentOf(id, gInventory.getLibraryRootFolderID())
+			 || id == LLUUID(gSavedSettings.getString("UIImgWhiteUUID"))
+			 || id == LLUUID(gSavedSettings.getString("UIImgInvisibleUUID"))
+			 || id == LLUUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"))) // alpha
+		{
+			mClipboardLightImageParams->setLightTexture(findItemID(id));
+		}
+	}
 }

 void LLPanelObject::onPasteParams(void* user_data)
 {
+	if(!hasParamClipboard) return;
+
 	LLPanelObject* self = (LLPanelObject*) user_data;
-	if(hasParamClipboard)
-		self->mObject->updateVolume(mClipboardVolumeParams);
+	if(!self) return;
+
+	LLViewerObject* objp = self->mObject;
+
+	objp->updateVolume(mClipboardVolumeParams);
+
+	if (mClipboardFlexiParams)
+		objp->setParameterEntry(LLNetworkData::PARAMS_FLEXIBLE, *mClipboardFlexiParams, true);
+	if (mClipboardLightParams)
+		objp->setParameterEntry(LLNetworkData::PARAMS_LIGHT, *mClipboardLightParams, true);
+	if (mClipboardSculptParams)
+		objp->setParameterEntry(LLNetworkData::PARAMS_SCULPT, *mClipboardSculptParams, true);
+	if (mClipboardLightImageParams)
+		objp->setParameterEntry(LLNetworkData::PARAMS_LIGHT_IMAGE, *mClipboardLightImageParams, true);
 }

 void LLPanelObject::onLinkObj(void* user_data)
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -50,6 +50,10 @@ class LLColorSwatchCtrl;
 class LLTextureCtrl;
 class LLInventoryItem;
 class LLUUID;
+class LLFlexibleObjectData;
+class LLLightParams;
+class LLLightImageParams;
+class LLSculptParams;

 class LLPanelObject : public LLPanel
 {
@@ -119,6 +123,10 @@ protected:
 	static LLVector3 mClipboardSize;
 	static LLVector3 mClipboardRot;
 	static LLVolumeParams mClipboardVolumeParams;
+	static LLFlexibleObjectData* mClipboardFlexiParams;
+	static LLLightParams* mClipboardLightParams;
+	static LLSculptParams* mClipboardSculptParams;
+	static LLLightImageParams* mClipboardLightImageParams;
 	static BOOL hasParamClipboard;

 	S32				mComboMaterialItemCount;
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -485,10 +485,7 @@ bool LLScriptEdCore::writeToFile(const std::string& filename)
 	{
 		llwarns << "Unable to write to " << filename << llendl;

-		LLSD row;
-		row["columns"][0]["value"] = "Error writing to local file. Is your hard drive full?";
-		row["columns"][0]["font"] = "SANSSERIF_SMALL";
-		mErrorList->addElement(row);
+		mErrorList->addSimpleElement(LLTrans::getString("CompileQueueProblemWriting"));
 		return false;
 	}

@@ -653,15 +650,12 @@ void LLScriptEdCore::autoSave()
 		//mAutosaveFilename = llformat("%s.lsl", asfilename.c_str());		
 	}
 	
-	FILE* fp = LLFile::fopen(mAutosaveFilename.c_str(), "wb");
+	LLFILE* fp = LLFile::fopen(mAutosaveFilename.c_str(), "wb");
 	if(!fp)
 	{
 		llwarns << "Unable to write to " << mAutosaveFilename << llendl;
 		
-		LLSD row;
-		row["columns"][0]["value"] = "Error writing to temp file. Is your hard drive full?";
-		row["columns"][0]["font"] = "SANSSERIF_SMALL";
-		mErrorList->addElement(row);
+		mErrorList->addSimpleElement(LLTrans::getString("CompileQueueProblemWriting"));
 		return;
 	}
 	
@@ -706,9 +700,7 @@ void LLScriptEdCore::addHelpItemToHistory(const std::string& help_string)
 	// separate history items from full item list
 	if (mLiveHelpHistorySize == 0)
 	{
-		LLSD row;
-		row["columns"][0]["type"] = "separator";
-		history_combo->addElement(row, ADD_TOP);
+		history_combo->addSeparator(ADD_TOP);
 	}
 	// delete all history items over history limit
 	while(mLiveHelpHistorySize > MAX_HISTORY_COUNT - 1)
@@ -1321,8 +1313,8 @@ LLPreviewLSL::LLPreviewLSL(const std::string& name, const LLRect& rect,
 void LLPreviewLSL::callbackLSLCompileSucceeded()
 {
 	llinfos << "LSL Bytecode saved" << llendl;
-	mScriptEd->mErrorList->setCommentText(LLTrans::getString("CompileSuccessful"));
-	mScriptEd->mErrorList->setCommentText(LLTrans::getString("SaveComplete"));
+	mScriptEd->mErrorList->addSimpleElement(LLTrans::getString("CompileSuccessful"));
+	mScriptEd->mErrorList->addSimpleElement(LLTrans::getString("SaveComplete"));
 	closeIfNeeded();
 }

@@ -1338,6 +1330,7 @@ void LLPreviewLSL::callbackLSLCompileFailed(const LLSD& compile_errors)
 		LLSD row;
 		std::string error_message = line->asString();
 		LLStringUtil::stripNonprintable(error_message);
+		row["columns"][0]["column"] = "default_column";
 		row["columns"][0]["value"] = error_message;
 		row["columns"][0]["font"] = "OCRA";
 		mScriptEd->mErrorList->addElement(row);
@@ -1480,10 +1473,7 @@ void LLPreviewLSL::saveIfNeeded()
 	{
 		llwarns << "Unable to write to " << filename << llendl;

-		LLSD row;
-		row["columns"][0]["value"] = "Error writing to local file. Is your hard drive full?";
-		row["columns"][0]["font"] = "SANSSERIF_SMALL";
-		mScriptEd->mErrorList->addElement(row);
+		mScriptEd->mErrorList->addSimpleElement(LLTrans::getString("CompileQueueProblemWriting"));
 		return;
 	}

@@ -1506,9 +1496,7 @@ void LLPreviewLSL::saveIfNeeded()
 		else
 		{
 			LLSD row;
-			row["columns"][0]["value"] = LLTrans::getString("CompileQueueProblemUploading");
-			row["columns"][0]["font"] = "SANSSERIF_SMALL";
-			mScriptEd->mErrorList->addElement(row);
+			mScriptEd->mErrorList->addSimpleElement(LLTrans::getString("CompileQueueProblemUploading"));
 			LLFile::remove(filename);
 		}
 #if 0 //Client side compiling disabled.
@@ -1622,7 +1610,6 @@ void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
 	LLFile::remove(err_filename);
 	LLFile::remove(dst_filename);
 }
-#endif

 // static
 void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
@@ -1710,6 +1697,7 @@ void LLPreviewLSL::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_d
 	}
 	delete instance_uuid;
 }
+#endif

 // static
 void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAssetType::EType type,
@@ -1931,8 +1919,8 @@ void LLLiveLSLEditor::callbackLSLCompileSucceeded(const LLUUID& task_id,
 												  bool is_script_running)
 {
 	lldebugs << "LSL Bytecode saved" << llendl;
-	mScriptEd->mErrorList->setCommentText(LLTrans::getString("CompileSuccessful"));
-	mScriptEd->mErrorList->setCommentText(LLTrans::getString("SaveComplete"));
+	mScriptEd->mErrorList->addSimpleElement(LLTrans::getString("CompileSuccessful"));
+	mScriptEd->mErrorList->addSimpleElement(LLTrans::getString("SaveComplete"));
 	closeIfNeeded();
 }

@@ -1947,6 +1935,7 @@ void LLLiveLSLEditor::callbackLSLCompileFailed(const LLSD& compile_errors)
 		LLSD row;
 		std::string error_message = line->asString();
 		LLStringUtil::stripNonprintable(error_message);
+		row["columns"][0]["column"] = "default_column";
 		row["columns"][0]["value"] = error_message;
 		row["columns"][0]["font"] = "OCRA";
 		mScriptEd->mErrorList->addElement(row);
@@ -2389,10 +2378,7 @@ void LLLiveLSLEditor::saveIfNeeded()
 	{
 		llwarns << "Unable to write to " << filename << llendl;

-		LLSD row;
-		row["columns"][0]["value"] = "Error writing to local file. Is your hard drive full?";
-		row["columns"][0]["font"] = "SANSSERIF_SMALL";
-		mScriptEd->mErrorList->addElement(row);
+		mScriptEd->mErrorList->addSimpleElement(LLTrans::getString("CompileQueueProblemWriting"));
 		return;
 	}
 	std::string utf8text = mScriptEd->mEditor->getText();
@@ -2419,10 +2405,7 @@ void LLLiveLSLEditor::saveIfNeeded()
 	}
 	else
 	{
-		LLSD row;
-		row["columns"][0]["value"] = LLTrans::getString("CompileQueueProblemUploading");
-		row["columns"][0]["font"] = "SANSSERIF_SMALL";
-		mScriptEd->mErrorList->addElement(row);
+		mScriptEd->mErrorList->addSimpleElement(LLTrans::getString("CompileQueueProblemUploading"));
 		LLFile::remove(filename);
 	}
 #if 0 //Client side compiling disabled.
@@ -2548,7 +2531,6 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
 	runningCheckbox->setLabel(getString("script_running"));
 	runningCheckbox->setEnabled(TRUE);
 }
-#endif

 void LLLiveLSLEditor::onSaveTextComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
@@ -2579,7 +2561,6 @@ void LLLiveLSLEditor::onSaveTextComplete(const LLUUID& asset_uuid, void* user_da
 	data = NULL;
 }

-
 void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
 	LLLiveLSLSaveData* data = (LLLiveLSLSaveData*)user_data;
@@ -2593,7 +2574,7 @@ void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* use
 		if(self)
 		{
 			// Tell the user that the compile worked.
-			self->mScriptEd->mErrorList->setCommentText(LLTrans::getString("SaveComplete"));
+			self->mScriptEd->mErrorList->addSimpleElement(LLTrans::getString("SaveComplete"));
 			// close the window if this completes both uploads
 			self->getWindow()->decBusyCount();
 			self->mPendingUploads--;
@@ -2627,6 +2608,7 @@ void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* use
 	LLFile::remove(dst_filename);
 	delete data;
 }
+#endif

 void LLLiveLSLEditor::open()
 {
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -202,9 +202,11 @@ protected:
 	void uploadAssetViaCaps(const std::string& url,
 							const std::string& filename, 
 							const LLUUID& item_id);
+#if 0 //Client side compiling disabled.
 	void uploadAssetLegacy(const std::string& filename,
 							const LLUUID& item_id,
 							const LLTransactionID& tid);
+#endif
 	// <edit>
 	virtual BOOL canSaveAs() const;
 	virtual void saveAs();
@@ -218,8 +220,10 @@ protected:
 	static void onLoadComplete(LLVFS *vfs, const LLUUID& uuid,
 							   LLAssetType::EType type,
 							   void* user_data, S32 status, LLExtStat ext_status);
+#if 0 //Client side compiling disabled.
 	static void onSaveComplete(const LLUUID& uuid, void* user_data, S32 status, LLExtStat ext_status);
 	static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
+#endif
 public:
 	static LLPreviewLSL* getInstance(const LLUUID& uuid);
 	LLTextEditor* getEditor() { return mScriptEd->mEditor; }
@@ -275,10 +279,12 @@ protected:
 							const LLUUID& task_id,
 							const LLUUID& item_id,
 							BOOL is_running);
+#if 0 //Client side compiling disabled.
 	void uploadAssetLegacy(const std::string& filename,
 						   LLViewerObject* object,
 						   const LLTransactionID& tid,
 						   BOOL is_running);
+#endif
 	// <edit>
 	virtual BOOL canSaveAs() const;
 	virtual void saveAs();
@@ -292,8 +298,10 @@ protected:
 	static void onLoadComplete(LLVFS *vfs, const LLUUID& asset_uuid,
 							   LLAssetType::EType type,
 							   void* user_data, S32 status, LLExtStat ext_status);
+#if 0 //Client side compiling disabled.
 	static void onSaveTextComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
 	static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
+#endif
 	static void onRunningCheckboxClicked(LLUICtrl*, void* userdata);
 	static void onReset(void* userdata);

--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -4655,8 +4655,8 @@ void LLSelectMgr::packObjectName(LLSelectNode* node, void* user_data)
 void LLSelectMgr::packObjectDescription(LLSelectNode* node, void* user_data)
 {
 	const std::string* desc = (const std::string*)user_data;
-	if(!desc->empty())
-	{
+	if(desc)
+	{	// Empty (non-null, but zero length) descriptions are OK
 		gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
 		gMessageSystem->addU32Fast(_PREHASH_LocalID, node->getObject()->getLocalID());
 		gMessageSystem->addStringFast(_PREHASH_Description, *desc);
--- a/indra/newview/lltexturecache.h
+++ b/indra/newview/lltexturecache.h
@@ -24,7 +24,7 @@
 * $/LicenseInfo$
 */

-#ifndef LL_LLTEXTURECACHE_
+#ifndef LL_LLTEXTURECACHE_H
 #define LL_LLTEXTURECACHE_H

 #include "lldir.h"
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -272,7 +272,8 @@ void LLToolMgr::updateToolStatus()

 bool LLToolMgr::inEdit()
 {
-	return mBaseTool != LLToolPie::getInstance() && mBaseTool != gToolNull;
+	static const LLCachedControl<bool> freeze_time("FreezeTime",false);
+	return mBaseTool != LLToolPie::getInstance() && mBaseTool != gToolNull && (mCurrentToolset != gCameraToolset || !freeze_time);
 }

 bool LLToolMgr::canEdit()
--- a/indra/newview/llwldaycycle.cpp
+++ b/indra/newview/llwldaycycle.cpp
@@ -348,7 +348,7 @@ bool LLWLDayCycle::hasReferencesTo(const LLWLParamKey& keyframe) const
 void LLWLDayCycle::removeReferencesTo(const LLWLParamKey& keyframe)
 {
 	lldebugs << "Removing references to key frame " << keyframe.toLLSD() << llendl;
-	F32 keytime;
+	F32 keytime = 0.f;	// Avoid compiler warning.
 	bool might_exist;
 	do 
 	{
--- a/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
@@ -49,13 +49,13 @@
 	<text bottom_delta="0" follows="top|left" font="SansSerif" left="220" name="steps_label">
 		Steps:
 	</text>
-	<scroll_list bottom_delta="-120" draw_border="true" follows="top|left" height="110"
+  <scroll_list bottom_delta="-120" draw_border="true" follows="top|left" height="110"
 	     left="16" multi_select="false" name="library_list" width="100">
-		Animation
-Sound
-Chat
-Wait
-	</scroll_list>
+    <row name="action_animation" value="Animation"/>
+    <row name="action_sound" value="Sound"/>
+    <row name="action_chat" value="Chat"/>
+    <row name="action_wait" value="Wait"/>
+  </scroll_list>
 	<button bottom_delta="90" follows="top|left" height="20" label="Add &gt;&gt;"
 	     left="130" name="add_btn" width="80" />
 	<button bottom_delta="-30" follows="top|left" height="20" label="Move Up"
--- a/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -779,7 +779,7 @@
 			</text>
 			<button bottom="-24" follows="top|right" font="SansSerifSmall" halign="center"
 			    height="16" label="Copy" left="178" mouse_opaque="true" name="copyparams"  enabled="true"
-			    tool_tip="Copy Parameters from Clipboard"  width="42" />
+			    tool_tip="Copy Parameters to Clipboard"  width="42" />
 			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
 			     height="16" label="Paste" left_delta="42" mouse_opaque="true" name="pasteparams"  enabled="true"
     			 tool_tip="Paste Parameters from Clipboard"  width="42" />
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7622,4 +7622,18 @@ AntiSpam: Blocked [SOURCE] for spamming [TYPE]s [AMOUNT] times in [TIME] seconds
 AntiSpam: Blocked newline flood from [SOURCE] (over [AMOUNT] newlines).
  </notification>

+
+  <notification
+   icon="alertmodal.tga"
+   name="RadarChatKeysRequest"
+   type="alertmodal">
+An object owned by you has requested keys from your radar.
+Would you like to enable announcing keys to objects in the sim?
+    <usetemplate
+     name="yesnocancelbuttons"
+     yestext="Yes"
+     notext="No"
+     canceltext="No, don't ask again!"/>
+  </notification>
+
 </notifications>
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -58,7 +58,7 @@
      <view_border blevel_style="in" bottom_delta="-20" follows="left|top" height="18" left_delta="5" mouse_opaque="false" name="im_give_drop_target_rect" width="220"/>
 	  <text bottom_delta="0" drop_shadow_visible="true" follows="left|top" halign="center" height="16" name="im_give_disp_rect_txt" tool_tip="Drop an inventory item here to have it given along with the auto-response." width="230">Drop item here (Currently: NONE)</text>
 	  <text bottom_delta="140" left_delta="240" follows="left|top" height="18" name="text_box1">Response Text:</text>
-      <text_editor bottom_delta="-110" follows="left|top" height="110" max_length="1100" name="im_response" width="230" word_wrap="true" spell_check="true"/>
+      <text_editor bottom_delta="-110" follows="left|top" height="110" max_length="1100" name="im_response" width="230" word_wrap="true" spell_check="true" hide_scrollbar="true"/>
      <text bottom_delta="-25" follows="left|top" height="18" name="text_box2">
 #f for user's first name, #l for last name,
 #t for timestamp, #r for SLURL to you,
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -196,6 +196,8 @@
 	<string name="AvatarAway">Away</string>
 	<string name="AvatarBusy">Busy</string>
 	<string name="AvatarMuted">Muted</string>
+	<!-- "AvatarLangolier" is used for an avatar that teleported into a Time Frozen scene (only their moving tag is visible).
+		 A Langolier is a creature from Stephen Kings "The Langoliers" that exists outside time and lives by eating the past. -->
 	<string name="AvatarLangolier">Langolier</string>

 	<!-- animations -->
@@ -3115,6 +3117,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="CompileQueueScriptNotFound">Script not found on server.</string>
 	<string name="CompileQueueProblemDownloading">Problem downloading</string>
  <string name="CompileQueueProblemUploading">Sim lacking UpdateScriptTask capabilities. Unable to request recompile</string>
+  <string name="CompileQueueProblemWriting">Error writing to local file. Is your hard drive full?</string>
 	<string name="CompileQueueInsufficientPermDownload">Insufficient permissions to download a script.</string>
 	<string name="CompileQueueInsufficientPermFor">Insufficient permissions for</string>
 	<string name="CompileQueueUnknownFailure">Unknown failure to download</string>
--- a/indra/newview/skins/default/xui/es/floater_chat_history_barless.xml
+++ b/indra/newview/skins/default/xui/es/floater_chat_history_barless.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="chat floater" title="Chat Local">
+	<string name="ringing">
+		Conectándose con el Chat de Voz...
+	</string>
+	<string name="connected">
+		Conectado
+	</string>
+	<string name="unavailable">
+		El Chat de Voz no está disponible en esta ubicación
+	</string>
+	<string name="hang_up">
+		Desconectado del Chat de Voz
+	</string>
+	<string name="IM_logging_string">
+		-- Habilitado el registro de Mensajes Instantáneos --
+	</string>
+	<string name="IM_end_log_string">
+		-- Fin del Registro --
+	</string>
+	<string name="ScriptQuestionCautionChatGranted">
+		'[OBJECTNAME]', al objeto, propiedad de '[OWNERNAME]', ubicado en [REGIONNAME]: [REGIONPOS], se le ha concedido permiso para: [PERMISSIONS].
+	</string>
+	<string name="ScriptQuestionCautionChatDenied">
+		'[OBJECTNAME]', al objeto, propiedad de '[OWNERNAME]', ubicado en [REGIONNAME]: [REGIONPOS], se le ha denegado permiso para: [PERMISSIONS].
+	</string>
+	<string name="ScriptTakeMoney">
+		Transferir dinero ([CURRENCY]) de tu cuenta
+	</string>
+	<string name="ActOnControlInputs">
+		Actuar en tus controles de entrada
+	</string>
+	<string name="RemapControlInputs">
+		Reconfigurar tus controles de entrada
+	</string>
+	<string name="AnimateYourAvatar">
+		Animar tu Avatar
+	</string>
+	<string name="AttachToYourAvatar">
+		Anexarse a tu Avatar
+	</string>
+	<string name="ReleaseOwnership">
+		Liberar propiedad y volverse público
+	</string>
+	<string name="LinkAndDelink">
+		Enlazar y desenlazar de otros objetos
+	</string>
+	<string name="AddAndRemoveJoints">
+		Agregar y quitar uniones con otros objetos
+	</string>
+	<string name="ChangePermissions">
+		Cambiar sus propios permisos
+	</string>
+	<string name="TrackYourCamera">
+		Seguir tu cámara
+	</string>
+	<string name="TeleportYourAgent">
+		Teleportarte
+	</string>
+	<string name="ControlYourCamera">
+		Controlar tu cámara
+	</string>
+	<layout_stack name="panels">
+		<layout_panel name="im_contents_panel">
+			<combo_box label="Gestos" name="Gesture">
+				<combo_item name="Gestures">
+					Gestos
+				</combo_item>
+			</combo_box>
+			<check_box label="Mostrar Texto Ignorado" left_delta="124" name="show mutes" width="116"/>
+			<!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Translate Chat (powered by Google)" name="translate chat" width="100"/-->
+			<button label="Abrir Historial" name="chat_history_open" tool_tip="Pulsa aquí para abrir el historial en un editor externo."/>
+			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Pulsa aquí para mostrar/ocultar la lista de participantes activos en esta sesión de MI." width="80"/>
+			<panel name="chat_panel">
+				<string name="gesture_label">
+					Gestos
+				</string>
+			</panel>
+		</layout_panel>
+		<layout_panel name="active_speakers_panel"/>
+	</layout_stack>
+</floater>
--- a/indra/newview/skins/default/xui/es/floater_instant_message_ad_hoc_concisebuttons.xml
+++ b/indra/newview/skins/default/xui/es/floater_instant_message_ad_hoc_concisebuttons.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater label="(desconocido)" name="im_floater" title="(desconocido)">
+	<string name="ringing">
+		Uniéndose al Chat de Voz...
+	</string>
+	<string name="connected">
+		Conectado, pulsa Terminar Llamada para colgar
+	</string>
+	<string name="hang_up">
+		Salida del Chat de Voz
+		</string>
+	<string name="title_string">
+		Mensaje Instantáneo con [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] está escribiendo...
+	</string>
+	<string name="session_start_string">
+		Iniciando sesión con [NAME], espera por favor.
+	</string>
+	<string name="default_text_label">
+		Pulsa aquí para un Mensaje Instantáneo.
+	</string>
+	<button label="Historial" name="history_btn"/>
+	<button label="Llamar" name="start_call_btn"/>
+	<button label="Terminar Llamada" name="end_call_btn" width="90"/>
+	<button label="&lt; &lt;" label_selected="&gt; &gt;" left="420" right="450" tool_tip="Pulsa aquí para mostrar/ocultar la lista de participantes activos en esta sesión de MI."/>
+	<layout_stack name="panels">
+		<layout_panel name="im_contents_panel">
+			<line_editor label="Pulsa para un Mensaje Instantáneo" name="chat_editor"/>
+			<button label="Enviar" left="435" name="send_btn" width="60"/>
+		</layout_panel>
+		<layout_panel name="active_speakers_panel"/>
+	</layout_stack>
+	<string name="live_help_dialog">
+		*** Bienvenido a la Petición de Ayuda ***
+Por favor, primero revisa nuestras páginas de ayuda presionando F1 o yendo a la Base de Conocimientos en http://secondlife.com/knowledgebase/
+Si la respuesta no está ahi, por favor, ingresa tu consulta y espera un momento a que uno de nuestros soportistas esté disponible para responderte.
+-=-=- El tiempo de respuesta puede variar, especialmente en horas pico -=-=-
+	</string>
+</floater>
--- a/indra/newview/skins/default/xui/es/floater_instant_message_concisebuttons.xml
+++ b/indra/newview/skins/default/xui/es/floater_instant_message_concisebuttons.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater label="(desconocido)" name="im_floater" title="(desconocido)">
+	<string name="answering">
+		Conectando...
+	</string>
+	<string name="ringing">
+		Llamando...
+	</string>
+	<string name="connected">
+		Conectado. Pulsa Terminar LLamada para colgar
+	</string>
+	<string name="hang_up">
+		Llamada terminada
+	</string>
+	<string name="title_string">
+		Mensaje Instantáneo con [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] está escribiendo...
+	</string>
+	<string name="session_start_string">
+		Iniciando sesión con [NAME], por favor espera.
+	</string>
+	<string name="default_text_label">
+		Pulsa aquí para enviar un Mensaje Instantáneo.
+	</string>
+	<string name="unavailable_text_label">
+		El chat de texto no está disponible para esta llamada.
+	</string>
+	<string name="inventory_item_offered">
+		Ofrecido un Ítem de Inventario
+	</string>
+	<button label="Perfil" left="135" name="profile_callee_btn" width="60"/>
+	<button label="Historial" left_delta="60" name="history_btn" width="60"/>
+	<button label="Teleportar" name="profile_tele_btn" width="70"/>
+	<check_box left_delta="70" name="rp_mode">
+		Modo RP
+	</check_box>
+	<button label="Llamar" left_delta="67" name="start_call_btn" width="60"/>
+	<button label="Finalizar" name="end_call_btn" width="24"/>
+	<panel left_delta="16" name="speaker_controls" width="60">
+		<volume_slider name="speaker_volume" width="48"/>
+		<button label="" left_delta="42" name="mute_btn" tool_tip="Ignorar Voz" width="25"/>
+	</panel>
+	<text_editor left="5" name="im_history" width="488"/>
+	<line_editor label="Pulsa aquí para enviar un Mensaje Instantáneo" name="chat_editor" width="423"/>
+	<button label="Enviar" left="433" name="send_btn" width="60"/>
+	<string name="live_help_dialog">
+		*** Bienvenido a la Petición de Ayuda ***
+Por favor, primero revisa nuestras páginas de ayuda presionando F1 o yendo a la Base de Conocimientos en http://secondlife.com/knowledgebase/
+Si la respuesta no está ahi, por favor, ingresa tu consulta y espera un momento a que uno de nuestros soportistas esté disponible para responderte.
+-=-=- El tiempo de respuesta puede variar, especialmente en horas pico -=-=-</string>
+</floater>
--- a/indra/newview/skins/default/xui/es/floater_instant_message_group_concisebuttons.xml
+++ b/indra/newview/skins/default/xui/es/floater_instant_message_group_concisebuttons.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater label="(desconocido)" name="im_floater" title="(desconocido)">
+	<string name="ringing">
+		Uniéndose al Chat de Voz...
+	</string>
+	<string name="connected">
+		Conectado, pulsa Terminar Llamada para colgar
+	</string>
+	<string name="hang_up">
+		Salida Chat de Voz
+	</string>
+	<string name="title_string">
+		Mensaje Instantáneo con [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] está escribiendo...
+	</string>
+	<string name="session_start_string">
+		Iniciando sesión con [NAME], espera por favor.
+	</string>
+	<string name="default_text_label">
+		Pulsa aquí para un Mensaje Instantáneo.
+	</string>
+	<string name="moderated_chat_label">
+		(Moderado: Voz Apagada por defecto)
+	</string>
+	<string name="muted_text_label">
+		Tu chat de texto ha sido deshabilitado por un Moderado del Grupo.
+	</string>
+	<button label="Información Grupo" right="-245" name="group_info_btn" width="80"/>
+	<button label="Historial" left_delta="80" name="history_btn" width="80"/>
+	<button label="Unirse a Llamada" left_delta="80" name="start_call_btn" width="80"/>
+	<button label="Terminar Llamada" name="end_call_btn" width="80"/>
+	<button label="&lt; &lt;" label_selected="&gt; &gt;" left="420" name="toggle_active_speakers_btn" right="450" tool_tip="Pulsa aquí para mostrar/ocultar la lista de participantes activos en esta sesión de MI." width="80"/>
+	<layout_stack name="panels">
+		<layout_panel name="im_contents_panel" width="495">
+			<button label="Enviar" left="435" name="send_btn" width="60"/>
+		</layout_panel>
+	<string name="live_help_dialog">
+		*** Bienvenido a la Petición de Ayuda *** 
+Por favor, en primer lugar revisa nuestras páginas de ayuda de SL pulsando F1, o accede a la Base de Conocimientos http://secondlife.com/knowledgebase/ 
+Si no encuentras allí la respuesta que buscas, por favor, empieza el proceso escribiendo tu pregunta, y espera unos momentos a que responda algunos de los ayudantes disponibles.
+-=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-	
+	</string>
+</floater>
--- a/indra/newview/skins/default/xui/es/floater_my_friends_horiz.xml
+++ b/indra/newview/skins/default/xui/es/floater_my_friends_horiz.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_my_friends" title="Contactos">
+	<tab_container name="friends_and_groups" >
+		<panel label="Amigos" name="friends_panel"/>
+		<panel label="Grupos" name="groups_panel"/>
+	</tab_container>
+</floater>
--- a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
@@ -32,10 +32,10 @@
 		Pasos:
 	</text>
 	<scroll_list name="library_list">
-		Animación
-Sonidos
-Chat
-Esperar
+    <row name="action_animation" value="Animación"/>
+    <row name="action_sound" value="Sonidos"/>
+    <row name="action_chat" value="Chat"/>
+    <row name="action_wait" value="Esperar"/>
 	</scroll_list>
 	<button label="Añadir &gt;&gt;" name="add_btn"/>
 	<button label="Subir" name="up_btn"/>
--- a/indra/newview/skins/default/xui/es/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="settings_debug" title="Configurar del Depurador">
-	<combo_box name="settings_combo" />
-	<combo_box name="boolean_combo">
-		<combo_item name="TRUE">
-			VERDADERO
-		</combo_item>
-		<combo_item name="FALSE">
-			FALSO
-		</combo_item>
-	</combo_box>
-	<color_swatch label="Color" name="color_swatch"/>
+<floater name="settings_debug" title="Configurar Depurador">
+    <search_editor label="Buscar" name="search_settings_input" tool_tip="Escribe aquí el término que estás buscando. Los resultados mostrarán las coincidencias parciales del texto buscado ya sea en los nombres de clave o en los comentarios."/>
+
+	<radio_group name="boolean_combo">
+		<radio_item name="TRUE">
+			Verdadero
+		</radio_item>
+		<radio_item name="FALSE">
+			Falso
+		</radio_item>
+	</radio_group>
+	<color_swatch label="Color" name="val_color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
 	<spinner label="x" name="val_spinner_2"/>
 	<spinner label="x" name="val_spinner_3"/>
 	<spinner label="x" name="val_spinner_4"/>
+	<button label="Copiar Nombre" name="copy_btn" tool_tip="Copiar el nombre de esta clave." width="130" />	
 	<button label="Restablecer" name="default_btn"/>
 </floater>
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -49,6 +49,7 @@
 		<menu_item_call label="Gestos..." name="Gestures..."/>
 		<menu_item_call label="Perfil..." name="Profile..."/>
 		<menu_item_call label="Apariencia..." name="Appearance..."/>
+		<menu_item_call label="Crear Vestuario..." name="Make Outfit..."/>		
 		<menu_item_call label="Nombre a Mostrar..." name="Display Name..."/>
 		<menu_item_check label="Amigos..." name="Friends..."/>
 		<menu_item_call label="Grupos..." name="Groups..."/>
@@ -195,6 +196,7 @@
 			<menu_item_call label="Wiki de QA..." name="QA Wiki..."/>
 			<menu_item_call label="Informar Fallos..." name="Report Bug..."/>
 			<menu_item_call label="Informar Fallos de Singularity..." name="Report Singularity Bug..."/>
+			<menu_item_call label="Solicitar Nueva Característica..." name="Request New Feature..."/>			
 		</menu>
 		<menu_item_call label="Acerca de Singularity..." name="About Second Life..."/>
 	</menu>
--- a/indra/newview/skins/default/xui/es/panel_friends.xml
+++ b/indra/newview/skins/default/xui/es/panel_friends.xml
@@ -31,7 +31,7 @@
 	<text name="sel">
 		Seleccionados:
 	</text>
-	<text name="s_num">
+	<text name="s_num" left_delta="75">
 		0000
 	</text>		 
 </panel>
--- a/indra/newview/skins/default/xui/es/panel_friends_horiz.xml
+++ b/indra/newview/skins/default/xui/es/panel_friends_horiz.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" name="friends">
+	<string name="Multiple">Multiples amigos...</string>
+	<scroll_list name="friend_list" tool_tip="Mantén presionadas las teclas Mayús o control mientras pulsas en la lista para seleccionar múltiples amigos">
+		<column name="icon_online_status" tool_tip="Estado En Línea"/>
+		<column label="Nombre" name="friend_name" tool_tip="Nombre"/>
+		<column name="icon_visible_online" tool_tip="Tu amigo puede ver tu estado en línea"/>
+		<column name="icon_visible_map" tool_tip="Tu amigo puede localizarte en el mapa"/>
+		<column name="icon_edit_mine" tool_tip="Tu amigo puede editar, borrar o tomar tus objetos"/>
+		<column name="icon_visible_online_theirs" tool_tip="Puedes ver si tu amigo está en línea (Sólo se actualiza al iniciar sesión)"/>
+		<column name="icon_visible_map_theirs" tool_tip="Puedes localizar a tu amigo en el mapa"/>
+		<column name="icon_edit_theirs" tool_tip="Puedes editar los objetos de tu amigo"/>
+		<column name="friend_last_update_generation" width="0"/>
+	</scroll_list>
+	<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="friends" width="110">Contact Group:</text-->
+	<!--combo_box allow_text_entry="false" enabled="true" follows="right|top" bottom_delta="20" height="18" hidden="false" left="-255" max_chars="20" tool_tip="Buddy group" name="buddy_group_combobox" width="130">
+		<combo_item type="string" length="20" enabled="true" name="All" value="All">All</combo_item>
+	</combo_box-->
+	<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text-->
+	<search_editor name="buddy_search_lineedit" label="Buscar Contactos" tool_tip="El nombre del contacto que estás buscando"/>
+	<button label="0" name="expand_collapse_btn" tool_tip="Expandir/Retraer información extra"/>
+	<!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/-->
+	<text name="friends">Conectados:</text>
+	<text name="f_num" width="95">0000</text>
+	<text name="sel" width="95">|       Seleccionados:</text>
+	<text name="s_num" width="95">0000</text>
+	<button label="IM/Llamar" name="im_btn" tool_tip="Abrir sesión de Mensaje Instantáneo" width="80"/>
+	<button label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos y otra información"/>
+	<button label="Teleportar..." name="offer_teleport_btn" tool_tip="Ofrece a este amigo teleportarse a tu posición"/>
+	<button label="Pagar..." name="pay_btn" tool_tip="Dar dinero ([CURRENCY]) a este contacto"/>
+	<button label="Quitar..." name="remove_btn" tool_tip="Quitar a este usuario de tu lista de contactos"/>
+	<button label="Agregar..." name="add_btn" tool_tip="Ofrecer amistad a un residente"/>
+</panel>
--- a/indra/newview/skins/default/xui/es/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml
@@ -54,7 +54,7 @@ realizarla.
 				<column label="Cuotas Donadas" name="donated"/>
 				<column label="Última Conexión" name="online"/>
 			</name_list>
-			<button label="Invitar a un Nuevo Miembro..." name="member_invite"/>
+			<button label="Invitar a un Nuevo Miembro..." name="member_invite" width="176"/>
 			<button label="Expulsar del Grupo" name="member_eject"/>
 			<string name="help_text">
 				Puedea añadir o quitar los roles asignados a los miembros.
--- a/indra/newview/skins/default/xui/es/panel_groups_horiz.xml
+++ b/indra/newview/skins/default/xui/es/panel_groups_horiz.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="groups">
+	<scroll_list name="group list">
+		<column label="Nombre" name="name" tool_tip="Nombre" />
+		<!--<column label="Active" name="is_active_group"
+		    tool_tip="Group is set as active" width="40" />-->
+		<column name="is_listed_group" tool_tip="El Grupo es visible en tu perfil"/>
+		<column name="is_chattable_group" tool_tip="Recibir chat del grupo"/>
+		<column name="is_notice_group" tool_tip="Recibir Avisos del Grupo"/>
+	</scroll_list>
+	<text name="groupdesc">
+		Tus grupos activos se muestran en Itálica.
+	</text>
+	<text name="groupcount">
+		Perteneces a [COUNT] grupos (de un máximo de [MAX]).
+	</text>
+	<button label="IM/Llamar" name="IM" tool_tip="Abrir sesión de Mensaje Instantáneo" width="85"/>
+	<button label="Información" name="Info" left_delta="87" width="85"/>
+	<button label="Activar" left_delta="87" name="Activate"/>
+	<button label="Abandonar" name="Leave" width="85" />
+	<button label="Crear..." left_delta="87" name="Create" width="85" />
+	<button label="Buscar..." left_delta="87" name="Search..." width="85"/>
+	<button label="Invitar..." name="Invite..." width="85"/>
+	<button label="Títulos..." left_delta="87" name="Titles..." width="85"/>
+  <string name="none">
+		ninguno
+  </string>
+</panel>
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
@@ -5,17 +5,16 @@
 			<text name="objects_link_text_box">
 				Mensajes Instantáneos:
 			</text>
-			<check_box label="Usar Pestañas Verticales (Requiere reiniciar)" name="use_vertical_ims_check"/>
 			<check_box label="Anunciar Mensajes Instantáneos Entrantes" tool_tip="Abre una ventana de MI cuando alguien comienza a escribirte un MI. Esto te permite conocer cuando alguien te abre un MI antes de enviartelo." name="quickstart_im_check"/>
 			<check_box label="No enviar '[nombre] está escribiendo...'  en MIs" tool_tip="Tu contacto de MI no verá '______ está escribiendo...' cuando le respondes." name="hide_typing_check"/>
-			<check_box label="Mostrar nombre del grupo en el chat" tool_tip="El nombre del grupo también será mostrado si el MI es de un chat de grupo." name="append_group_name_check"/>
-			<text name="objects_link_text_box2">
+			<check_box label="Permitir Método MU pose." tool_tip="Permite el uso de  /me y :  para enviar emotes." name="allow_mu_pose_check"/>
+			<check_box label="Cerrar Automáticamente comentarios OOC." tool_tip="Agregar automáticamente al final '))' en cualquier mensaje que comience con '((', o viseversa." name="close_ooc_check"/>
+			<text name="objects_link_text_box2" left="265" >
 				Chat:
 			</text>
 			<check_box label="Ejecutar sonido de escritura en chat local" tool_tip="Silencia el sonido de escritura, haciendo que determinadas cosas sean mas tranquilas, como las actuaciones en vivo." name="play_typing_sound_check"/>
 			<check_box label="No Mostrar/registrar notificaciones en chat" name="hide_notifications_in_chat_check"/>
-			<check_box label="Permitir Método MU pose." tool_tip="Permite el uso de  /me y :  para enviar emotes." name="allow_mu_pose_check"/>
-			<check_box label="Cerrar Automáticamente comentarios OOC." tool_tip="Agregar automáticamente al final '))' en cualquier mensaje que comience con '((', o viseversa." name="close_ooc_check"/>
+			<check_box label="Mostrar nombre del grupo en el chat" tool_tip="El nombre del grupo también será mostrado si el MI es de un chat de grupo." name="append_group_name_check"/>
 			<text name="objects_link_text_box3">
 				Mostrar en el historial de chat links de chat de objetos para:
 			</text>
@@ -56,6 +55,7 @@
 					MM/DD/YYYY
 				</combo_item>
 			</combo_box>
+			<check_box bottom_delta="0" left="240" follows="top" control_name="SecondsInLog" label="Segundos en el registro de tiempo" name="seconds_in_log"/>			
 			<!-- Auto-responder -->
 			<check_box label="Habilitar Respuesta Automática" name="AscentInstantMessageResponseAnyone" tool_tip=" Envia un mensaje pre-grabado de tu elección cuando alguien te abre un IM. (Escribe tu mensaje en el área de texto de la Ventana Texto de Respuesta."/>
 			<check_box label="Responder a no amigos" name="AscentInstantMessageResponseFriends" tool_tip="Envia un mensaje pre-grabado de tu elección cuando alguien te abre un IM. (Escribe tu mensaje en el área de texto  de la Ventana Texto de Respuesta."/>
@@ -76,6 +76,17 @@
 #i tu tiempo inactivo. (p.e. "5 mins")
 			</text>
 		</panel>
+		<!-- ============================== -->
+		<panel height="525" label="Chat UI" left="1" name="ChatUI" width="418">
+			<check_box label="Usar Pestañas Verticales (Requiere reiniciar)" name="use_vertical_ims_check"/>		
+			<check_box label="Abrir nuevos MIs en ventanas separadas" name="chats_torn_off"/>
+			<check_box label="Mostrar barra de chat local en ventana flotante (Requiere reiniciar)" tool_tip="Mostrar o no la barra de entrada de texto inferior en la barra flotante de chat." name="show_local_chat_floater_bar"/>
+			<check_box label="Usar botones horizontales para la ventana de contactos (Requiere Reiniciar)" tool_tip="Habilitado, los botones en los paneles de Amigos y Grupos se colocarán en la parte inferior del panel, ordendados horizontalmente, en vez de verticales a la derecha." name="horiz_butt"/>	  
+			<check_box label="Colocar los Botones en la misma línea del nombre en los IMs (Sólo afecta en Nuevos MIs)" name="im_concise_butt"/>
+			<check_box label="Botones en chat de grupo en la línea del nombre del grupo (Afecta nuevos chats de grupo)" name="group_concise_butt"/>
+      <check_box label="Botones en la misma línea de título de conferencia (Afecta nuevas conferencias de Chat)" name="conf_concise_butt"/>			
+			<check_box label="Deshabilitar apertura atajo de Comunicación fuera de la lista de amigos" control_name="CommunicateSpecificShortcut" name="only_comm"/>
+    </panel>		
 		<!-- ============================== -->
 		<panel label="Spam" name="Spam">
 			<check_box control_name="AntiSpamEnabled" label="Habilitar Antispam" name="enable_as"/>		
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
@@ -52,6 +52,15 @@
 			<color_swatch label="Estado" name="estate_owner_color_swatch" tool_tip="Color para Administrador de Regiones"/>
 			<color_swatch label="Lindens" name="linden_color_swatch" tool_tip="Color para empleados de Linden Lab"/>
 			<color_swatch label="Ignorados" name="muted_color_swatch" tool_tip="Color para usuarios ignorados o bloqueados"/>
+			<color_swatch label="Pers.(Minimapa)" name="custom_color_swatch" tool_tip="Color solamente para usuarios marcados en el minimapa"/>
+			<text name="chat_color_text" bottom_delta="-13" >
+				Usar colores para chat:
+			</text>
+			<check_box bottom_delta="-11" label="" name="color_friend_check" tool_tip="Color de Amigos en Chat"/>
+			<check_box label="" name="color_estate_owner_check" tool_tip="Color en Chat de Administradores de Estado"/>
+			<check_box label="" name="color_linden_check" tool_tip="Color en Chat de Empleado Linden"/>
+			<check_box label="" name="color_muted_check" tool_tip="Color en Chat de Usuarios Ignorados"/>
+			<!--check_box bottom_delta="0" control_name="ColorCustomChat" follows="top" height="20" label="" left_delta="54" name="color_custom_check" width="44" tool_tip="Color Custom Chat"/ Not implemented, yet.-->			
 		</panel>
 		<panel label="Fiísica de Avatar" name="Body Dynamics">
 			<check_box label="Activar física avanzada de los senos del avatar" name="EmBreastsToggle" tool_tip="Deberás seleccionar Aplicar para activar o desactivar estos controles"/>
--- a/indra/newview/skins/default/xui/es/panel_preferences_voice.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_voice.xml
@@ -3,7 +3,7 @@
 	<text name="voice_unavailable">
 		El Chat de Voz no está Disponible
 	</text>
-	<check_box bottom_delta="0" follows="top" height="16" initial_value="false" label="Enable voice chat" left="8" name="enable_voice_check"/>
+	<check_box bottom_delta="0" follows="top" height="16" initial_value="false" label="Habilitar Chat de Voz" left="8" name="enable_voice_check"/>
 	<radio_group bottom_delta="-46" draw_border="false" follows="top" height="40" left_delta="20" name="ear_location" width="364">
 		<radio_item name="0">
 			Oir el chat desde la posición de la cámara.
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -279,15 +279,16 @@
 	<!-- Chat -->
 	<string name="whisper">Susurra:</string>
 	<string name="shout">Grita:</string>
-	<string name="ringing">Conectando al Chat de Voz del Mundo...</string>
+	<string name="ringing">Conectando al Chat de Voz...</string>
 	<string name="connected">Conectado</string>
 	<string name="unavailable">Chat de Voz no disponible en esta ubicación</string>
-	<string name="hang_up">Desconectado del Chat de Voz del Mundo</string>
+	<string name="hang_up">Desconectado del Chat de Voz</string>
 	<string name="ScriptTakeMoney">Transferir moneda de tu cuenta</string>
 	<string name="ActOnControlInputs">Actuar en tus controles de entrada</string>
 	<string name="RemapControlInputs">Remapear tus controles de entrada</string>
 	<string name="AnimateYourAvatar">Animar tu avatar</string>
 	<string name="AttachToYourAvatar">Anexar a tu avatar</string>
+	<string name="AGroupMemberNamed">un miembro del grupo de nombre</string>	
 	<string name="ReleaseOwnership">Liberar propiedad y hacer público</string>
 	<string name="LinkAndDelink">Enlazar y desenlazar de otros objetos</string>
 	<string name="AddAndRemoveJoints">Agregar o remover uniones con otros objetos</string>
--- a/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
+++ b/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
@@ -33,9 +33,9 @@
 	<layout_stack name="panels">
 		<layout_panel name="im_contents_panel">
 			<button label="Infos sur le groupe" name="group_info_btn" width="130"/>
-			<button label="Participer à l'appel" left_delta="135" name="start_call_btn" width="145"/>
+			<button label="Participer à l'appel" left_delta="90" name="start_call_btn" width="145"/>
 			<button halign="center" label="Raccrocher" name="end_call_btn" width="145"/>
-			<button label="Historique" name="history_btn"/>
+			<button label="Historique" left_delta="135" name="history_btn"/>
 			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Affiche/Masque la liste des intervenants actifs dans cette session IM."/>
 			<button label="Envoyer" name="send_btn"/>
 		</layout_panel>
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
@@ -34,10 +34,10 @@
 		Étapes:
 	</text>
 	<scroll_list name="library_list">
-		Animation
-Son
-Chat
-Attendre
+    <row name="action_animation" value="Animation"/>
+    <row name="action_sound" value="Son"/>
+    <row name="action_chat" value="Chat"/>
+    <row name="action_wait" value="Attendre"/>
 	</scroll_list>
 	<button label="Ajouter &gt;&gt;" name="add_btn"/>
 	<button label="Monter" name="up_btn"/>
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -17,7 +17,7 @@
 	<check_box label="Sélectionner une face" name="radio select face"/>
 	<check_box label="Modifier les parties liées" name="checkbox edit linked parts"/>
 	<text name="text ruler mode">
-		Axe:
+		Axe :
 	</text>
 	<combo_box name="combobox grid mode">
 		<combo_item name="World">
@@ -65,7 +65,7 @@
 	<check_box label="Annuler modification" name="radio revert"/>
 	<button label="Appliquer" label_selected="Appliquer" name="button apply to selection" tool_tip="Modifier le terrain sélectionné" left="176"/>
 	<text name="Bulldozer:">
-		Bulldozer:
+		Bulldozer :
 	</text>
 	<text name="Dozer Size:">
 		Taille
@@ -74,28 +74,28 @@
 		Force
 	</text>
 	<text name="obj_count">
-		Objets sélectionnés: [COUNT]
+		Objets sélectionnés : [COUNT]
 	</text>
 	<text name="prim_count">
-		Prims: [COUNT]
+		Prims : [COUNT]
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Général" name="General">
 			<text name="Name:">
-				Nom:
+				Nom :
 			</text>
 			<text name="Description:">
-				Description:
+				Description :
 			</text>
 			<text name="Creator:">
-				Créateur:
+				Créateur :
 			</text>
 			<text name="Creator Name">
 				Thrax Linden
 			</text>
 			<button label="Profil" label_selected="Profil" name="button creator profile"/>
 			<text name="Owner:">
-				Propriétaire:
+				Propriétaire :
 			</text>

 		    <button label="Profil" label_selected="Profil" name="button last owner profile"/>
@@ -111,15 +111,15 @@
 			</text>
 			<button label="Profil" label_selected="Profil" name="button owner profile"/>
 			<text name="Group:">
-				Groupe:
+				Groupe :
 			</text>
 			<text name="Group Name Proxy">
 				Les Lindens
 			</text>
 			<button label="Définir" label_selected="Définir" name="button set group"/>
 			<button label="Voir" name="button open group"/>
-			<text name="Permissions:">
-				Droits:
+			<text name="Permissions :">
+				Droits :
 			</text>
 			<text name="perm_modify">
 				Vous pouvez modifier cet objet.
@@ -151,7 +151,7 @@
 				</radio_item>
 			</radio_group>
 			<text name="Next owner can:">
-				Le prochain propriétaire pourra:
+				Le prochain propriétaire pourra :
 			</text>
 			<check_box label="Modifier" name="checkbox next owner can modify"/>
 			<check_box label="Copier" left_delta="66" name="checkbox next owner can copy"/>
@@ -184,22 +184,22 @@
 			</combo_box>
 			<button bottom="-338" label="Copier la Clef" tool_tip="Copie la clef dans le presse-papier." width="80"/>
 			<text name="B:">
-				B:
+				B :
 			</text>
 			<text name="O:">
-				O:
+				O :
 			</text>
 			<text name="G:">
-				G:
+				G :
 			</text>
 			<text name="E:">
-				E:
+				E :
 			</text>
 			<text name="N:">
-				N:
+				N :
 			</text>
 			<text name="F:">
-				F:
+				F :
 			</text>
 			<string name="text modify info 1">
 				Vous pouvez modifier cet objet.
@@ -217,13 +217,13 @@
 				Sélectionnez l'objet en entier.
 			</string>
 			<string name="Cost Default">
-				Prix:           [CURRENCY]
+				Prix :           [CURRENCY]
 			</string>
 			<string name="Cost Total">
-				Prix total:  [CURRENCY]
+				Prix total :  [CURRENCY]
 			</string>
 			<string name="Cost Per Unit">
-				Prix par:     [CURRENCY]
+				Prix par :     [CURRENCY]
 			</string>
 			<string name="Cost Mixed">
 				Prix mixte
@@ -419,7 +419,7 @@
 				Sélectionnez un prim pour modifier les attributs.
 			</text>
 			<text name="edit_object">
-				Modifiez les attributs de l'objet:
+				Modifiez les attributs de l'objet :
 			</text>
 			<check_box label="Flexibilité" name="Flexible1D Checkbox Ctrl" tool_tip="Donne à l'objet de la souplesse sur l'axe des Z (côté client uniquement)."/>
 			<spinner label="Souplesse" name="FlexNumSections"/>
@@ -567,7 +567,11 @@
 				Ajuster la texture du média
 (chargement préalable)
 			</text>
-			<button label="Ajuster" label_selected="Ajuster" left="150" name="button align"/>
+			<button label="Ajuster" label_selected="Ajuster" left="140" name="button align" width="45"/>
+
+			<text name="textbox params">Paramètres</text>
+			<button label="Copier" name="copytextures" tool_tip="Copie les paramètres de la texture dans le presse papier"  width="55"/>
+			<button label="Coller" name="pastetextures" tool_tip="Colle les paramètres de la texture du presse papier"  width="55"/>
 		</panel>
 		<panel label="Contenu" name="Contents">
 			<button label="Nouveau script" label_selected="Nouveau script" name="button new script"/>
@@ -579,7 +583,7 @@
 			Informations sur la parcelle
 		</text>
 		<text name="label_area_price">
-			Prix : [PRICE][CURRENCY] pour [AREA] m².
+			Prix : [PRICE] [CURRENCY] pour [AREA] m².
 		</text>
 		<text name="label_area">
 			Surface : [AREA] m²
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -1,46 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
 	<menu label="Fichier" name="File">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-    <menu_item_call label="Import  d'image ([UPLOADFEE])" name="Upload Image">
-		<on_click function="File.UploadImage" userdata="" />
-		<on_enable function="File.EnableUpload" />
-    </menu_item_call>
-    <menu_item_call label="Import de son ([UPLOADFEE])" name="Upload Sound">
-        <on_click function="File.UploadSound" userdata="" />
-        <on_enable function="File.EnableUpload" />
-    </menu_item_call>
-    <menu_item_call label="Import d'animation ([UPLOADFEE])" name="Upload Animation">
-        <on_click function="File.UploadAnim" userdata="" />
-        <on_enable function="File.EnableUpload" />
-    </menu_item_call>
-    <menu_item_call label="Import  multiples ([UPLOADFEE] par fichier)" name="Bulk Upload">
-        <on_click function="File.UploadBulk" userdata="" />
-    </menu_item_call>
-	<menu_item_call label="Import XML" name="Import">
-		<on_click function="Object.Import" />
-		<on_enable function="Object.EnableImport" />
-	</menu_item_call>
-	<menu_item_call label="Import avec textures" name="Import2">
-		<on_click function="Object.ImportUpload" />
-		<on_enable function="Object.EnableImport" />
-	</menu_item_call>
-    <menu_item_separator label="-----------" name="separator" />
-    <menu_item_call label="Définir les droits par défaut " name="perm prefs" >
-        <on_click function="ShowFloater" userdata="perm prefs" />
-    </menu_item_call>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="Enregistrer la texture sur le disque dur" name="Save Preview As...">
-			<on_click function="File.SavePreview" userdata="" />
-			<on_enable function="File.EnableSaveAs" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Import  d'image ([UPLOADFEE])" name="Upload Image"/>
+		<menu_item_call label="Import de son ([UPLOADFEE])" name="Upload Sound"/>
+		<menu_item_call label="Import d'animation ([UPLOADFEE])" name="Upload Animation"/>
+		<menu_item_call label="Import  multiples ([UPLOADFEE] par fichier)" name="Bulk Upload"/>
+		<menu_item_call label="Import XML" name="Import"/>
+		<menu_item_call label="Import avec textures" name="Import2"/>
+		<menu_item_call label="Définir les droits par défaut " name="perm prefs"/>
+		<menu_item_call label="Enregistrer la texture sur le disque dur en TGA" name="Save Preview As..."/>
+		<menu_item_call label="Enregistrer la texture sur le disque dur en PNG" name="Save Preview AsPNG..."/>
 		<menu_item_call label="Fermer la fenêtre" name="Close Window"/>
 		<menu_item_call label="Fermer toutes les fenêtres" name="Close All Windows"/>
 		<menu_item_separator label="-----------" name="separator3"/>
 		<menu_item_call label="Prendre une photo" name="Take Snapshot"/>
 		<menu_item_call label="Enregistrer la photo sur le disque dur" name="Snapshot to Disk" shortcut="control|shift|X"/>
-		<menu_item_separator label="-----------" name="separator4"/>
 		<menu_item_call label="Quitter" name="Quit"/>
 	</menu>
 	<menu label="Édition" name="Edit">
@@ -90,7 +64,7 @@
 		<menu_item_check label="Construire" name="Build"/>
 		<menu_item_check label="Vue au joystick" name="Joystick Flycam"/>
 		<menu_item_call label="Réinitialiser l'affichage" name="Reset View"/>
-		<menu_item_call label="Regarder le dernier intervenant" name="Look at Last Chatter" shortcut="alt|V"/>
+		<menu_item_call label="Regarder le dernier intervenant" name="Look at Last Chatter"/>
 		<menu_item_separator label="-----------" name="separator"/>
 		<menu_item_check label="Barre d'outils" name="Toolbar"/>
 		<menu_item_check label="Chat local" name="Chat History"/>
@@ -133,30 +107,17 @@
 	<menu label="Monde" name="World">
 		<menu_item_call label="Chat" name="Chat"/>
 		<menu_item_check label="Toujours courir" name="Always Run"/>
-		<menu_item_call label="S'asseoir au sol" name="Sit on Ground" shortcut="control|alt|S"/>
-		<menu_item_check label="Voler" name="Fly" shortcut="F"/>
+		<menu_item_call label="S'asseoir au sol" name="Sit on Ground"/>
+		<menu_item_check label="Voler" name="Fly"/>
 		<menu_item_separator label="-----------" name="separator"/>
 		<menu_item_call label="Créer un repère ici - Landmark" name="Create Landmark Here"/>
 		<menu_item_call label="Définir comme domicile" name="Set Home to Here"/>
 		<menu_item_separator label="-----------" name="separator2"/>
 		<menu_item_call label="Me téléporter chez moi" name="Teleport Home"/>
 		<menu_item_separator label="-----------" name="separator3"/>
-
-    	<menu_item_call bottom="-186" enabled="true" height="19" label="Faux Absent (on/off)" left="0"
-     		mouse_opaque="true" name="Fake Away Status" width="185">
-      		<on_click function="World.FakeAway" userdata=""/>
-    	</menu_item_call>
-
-
-		<menu_item_call bottom="-186" enabled="true" height="19" label="Absent(e)-Away" left="0"
-		     mouse_opaque="true" name="Set Away" width="185">
-			<on_click function="World.SetAway" userdata=""/>
-		</menu_item_call>
-		<menu_item_call bottom="-205" enabled="true" height="19" label="OQP-Busy" left="0"
-		     mouse_opaque="true" name="Set Busy" width="185">
-			<on_click function="World.SetBusy" userdata=""/>
-		</menu_item_call>
-
+		<menu_item_call label="Faux Absent (on/off)" name="Fake Away Status"/>
+		<menu_item_call label="Absent(e)-Away" name="Set Away"/>
+		<menu_item_call label="OQP-Busy" name="Set Busy"/>
 		<menu_item_call label="Arrêter d'animer mon avatar" name="Stop Animating My Avatar"/>
 		<menu_item_call label="Reprendre le contrôle" name="Release Keys"/>
 		<menu_item_separator label="-----------" name="separator4"/>
@@ -198,8 +159,6 @@
 		<menu_item_check label="Sélectionner les objets déplaçables uniquement" name="Select Only Movable Objects"/>
 		<menu_item_check label="Sélectionner en entourant" name="Select By Surrounding"/>
 		<menu_item_check label="Montrer les contours de la sélection" name="Show Selection Outlines" />
-			<on_click function="Tools.ShowSelectionHighlights" userdata="" />
-			<on_check control="RenderHighlightSelections" />
 		<menu_item_check label="Afficher les parties cachées de la sélection" name="Show Hidden Selection"/>
 		<menu_item_check label="Afficher la sphère de lumière de la sélection" name="Show Light Radius for Selection"/>
 		<menu_item_check label="Afficher le faisceau de sélection" name="Show Selection Beam"/>
@@ -211,11 +170,11 @@
 		<menu_item_separator label="-----------" name="separator3"/>
 		<menu_item_check label="Modifier les parties liées" name="Edit Linked Parts"/>
 		<menu label="Sélection parties liées" name="Select Linked Parts">
-		<menu_item_call label="Sélection Suivante" name="Select Next Part"/>		
-		<menu_item_call label="Sélection Precedente" name="Select Previous Part"/>
-		<menu_item_call label="Inclure Suivante" name="Include Next Part"/>
-		<menu_item_call label="Inclure Precedente" name="Include Previous Part"/>
-            </menu>
+			<menu_item_call label="Sélection Suivante" name="Select Next Part"/>
+			<menu_item_call label="Sélection Precedente" name="Select Previous Part"/>
+			<menu_item_call label="Inclure Suivante" name="Include Next Part"/>
+			<menu_item_call label="Inclure Precedente" name="Include Previous Part"/>
+		</menu>
 		<menu_item_call label="Lier" name="Link"/>
 		<menu_item_call label="Délier" name="Unlink"/>
 		<menu_item_separator label="-----------" name="separator4"/>
@@ -227,7 +186,7 @@
 		<menu_item_call label="Prendre une copie" name="Take Copy"/>
 		<menu_item_call label="Retourner l'objet" name="Return..."/>
 		<menu_item_call label="Remplacer l'objet dans le contenu de l'objet" name="Save Object Back to Object Contents"/>
-		<menu_item_call label="Admin Suppr.(fonction pour les open grids)" name="Admin Delete" shortcut="control|alt|shift|Del"/>		
+		<menu_item_call label="Admin Suppr.(fonction pour les open grids)" name="Admin Delete"/>
        <menu_item_separator label="-----------" name="separator6"/>
 		<menu_item_call label="Afficher la fenêtre d'alertes/erreurs de script" name="Show Script Warning/Error Window"/>
 		<menu label="Recompiler les scripts dans la sélection" name="Recompile Scripts in Selection">
--- a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
@@ -1,111 +1,105 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel top="20" left="10" height="400" width="517" border="true" label="Chat Avanc&#xE9;" name="ascsys">
-  <tab_container label="Advanced Chat" bottom="0" height="440" width="497" left="0" name="Ascent Chat" tab_position="top">
-     <panel border="true" left="1" bottom="-408" height="408" width="500" label="Chat/IM" name="Chat/IM">
+<panel label="Chat Avanc&#xE9;" name="ascsys">
+  <tab_container label="Advanced Chat" name="Ascent Chat">
+     <panel label="Chat/IM" name="Chat/IM">

-      <check_box bottom_delta="-25" left="10" follows="top" initial_value="false" control_name="WoLfVerticalIMTabs" 
-        label="IMs verticaux (n&#xE9;cessite une d&#xE9;co/reco)" name="use_vertical_ims_check"/>
-      <check_box bottom_delta="-20" follows="left|top" initial_value="false" control_name="AscentInstantMessageAnnounceIncoming"
-        label="Annonce les IMs entrants" tool_tip="" name="quickstart_im_check"/>
-      <check_box bottom_delta="-20" follows="left|top" control_name="AscentHideTypingNotification" initial_value="false"
-        label="Ne pas envoyer &#x22;[Machin Truc] is typing...&#x22; dans les IMs" tool_tip="" name="hide_typing_check"/>
-      <check_box bottom_delta="-20" follows="left|top" control_name="OptionShowGroupNameInChatIM" initial_value="false"
-        label="Montrer le nom du groupe dans le chat" tool_tip="" name="append_group_name_check"/>
-      <check_box bottom_delta="-25" left_delta="-5" follows="left|top" control_name="PlayTypingSound" initial_value="true"
-        label="Jouer le son typique pour le chat local" tool_tip="" name="play_typing_sound_check"/>
-      <check_box bottom_delta="-20" follows="left|top" control_name="HideNotificationsInChat" initial_value="false"
-        label="Ne pas afficher les notifs. de log dans le chat" name="hide_notifications_in_chat_check"/>
-      <check_box bottom="-120" left="10" control_name="AscentAllowMUpose" initial_value="false"
-        label="Permet d'utiliser &#x22;/me&#x22; aussi bien que &#x22;:&#x22; pour les &#x22;emotes&#x22;" tool_tip="" name="allow_mu_pose_check"/>
-      <check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
-        label="Ajoute automatiquement les fins des commentaires OOC (RP mode)" tool_tip="Ajoute automatiquement &#x22;))&#x22; &#xE0; chaque message commen&#xE7;ant par &#x22;((&#x22;, et vice-versa." name="close_ooc_check"/>
-<text bottom_delta="-15" follows="left|top" name="objects_link_text_box3">Active un lien qui montre le nom du propri&#xE9;taire dans l'historique du chat pour :</text>
-       <radio_group bottom_delta="-26" control_name="LinksForChattingObjects" tool_tip="Enables a link to show you the owner of the speaking object."
-        follows="top" height="20" left="20" name="objects_link" width="350">
-        <radio_item bottom_delta="0" left_delta="5" name="no_object" width="48">Aucun objet</radio_item>
-        <radio_item bottom_delta="0" left_delta="45" name="others_objects" width="48">Les objets des autres</radio_item>
-        <radio_item bottom_delta="0" left_delta="65" name="anyones_objects" width="48">Tous les objets</radio_item>
+      <check_box label="Annonce les IMs entrants" name="quickstart_im_check"/>
+      <check_box label="Ne pas envoyer &#x22;[Machin Truc] is typing..." name="hide_typing_check"/>
+      <check_box label="Montrer le nom du groupe dans le chat" name="append_group_name_check"/>
+      <check_box label="Jouer le son typique pour le chat local" name="play_typing_sound_check"/>
+      <check_box label="Ne pas afficher les notifs. de log dans le chat" name="hide_notifications_in_chat_check"/>
+      <check_box label="Permet d'utiliser &#x22;/me&#x22; aussi bien que &#x22;:&#x22;" name="allow_mu_pose_check"/>
+      <check_box label="Ajoute automatiquement les fins des commentaires OOC (RP mode)" tool_tip="Ajoute automatiquement &#x22;))&#x22; &#xE0; chaque message commen&#xE7;ant par &#x22;((&#x22;, et vice-versa." name="close_ooc_check"/>
+      <text name="objects_link_text_box3">Active un lien qui montre le nom du propri&#xE9;taire dans l'historique du chat pour :</text>
+       <radio_group tool_tip="Enables a link to show you the owner of the speaking object." name="objects_link">
+        <radio_item name="no_object">Aucun objet</radio_item>
+        <radio_item name="others_objects">Les objets des autres</radio_item>
+        <radio_item left_delta="65" name="anyones_objects">Tous les objets</radio_item>
      </radio_group>

-      <text bottom_delta="-18" left="10" follows="top" name="time_format_text_box">Type d'heure :</text>
-      <combo_box bottom_delta="-5" left="90" follows="top" height="18" tool_tip="" name="time_format_combobox" width="130">
-        <combo_item name="24hours" value="default">Horloge 24/H</combo_item>
-        <combo_item name="12hours" value="default">Horloge 12/H</combo_item>
+      <text name="time_format_text_box">Type d'heure :</text>
+      <combo_box name="time_format_combobox">
+        <combo_item name="24hours">Horloge 24/H</combo_item>
+        <combo_item name="12hours">Horloge 12/H</combo_item>
      </combo_box>
-      <check_box bottom_delta="0" left="240" follows="top" control_name="SecondsInChatAndIMs" initial_value="false" label="Secondes dans les Chat/IMs" name="seconds_in_chat_and_ims_check"/>
-      <text bottom_delta="-18" left="10" follows="top" name="date_format_text_box">Type de date :</text>
-      <combo_box bottom_delta="-5" left="90" follows="top" height="18" name="date_format_combobox" width="130">
-        <combo_item name="year_first" value="default">AAAA-MM-JJ</combo_item>
-        <combo_item name="day_first" value="default">JJ/MM/AAAA</combo_item>
-        <combo_item name="month_first" value="default">MM/JJ/AAA</combo_item>
+      <check_box label="Secondes dans les Chat/IMs" name="seconds_in_chat_and_ims_check"/>
+      <text name="date_format_text_box">Type de date :</text>
+      <combo_box name="date_format_combobox">
+        <combo_item name="year_first">AAAA-MM-JJ</combo_item>
+        <combo_item name="day_first">JJ/MM/AAAA</combo_item>
+        <combo_item name="month_first">MM/JJ/AAA</combo_item>
      </combo_box>
      <!-- Auto-responder -->
-      <view_border bottom="-420" left="5" height="190" bevel_style="none" border_thickness="1" name="GraphicsBorder" width="485"/>
-      <check_box bottom_delta="168" left="10" follows="top" initial_value="false" label="Activer le R&#xE9;pondeur Automatique"
-        name="AscentInstantMessageResponseAnyone" tool_tip=""/>
-	  <check_box bottom_delta="-20" follows="left|top" initial_value="false"
-		label="Auto-r&#xE9;ponse aux 'non-friends'" name="AscentInstantMessageResponseFriends" tool_tip=""/>
-	  <check_box bottom_delta="-20" follows="left|top" initial_value="false" 
-		label="Auto-r&#xE9;ponse aux personnes 'muted'" name="AscentInstantMessageResponseMuted" tool_tip=""/>
-      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Envoyer d&#xE8;s que l'on commence &#xE0; vous &#xE9;crire" name="AscentInstantMessageShowOnTyping"/>
-      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Ne pas montrer les IMs auxquels vous avez r&#xE9;pondu" name="AscentInstantMessageShowResponded"/>
-      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Auto-r&#xE9;ponse &#xE0; chaque message" name="AscentInstantMessageResponseRepeat"/>
-      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Joindre un objet &#xE0; la r&#xE9;ponse" name="AscentInstantMessageResponseItem" tool_tip="Glissez l'objet dans la fen&#xEA;tre de r&#xE9;ponse."/>
-	  <text bottom_delta="120" left_delta="280" follows="left|top" height="18" name="text_box1">Texte de la r&#xE9;ponse :</text>
-      <text_editor bottom_delta="-110" follows="left|top" height="110" max_length="1100" name="im_response" width="200" word_wrap="true" spell_check="true"/>
-      <text bottom_delta="-25" follows="left|top" height="18" name="text_box2">
-#f Pr&#xE9;nom, #l Nom, 
-#t Dur&#xE9;e, #r SLURL,
+      <check_box label="Activer le R&#xE9;pondeur Automatique" name="AscentInstantMessageResponseAnyone"/>
+	  <check_box label="Auto-r&#xE9;ponse aux 'non-friends'" name="AscentInstantMessageResponseFriends"/>
+	  <check_box label="Auto-r&#xE9;ponse aux personnes 'muted'" name="AscentInstantMessageResponseMuted"/>
+      <check_box label="Envoyer d&#xE8;s que l'on commence &#xE0; vous &#xE9;crire" name="AscentInstantMessageShowOnTyping"/>
+      <check_box label="Ne pas montrer les IMs auxquels vous avez r&#xE9;pondu" name="AscentInstantMessageShowResponded"/>
+      <check_box label="Auto-r&#xE9;ponse &#xE0; chaque message" name="AscentInstantMessageResponseRepeat"/>
+      <check_box label="Joindre un objet &#xE0; la r&#xE9;ponse" name="AscentInstantMessageResponseItem" tool_tip="Glissez l'objet dans la fen&#xEA;tre de r&#xE9;ponse."/>
+	  <text bottom_delta="140" left_delta="280" follows="left|top" height="18" name="text_box1">Texte de la r&#xE9;ponse :</text>
+      <text_editor bottom_delta="-130" height="130" name="im_response" width="190"/>
+      <text name="text_box2">
+#f Pr&#xE9;nom,#l Nom,#t Dur&#xE9;e,#r SLURL,
 #i Dur&#xE9;e de 'l'IDLE'. (ex. "5 mins")
      </text>
    </panel>
-
-    <panel border="true" left="1" bottom="-408" height="408" width="500" label="Spam" name="Spam">
-      <check_box left="10" bottom_delta="-25" follows="top" font="SansSerifSmall"
-        label="Activer le blocage de spam du chat" tool_tip="" name="AscChatSpamBlock" control_name="SGBlockChatSpam"/>
-      <spinner left_delta="20" height="18" width="120" follows="top" decimal_digits="0" increment="1" initial_val="10" min_val="2" max_val="100"
-        label="Nombre" label_width="70" tool_tip="(Default: 10)" name="AscChatSpamCount" control_name="SGChatSpamCount"/>
-      <spinner height="18" width="120" follows="left|top" decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
-        label="Dur&#xE9;e" label_width="70" name="AscChatSpamTime" control_name="SGChatSpamTime" tool_tip="(Default: 1.0)"/>
-      <text bottom_delta="0" left_delta="130" height="16" follows="top" name="" width="100">secondes</text>
-      <check_box left_delta="-150" height="16" follows="top" label="Activer le blocage du spam de dialogue" tool_tip="" name="AscDialogSpamBlock" control_name="SGBlockDialogSpam"/>
-      <check_box height="16" follows="left|top" label="Dur&#xE9;e" tool_tip="" name="AscCardSpamBlock" control_name="SGBlockCardSpam"/>
-      <spinner left_delta="20" height="18" width="120" follows="top" decimal_digits="0" increment="1" initial_val="4" min_val="2" max_val="100"
-        label="Nombre" label_width="70" name="AscSpamCount" control_name="SGSpamCount" tool_tip="(Default: 4)"/>
-      <spinner height="18" width="120" follows="left|top" decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
-        label="Dur&#xE9;e" label_width="70" name="AscSpamTime" control_name="SGSpamTime" tool_tip="(Default: 1.0)"/>
-      <text bottom_delta="0" left_delta="130" height="16" follows="top" name="">secondes</text>
+    <panel label="Chat UI" name="ChatUI">
+      <check_box label="IMs Verticaux (Déco Reco)" name="use_vertical_ims_check"/>
+      <check_box label="Ouvre les nouveaux IMs séparements" name="chats_torn_off"/>
+      <check_box label="Montre la barre du chat local séparée (Déco Reco)" tool_tip="" name="show_local_chat_floater_bar"/>
+      <check_box label="boutons horizontaux pour les contacts (Déco Reco)" tool_tip="Activé, les boutons amis/groupes seront en bas et horizontaux et non plus verticaux et à droite." name="horiz_butt"/>
+      <check_box label="Boutons sur la même ligne que les noms pour les IMs" name="im_concise_butt"/>
+      <check_box label="Boutons sur la ligne des noms des chats de groupe" name="group_concise_butt"/>
+      <check_box label="Boutons sur la ligne de titre des conférences" name="conf_concise_butt"/>
+      <check_box label="Désactive le raccourci ouvrant détacher la liste d'amis" name="only_comm"/>
    </panel>

-    <panel border="true" bottom="-580" height="525" label="Options de Texte" left="1" name="TextOptions" width="418">
-      <check_box bottom="-25" left="12" height="16" label="Montre les 'fot de frap' ou suppos&#xE9;es telles en ROUGE" name="SpellDisplay" control_name="SpellDisplay"/>
-      <text bottom_delta="-24" follows="left|top" height="16" name="EmSpell_txt1">Langage courant (dictionnaire) :</text>
-      <combo_box bottom_delta="-20" follows="left|top" height="20" name="SpellBase" width="250" control_name="SpellBase"/>
-      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt3">T&#xE9;l&#xE9;charger les langues (dictionnaires) :</text>
-      <combo_box bottom_delta="-20" follows="left|top" height="20" name="EmSpell_Avail" width="250" control_name="EmSpell_Avail"/>
-      <button bottom_delta="0" left_delta="255" follows="left|top" height="20" label="Installer" name="EmSpell_Add" tool_tip="" width="80"/>
-      <button bottom_delta="-22" left="12" follows="top" height="20" label="T&#xE9;l&#xE9;charger +++" name="EmSpell_GetMore" tool_tip="Obtenez plus de dictionnaires en ligne" width="250"/>
-      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt2">Langues additionnelles (dictionnaires) :</text>
-      <combo_box bottom_delta="-20" follows="left|top" height="20" name="EmSpell_Installed" width="250" control_name="EmSpell_Installed" tool_tip=""/>
-      <button bottom_delta="0" left_delta="255" follows="left|top" height="20" label="Supprimer" name="EmSpell_Remove" tool_tip="" width="80"/>
-      <button bottom_delta="-20" left="12" follows="top" height="20" label="Editer un dictionnaire" name="EmSpell_EditCustom" width="250"/>
-      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt4">
+    <panel label="Spam" name="Spam">
+      <check_box label="Activer l'antispam" name="enable_as"/>
+      <check_box label="Aucun message spécifique dans la file d'attente de spam" name="spammsg_checkbox"/>
+      <button label="Réinitialiser la file d'attente" label_selected="d&#xE9;bloquer les sources de spam" name="reset_antispam"/>
+      <spinner label="Antispam (Dur&#xE9;e/secondes):" tool_tip="Le plus bas sera le moins sensible - O d&#xE9;sactive" name="antispamtime"/>
+      <spinner label="Nombre min. de messages par spam:" name="antispamamount"/>
+      <spinner label="Multiplicateur du nombre de messages pour les sons:" name="antispamsoundmulti"/>
+      <spinner label="Multiplicateur du nombre de sons &#xE0; pr&#xE9;charger par spam:" name="antispamsoundpreloadmulti"/>
+      <spinner label="Nombre de lignes max. d'un message:" name="antispamnewlines"/>
+      <check_box label="D&#xE9;sactive toutes les fen&#xEA;tres de dialogue (D&#xE9;co/Reco)" name="antispam_checkbox"/>
+
+	  <text name="Block All Dialogs From">Bloquer tous les dialogues provenants de :</text>
+      <check_box label="Alertes" name="Alerts"/>
+      <check_box label="Demande d'amitié" name="Friendship Offers"/>
+      <check_box label="Invitation de groupe" name="Group Invites"/>
+      <check_box label="Notices de groupes" name="Group Notices"/>
+      <check_box label="Offre d'objets" name="Item Offers"/>
+      <check_box label="Scripts" name="Scripts"/>
+      <check_box label="Offres de TP" name="Teleport Offers"/>
+      <check_box label="Me notifier quand un spam est bloqu&#xE9;" name="Notify On Spam" tool_tip="When enabled, the bottom right corner may become a source of pseudo-spam whenever real spam is blocked."/>
+      <check_box label="Invit. de fee de grp" name="Group Fee Invites"/>
+      <check_box label="Active les sons des gestures" name="Enable Gesture Sounds"/>
+    </panel>
+
+    <panel label="Options de Texte" name="TextOptions">
+      <check_box label="Montre les 'fot de frap' ou suppos&#xE9;es telles en ROUGE" name="SpellDisplay"/>
+      <text name="EmSpell_txt1">Langage courant (dictionnaire) :</text>
+      <text name="EmSpell_txt3">T&#xE9;l&#xE9;charger les langues (dictionnaires) :</text>
+      <button label="Installer" name="EmSpell_Add"/>
+      <button label="T&#xE9;l&#xE9;charger +++" name="EmSpell_GetMore" tool_tip="Obtenez plus de dictionnaires en ligne"/>
+      <text name="EmSpell_txt2">Langues additionnelles (dictionnaires) :</text>
+      <button label="Supprimer" name="EmSpell_Remove"/>
+      <button label="Editer un dictionnaire" name="EmSpell_EditCustom"/>
+      <text name="EmSpell_txt4">
 Clic droit sur le mot mal &#xE9;crit et choisir son remplacement.
      </text>

-      <view_border bevel_style="none" border_thickness="1" bottom_delta="-16" follows="top" height="0" left="5" name="CmdDivisor" width="356"/>
-
-      <check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
-        label="Mettre en valeur les messages si l'un deux contient les termes suivants :" name="KeywordsOn" width="270"/>
-      <text bottom_delta="-20" follows="top" height="20" left="12" name="keyword_txt1">(s&#xE9;par&#xE9;s par des virgules)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" left_delta="5" max_length="500" name="KeywordsList" width="300"/>
-      <text bottom_delta="-24" follows="top" height="20" left_delta="15" name="EmKeyw">Est trouv&#xE9; dans :</text>
-      <check_box bottom_delta="3" follows="top" height="16" left_delta="100" label="Chat local" name="KeywordsInChat"/>
-      <check_box bottom_delta="-15" follows="left|top" height="16" label="IMs" name="KeywordsInIM"/>
-      <check_box bottom_delta="-24" follows="top" height="16" label="Mettre en valeur le message avec cette couleur :" left_delta="-110" name="KeywordsChangeColor"/>
-      <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-16" can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top" height="35" left_delta="270" name="KeywordsColor" tool_tip="Click to open Color Picker" width="50"/>
-      <check_box bottom_delta="-10" follows="top" height="16" left_delta="-210" label="Jouer cette alerte sonore : (UUID)" name="KeywordsPlaySound"/>
-      <line_editor bottom_delta="-20" follows="left|top" bevel_style="in" border_style="line" border_thickness="1" height="20" left_delta="-5" max_length="36" name="KeywordsSound" width="300"/>
+      <check_box label="Mettre en valeur les messages si l'un deux contient les termes suivants :" name="KeywordsOn"/>
+      <text name="keyword_txt1">(s&#xE9;par&#xE9;s par des virgules)</text>
+      <text name="EmKeyw">Est trouv&#xE9; dans :</text>
+      <check_box label="Chat local" name="KeywordsInChat"/>
+      <check_box label="IMs" name="KeywordsInIM"/>
+      <check_box label="Mettre en valeur le message avec cette couleur :" name="KeywordsChangeColor"/>
+      <color_swatch name="KeywordsColor" tool_tip="Click to open Color Picker"/>
+      <check_box label="Jouer cette alerte sonore : (UUID)" name="KeywordsPlaySound"/>
    </panel>

  </tab_container>
--- a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
@@ -1,346 +1,227 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
-  border="true" label="Syst&#xE8;me" name="ascsys" enabled="true" mouse_opaque="true">
-  <tab_container label="Singularity System" bottom="0" height="440" width="497" left="0"
-    name="Ascent System" tab_min_width="70" tab_position="top">
+  label="Syst&#xE8;me" name="ascsys">
+  <tab_container label="Singularity System" name="Ascent System">

-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="G&#xE9;n&#xE9;ral" name="User Interface">
-      <check_box bottom_delta="-25" control_name="DoubleClickTeleport" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+    <panel label="G&#xE9;n&#xE9;ral" name="User Interface">
+      <check_box
        label="Activer le TP avec le double-clic" left="10"
        tool_tip="Activer le TP sur un objet/une personne avec le double-clic"
-        mouse_opaque="true" name="double_click_teleport_check" radio_style="false"
+        name="double_click_teleport_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="OptionRotateCamAfterLocalTP" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
        label="R&#xE9;initialiser la cam&#xE9;ra apr&#xE8;s le TP" left="20"
        tool_tip="Centre la cam&#xE9;ra derri&#xE8;re vous apr&#xE8;s un TP."
-        mouse_opaque="true" name="center_after_teleport_check" radio_style="false"
+        name="center_after_teleport_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="OptionOffsetTPByAgentHeight" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
        label="Compenser la cible du TP" left="20"
        tool_tip="Essaye de cibler le TP pour que vos pieds atterrissent au point vis&#xE9;"
-        mouse_opaque="true" name="offset_teleport_check" radio_style="false"
+        name="offset_teleport_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="PreviewAnimInWorld" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
        label="Preview animations on the avatar - Test temporaire d&#x27;une animation" left="10"
        tool_tip="L&#x27;animation est jou&#xE9;e avec votre avatar avant d&#x27;&#xEA;tre t&#xE9;l&#xE9;charg&#xE9;e."
-        mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
+        name="preview_anim_in_world_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="SaveInventoryScriptsAsMono" enabled="false"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
        label="Enregistrer les scripts syst&#xE9;matiquement en Mono" left="10"
        tool_tip="Compile les scripts en Mono quand cela est possible."
-        mouse_opaque="true" name="save_scripts_as_mono_check" radio_style="false"
+        name="save_scripts_as_mono_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentAlwaysRezInGroup" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
        label="Rezzer les objets avec le groupe du terrain quand cela est possible" left="10"
        tool_tip="Rez les objets avec le m&#xEA;me groupe que le terrain, ind&#xE9;pendamment de votre tag actif."
        mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentBuildAlwaysEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
        label="Toujours montrer le bouton construire activ&#xE9;" left="10"
        tool_tip="Permet d&#x27;acc&#xE9;der &#xE0; au bouton construire en permanence, sans pour autant avoir le droit de construire."
-        mouse_opaque="true" name="always_build_check" radio_style="false"
+        name="always_build_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentFlyAlwaysEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
        label="Toujours permettre le mode vol (Fly)" left="10"
        tool_tip="Permet de voler quelques soient les droits de la sim, &#xE0; vos risques et p&#xE9;rils."
-        mouse_opaque="true" name="always_fly_check" radio_style="false"
+        name="always_fly_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentDisableMinZoomDist" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
        label="D&#xE9;sactiver la distance minimum de la cam&#xE9;ra" left="10"
        tool_tip="La cam&#xE9;ra zoome de tr&#xE9;s pr&#xE8;s."
-        mouse_opaque="true" name="disable_camera_zoom_check" radio_style="false"
+        name="disable_camera_zoom_check"
        width="400" />
-      <check_box bottom_delta="-20" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
        label="Activer les fonctions Power User - &#xE0; vos risques et p&#xE9;rils !" left="10"
        tool_tip="Ajoute des fonctions consid&#xE9;r&#xE9;es trop dangereuses pour une utilisation normale. Ces fonctions peuvent faire des ravages si employ&#xE9;es improprement."
-        mouse_opaque="true" name="power_user_check" radio_style="false"
+        name="power_user_check"
        width="400" />
-      <check_box bottom_delta="-20" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
        label="Confirmer les fonctions Power User" left="20"
        tool_tip="Confirme les fonctions Power User. A vos risques et p&#xE9;rils. Singularity n'est pas responsable de cette utilisation."
-        mouse_opaque="true" name="power_user_confirm_check" radio_style="false"
+        name="power_user_confirm_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentUseSystemFolder" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
        label="Activer l&#x27;Ascent System Inventory (Red&#xE9;marrage n&#xE9;cessaire)" left="10"
        tool_tip="Cr&#xE9;e un nouveau dossier dans l&#x27;inventaire afin de stocker les fichiers de settings et les assets non permanents."
-        mouse_opaque="true" name="system_folder_check" radio_style="false"
+        name="system_folder_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentSystemTemporary" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
        label="Les t&#xE9;l&#xE9;chargements temporaires vont dans le dossier : System Inventory &#x3E; Assets" left="20"
        tool_tip="Place les t&#xE9;l&#xE9;chargements temporaires dans le dossier : System Inventory &#x3E; Assets ce qui permet de les retrouver plus ais&#xE9;ment"
-        mouse_opaque="true" name="temp_in_system_check" radio_style="false"
+        name="temp_in_system_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="FetchInventoryOnLogin" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
        label="Pr&#xE9;charger l&#x27;inventaire &#xE0; la connection" left="10"
        tool_tip="R&#xE9;duit l&#x27;attente lors de votre recherche initiale dans l&#x27;inventaire"
-        mouse_opaque="true" name="fetch_inventory_on_login_check" radio_style="false"
+        name="fetch_inventory_on_login_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="WindEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
        label="Activer les effets de vent" left="10"
-        mouse_opaque="true" name="enable_wind" radio_style="false"
+        name="enable_wind"
        width="400" />
-      <check_box bottom_delta="-20" control_name="CloudsEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
        label="Activer les nuages" left="10"
-        mouse_opaque="true" name="enable_clouds" radio_style="false"
+        name="enable_clouds"
        width="400" />
-      <check_box bottom_delta="-20" left_delta="10"  control_name="SkyUseClassicClouds" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
        label="Activer les nuages classiques" left="10"
-        mouse_opaque="true" name="enable_classic_clouds" radio_style="false"
+        mouse_opaque="true" name="enable_classic_clouds"
        width="400" />
-      <check_box bottom_delta="-20" left_delta="-10" control_name="SpeedRez" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box left_delta="-10"
        label="Activer le rezz rapide par rapport &#xE0; une distance progressive" left="10"
-        mouse_opaque="true" name="speed_rez_check" radio_style="false"
+        name="speed_rez_check"
        tool_tip="Active, cette fonction charge progressivement les textures du plus pr&#xE8;s au plus loin"
        width="400" />
-      <spinner bottom_delta="-20" control_name="SpeedRezInterval" enabled="true" decimal_digits="0"
-        follows="left|top" font="SansSerifSmall" height="16" left="30" width="230"
+      <spinner
+        width="230"
        label="Intervalle distance/affichage:" label_width="180"
-        max_val="60" min_val="5" initial_val="20" increment="5"
-        mouse_opaque="true" name="speed_rez_interval" />
-      <text type="string" length="1" bottom_delta="0" left_delta="235" bg_visible="false"
-        border_visible="false" border_drop_shadow_visible="false"
-        drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="16"
-        mouse_opaque="true" name="speed_rez_seconds" v_pad="0" width="100">
+        name="speed_rez_interval" />
+      <text name="speed_rez_seconds" width="100">
 secondes
      </text>
    </panel>

-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Commandes Texte"
-      left="1" mouse_opaque="true" name="Command Line" width="418">
-      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Activer l'usage de la barre de chat comme ligne de commande" left="10"
-        mouse_opaque="true" name="chat_cmd_toggle" radio_style="false" width="270"
-        control_name="AscentCmdLine"/>
-      <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
-        name="cmd_line_text_2" width="512">
+    <panel label="Commandes Texte" name="Command Line">
+      <check_box label="Activer l'usage de la barre de chat comme ligne de commande" left="10"
+        name="chat_cmd_toggle" width="270"/>
+      <text name="cmd_line_text_2" width="512">
 Tp &#224; travers la sim (usage: cmd x y z)
      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLinePos" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_3" width="512">
+      <line_editor name="AscentCmdLinePos" width="200"/>
+      <text name="cmd_line_text_3" width="512">
 Tp au sol (usage: cmd)
      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineGround" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_4" width="512">
+      <line_editor name="AscentCmdLineGround" width="200"/>
+      <text name="cmd_line_text_4" width="512">
 Tp en altitude (usage: cmd z)
      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineHeight" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_5" width="512">
+      <line_editor name="AscentCmdLineHeight" width="200"/>
+      <text name="cmd_line_text_5" width="512">
 Tp &#x22;ET, rentrer maison !&#x22; (usage: cmd)
      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineTeleportHome" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_6" width="512">
+      <line_editor name="AscentCmdLineTeleportHome" width="200"/>
+      <text name="cmd_line_text_6" width="512">
 Rezzer une plateforme (usage: cmd 0 - 30)
      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineRezPlatform" width="200"/>
-      <slider bottom_delta="-22" left_delta="0" name="AscentPlatformSize" control_name="AscentPlatformSize"
-        decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5"
-        initial_val="5" label="Dimensions:" label_width="75" max_val="30" min_val="5"
-        mouse_opaque="true" show_text="true" width="205" auto_resize="false" tool_tip="Quelle taille voulez-vous ?"/>
-      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_8" width="512">
+      <line_editor name="AscentCmdLineRezPlatform" width="200"/>
+      <slider name="AscentPlatformSize" label="Dimensions:" label_width="75"
+        tool_tip="Quelle taille voulez-vous ?"/>
+      <text name="cmd_line_text_8" width="512">
 Calculette (usage: cmd 2 + 2)
      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineCalc" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_15" width="512">
+      <line_editor name="AscentCmdLineCalc" width="200"/>
+      <text name="cmd_line_text_15" width="512">
 Vider l&apos;historique du chat (usage: cmd)
      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="Clears the Chat History to prevent lag effects from chat spammers."
-        name="AscentCmdLineClearChat" width="200"/>
+      <line_editor name="AscentCmdLineClearChat" width="200"/>
      <!-- Column Split -->
-      <view_border bevel_style="none" border_thickness="1" bottom_delta="-5" follows="top|left" height="295"
-        left="230" name="CmdDivisor" width="0"/>
-      <text bottom_delta="277" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
-        name="cmd_line_text_9" width="512">
+      <text name="cmd_line_text_9" width="512">
 Changer le "Draw Distance" (usage: cmd metres)
      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineDrawDistance" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_10" width="512">
+      <line_editor name="AscentCmdLineDrawDistance" width="200"/>
+      <text bname="cmd_line_text_10" width="512">
 Tp &#224; la position de la cam (usage: cmd)
      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdTeleportToCam" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_11" width="512">
+      <line_editor name="AscentCmdTeleportToCam" width="200"/>
+      <text name="cmd_line_text_11" width="512">
 Avoir un nom avec la clef (usage: cmd clef)
      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineKeyToName" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_12" width="512">
+      <line_editor name="AscentCmdLineKeyToName" width="200"/>
+      <text name="cmd_line_text_12" width="512">
 Tp un avatar avec la clef (usage: cmd clef)
      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineOfferTp" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_7" width="512">
+      <line_editor name="AscentCmdLineOfferTp" width="200"/>
+      <text name="cmd_line_text_7" width="512">
 Tp sur une sim x (usage: cmd nomdelasim)
      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineMapTo" width="200"/>
-      <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Utiliser la meme position entre les sims" left_delta="0" mouse_opaque="true"
-        name="map_to_keep_pos" radio_style="false" width="270"
-        control_name="AscentMapToKeepPos"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_13" width="512">
+      <line_editor name="AscentCmdLineMapTo" width="200"/>
+      <check_box
+        label="Utiliser la meme position entre les sims" left_delta="0"
+        name="map_to_keep_pos" width="270"/>
+      <text name="cmd_line_text_13" width="512">
 Se tp vers un avatar (usage: cmd nom)
      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+      <line_editor
        tool_tip="Cette syntaxe permet les noms partiels."
        name="AscentCmdLineTP2" width="200"/>
-      <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_14">Active/d&#xE9;sactive le faux absent (usage: cmd)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="SinguCmdLineAway" width="200"/>
-
+      <text name="cmd_line_text_14">Active/d&#xE9;sactive le faux absent (usage: cmd)</text>
+      <line_editor name="SinguCmdLineAway" width="200"/>
    </panel>

-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="S&#xE9;curit&#xE9;" name="Security">
-      <check_box bottom_delta="-25" control_name="BroadcastViewerEffects" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+    <panel label="S&#xE9;curit&#xE9;" name="Security">
+      <check_box
        label="Emettre les effets du viewer (Excluant les rayons)" left="10"
-        mouse_opaque="true" name="broadcast_viewer_effects" radio_style="false"
+        name="broadcast_viewer_effects"
        width="400" />
-      <check_box bottom_delta="-20" control_name="DisablePointAtAndBeam" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
        label="D&#xE9;sactiver le &#x22;Pointer vers&#x22; &#xE0; l&#x22;&#xE9;dition d&#x27;un objet" left="10"
        tool_tip="Masque le pointeur sur l&#x27;objet  &#xE9;dit&#xE9;"
-        mouse_opaque="true" name="disable_point_at_and_beams_check" radio_style="false"
+        name="disable_point_at_and_beams_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="PrivateLookAt" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
        label="Ne pas &#x22;Regarder vers&#x22;" left="10"
        tool_tip="Supprime les mouvements de t&#xEA;te, et le &#x22;Regarder vers&#x22; pour soi-m&#xEA;me"
-        mouse_opaque="true" name="private_look_at_check" radio_style="false"
+        name="private_look_at_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentShowLookAt" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
        label="Voir quand les autres &#x22;Regardent vers&#x22;" left="10"
        tool_tip="Montre o&#xF9; les autres regardent."
-        mouse_opaque="true" name="show_look_at_check" radio_style="false"
+        name="show_look_at_check"
        width="400" />
-       <check_box bottom_delta="-20" control_name="QuietSnapshotsToDisk" 
-       follows="top" initial_value="false" 
+       <check_box label="Détache automatiquement ce rodjudju de LSL Bridge" tool_tip="détache le LSL Bridge de Phoenix et/ou Firestorm viewer." name="detach_bridge"/>
+       <check_box
       label="Prendre discr&#xE8;tement un photo, sur votre disque dur" 
       tool_tip="Permet de prendre une photo en mode &#x22;espionnage&#x22;, sans bruit d&#x27;appareil, ni mouvement de cam&#xE9;ra, ni gesture. (Uniquement vers le disque dur)." 
       name="quiet_snapshots_check"/>
-       <check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+       <check_box
        label="En vous levant, annule les permissions que l&#x27;objet a sur votre avatar" left="10"
        tool_tip="Evite que l&#x27;objet garde le contr&#xF4;le de votre avatar, comme par exemple les animations."
-        mouse_opaque="true" name="revoke_perms_on_stand_up_check" radio_style="false"
+        name="revoke_perms_on_stand_up_check"
        width="400" />
-      <check_box bottom_delta="-20" control_name="DisableClickSit" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
        label="D&#xE9;sactive le &#x22;Click to sit&#x22; automatique" left="10"
        tool_tip="D&#xE9;sactive llSitTarget. Vous devrez s&#xE9;lectionner vous m&#xEA;me la fonction &#x22;sit&#x22; sur l&#x27;objet."
-        mouse_opaque="true" name="disable_click_sit_check" radio_style="false"
+        name="disable_click_sit_check"
        width="400" />
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Affiche les changements de d&#xE9;comptes de scripts de la r&#xE9;gion." left_delta="0"
-        mouse_opaque="true" name="totalscriptjumps" radio_style="false" width="270"
-        control_name="AscentDisplayTotalScriptJumps"
+      <check_box
+        label="Affiche les changements de d&#xE9;comptes de scripts de la r&#xE9;gion." left_delta="0"
+        name="totalscriptjumps" width="270"
        tool_tip="D&#xE9;pendant du seuil que vous choisissez dans la fen&#xEA;tre &#xE0; droite."/>
-      <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16" increment="1"
-        label="" label_width="0" digits="4" left_delta="325" max_val="9999"
-        min_val="1" mouse_opaque="true" name="ScriptJumpCount" width="50" control_name="Ascentnumscriptdiff"
-        tool_tip="Threshold for the script jump message [Default: 100]"/>
+      <spinner left_delta="350" name="ScriptJumpCount" tool_tip="Threshold for the script jump message [Default: 100]"/>
    </panel>

-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true" follows="left|top|right|bottom" label="Build/Cr&#xE9;ation" name="Building">
-
-
-      <text bottom_delta="-19" follows="top" height="10" left_delta="30" name="text_box6">Point de Pivot</text>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="X pos" label_width="40" left="10" max_val="256" min_val="-256" name="X pos" width="120" control_name="AscentBuildPrefs_PivotX"/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Y pos" label_width="40" max_val="256" min_val="-256" name="Y pos" width="120" control_name="AscentBuildPrefs_PivotY"/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Z pos" label_width="40" max_val="256" min_val="-256" name="Z pos" width="120" control_name="AscentBuildPrefs_PivotZ"/>
-      <check_box bottom_delta="-20" follows="top" label="Valeurs en pour&#xE7;entages" left_delta="-5" tool_tip="Default settings are Percentages and every axis set at 50" name="EmPivotPercToggle" control_name="AscentBuildPrefs_PivotIsPercent"/>
-      <check_box bottom_delta="60" follows="top" label="Active les &#x22;Highlights&#x22; sur les prims s&#xE9;lectionn&#xE9;s" left_delta="140" name="EmBuildPrefsRenderHighlight_toggle" control_name="RenderHighlightSelections"/>
-	  <check_box bottom_delta="-20" follows="top" initial_value="false" label="Axe sur le Root Prim" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead." name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"/>
-      <view_border bevel_style="none" border_thickness="1" bottom="-180" follows="top" height="70" left="5" name="NextOwnerBorder" width="130"/>
-      <text bottom_delta="60" follows="top" height="10" left_delta="10" name="text_box7">Permissions:</text>
-        <check_box follows="top" height="16" initial_value="false" label="Copy " tool_tip="Next owner can make copies of creations" name="next_owner_copy" control_name="NextOwnerCopy"/>
-        <check_box follows="top" height="16" initial_value="false" label="Modify " tool_tip="Next owner can edit creations" name="next_owner_modify" control_name="NextOwnerModify"/>
-        <check_box follows="top" height="16" initial_value="true" label="Transfer " tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
-      <texture_picker allow_no_texture="false" bottom="-190" can_apply_immediately="true" default_image_name="Default" follows="top" height="80" label="     Texture" left="155" name="texture control" control_name="EmeraldBuildPrefs_Texture" tool_tip="Click to choose a texture" width="64"/>
-      <check_box bottom="-131" left_delta="75" follows="top" height="16" label="Phantom" name="EmPhantomToggle" control_name="EmeraldBuildPrefs_Phantom"/>
-      <check_box follows="top" height="16" label="Physical" name="EmPhysicalToggle" control_name="EmeraldBuildPrefs_Physical"/>
-      <check_box follows="top" height="16" label="Temporaire" name="EmTemporaryToggle" control_name="EmeraldBuildPrefs_Temporary"/>
-      <combo_box bottom="-190" left_delta="6" follows="top" height="18" name="material" width="64" control_name="BuildPrefs_Material">
-        <combo_item name="Stone" value="Stone">Stone</combo_item>
-        <combo_item name="Metal" value="Metal">Metal</combo_item>
-        <combo_item name="Glass" value="Glass">Glass</combo_item>
-        <combo_item name="Wood" value="Wood">Wood</combo_item>
-        <combo_item name="Flesh" value="Flesh">Flesh</combo_item>
-        <combo_item name="Plastic" value="Plastic">Plastic</combo_item>
-        <combo_item name="Rubber" value="Rubber">Rubber</combo_item>
-      </combo_box>
-      <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-190" can_apply_immediately="true" color="1, 1, 1, 1" follows="top" height="80" label="    Couleur" left_delta="76" name="colorswatch" tool_tip="Click to open Color Picker" width="64" control_name="EmeraldBuildPrefs_Color"/>
-      <spinner bottom_delta="60" decimal_digits="0" follows="top" height="16" increment="1" label="Alpha" label_width="45" left_delta="70" max_val="100" min_val="0" name="alpha" width="97" control_name="EmeraldBuildPrefs_Alpha"/>
-      <spinner bottom_delta="-20" decimal_digits="2" follows="top" height="16" increment="0.05" label="Glow" label_width="45" max_val="1" min_val="0" name="glow" width="97" control_name="EmeraldBuildPrefs_Glow"/>
-      <check_box follows="top" height="16" label="Lumineux" name="EmFBToggle" control_name="EmeraldBuildPrefs_FullBright"/>
-      <text follows="top">Brillance</text>
-      <combo_box bottom_delta="-5" follows="top" left_delta="42" height="18" name="combobox shininess" tool_tip="Set the amount of shine for the object" width="62" control_name="EmeraldBuildPrefs_Shiny">
-        <combo_item name="None" value="None">None</combo_item>
-        <combo_item name="Low" value="Low">Low</combo_item>
-        <combo_item name="Medium" value="Medium">Medium</combo_item>
-        <combo_item name="High" value="High">High</combo_item>
-      </combo_box>
-      <check_box name="EmeraldBuildPrefsEmbedItem" left="5" bottom_delta="-15" follows="top" initial_value="false" label="Mettre un &#xE9;l&#xE9;ment dans l'object" control_name="EmeraldBuildPrefs_EmbedItem"/>
-       <view_border blevel_style="in" bottom_delta="-20" left="25" follows="top" height="16" name="build_item_drop_target_rect" width="140"/>
-        <text bottom_delta="0" left_delta="8" follows="top" height="16" name="Give inventory">Glissez l'&#xE9;l&#xE9;ment ICI</text>
-       <view_border blevel_style="in" bottom_delta="-35" left_delta="-8" follows="top" height="35" name="build_item_add_disp_rect" width="140"/>
-         <text bottom_delta="15" left_delta="0" follows="top" height="16" name="build_item_add_disp_rect_txt" halign="center" width="138">Currently set to:
-	       ITEM</text>
-       <spinner bottom="369" left="380" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="          X" label_width="40" max_val="10" min_val="0.0001" name="X size" width="110" control_name="BuildPrefs_Xsize"/>
-       <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="          Y" label_width="40" max_val="10" min_val="0.0001" name="Y size" width="110" control_name="BuildPrefs_Ysize"/>
-       <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="          Z" label_width="40" max_val="10" min_val="0.0001" name="Z size" width="110" control_name="BuildPrefs_Zsize"/>
+    <panel label="Build/Cr&#xE9;ation" name="Building">
+      <text name="text_box6">Point de Pivot</text>
+      <check_box label="Valeurs en %" name="EmPivotPercToggle"/>
+      <check_box label="Active les &#x22;Highlights&#x22; sur les prims s&#xE9;lectionn&#xE9;s" name="EmBuildPrefsRenderHighlight_toggle"/>
+	  <check_box label="Axe sur le Root Prim" name="EmBuildPrefsActualRoot_toggle"/>
+      <text name="text_box7">Permissions :</text>
+      <check_box label="Phantom" name="EmPhantomToggle"/>
+      <check_box label="Physical" name="EmPhysicalToggle"/>
+      <check_box label="Temporaire" name="EmTemporaryToggle"/>
+      <color_swatch label="    Couleur" name="colorswatch"/>
+      <check_box label="Lumineux" name="EmFBToggle"/>
+      <check_box name="EmeraldBuildPrefsEmbedItem" label="Mettre un &#xE9;l&#xE9;ment dans l'object"/>
+        <text name="Give inventory">Glissez l'&#xE9;l&#xE9;ment ICI</text>
    </panel>

  </tab_container>
--- a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml
@@ -1,55 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel top="20" left="10" height="400" width="512" border="true" label="Vanity" name="ascvan">
-  <tab_container label="Singularity Vanity" bottom="0" height="440" width="497" name="Ascent Vanity" tab_min_width="90">
-    <panel border="true" left="1" bottom="-190" height="180" width="500" label="Principal" name="General">
-      <check_box bottom_delta="-25" control_name="AscentStoreSettingsPerAccount" follows="top" height="16" initial_value="true" label="Lorsque c'est possible, sauver le setting personnalisé par compte." left="10" tool_tip="Sauve le settings customis&#xE9; pour chaque alt." name="use_account_settings_check"/>
-      <check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" follows="top" height="16" initial_value="true" label="Masquer la barre de 'TP in progress'" tool_tip="Ceci permet de continuer des lire vos IMs durant le TP." name="disable_tp_screen_check"/>
-      <check_box bottom_delta="-20" control_name="OptionPlayTpSound" follows="top" height="16" initial_value="true" label="Jouer le son du TP pendant la transition inter sims" tool_tip="jouer le 'wooooooosssssssssh'." name="tp_sound_check"/>
-      <check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" follows="top" height="16" initial_value="true" label="Masquer l'&#xE9;cran du Login/Logout" tool_tip="" name="disable_logout_screen_check"/>
-      <check_box bottom_delta="-20" control_name="SGDisableChatAnimation" follows="top" height="16" initial_value="false" label="D&#xE9;sactiver les animations pour le chat local: dire, chuchoter, crier" tool_tip="" name="disable_chat_animation"/>
+<panel label="Vanity" name="ascvan">
+  <tab_container label="Singularity Vanity" name="Ascent Vanity">
+    <panel label="Principal" name="General">
+      <check_box bottom_delta="-25" follows="top" height="16" label="Lorsque c'est possible, sauver le setting personnalisé par compte." left="10" tool_tip="Sauve le settings customis&#xE9; pour chaque alt." name="use_account_settings_check"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Masquer la barre de 'TP in progress'" tool_tip="Ceci permet de continuer des lire vos IMs durant le TP." name="disable_tp_screen_check"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Jouer le son du TP pendant la transition inter sims" tool_tip="jouer le 'wooooooosssssssssh'." name="tp_sound_check"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Masquer l'&#xE9;cran du Login/Logout" tool_tip="" name="disable_logout_screen_check"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="D&#xE9;sactiver les animations pour le chat local: dire, chuchoter, crier" tool_tip="" name="disable_chat_animation"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Rajouter les attachements et habits au lieu de les remplacer" tool_tip="" name="add_not_replace"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Pivote l'avatar quand on marche en arriere" tool_tip="Certains AO peuvent empecher la fontion." name="turn_around"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Préviens quand quelqu'un prend une photo" tool_tip="Sauf si la personne a elle même choisi le mode silencieux." name="announce_snapshots"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Annonce les titres des chansons dans le chat local" tool_tip="" name="announce_stream_metadata"/>
    </panel>
-    <panel border="true" left="1" bottom="-190" height="180" width="500" label="Tags/Couleurs" name="TagsColors">
+    <panel label="Tags/Couleurs" name="TagsColors">
      <!-- Client tag options -->
-      <check_box bottom_delta="-25" control_name="AscentUseTag" follows="top" height="16" initial_value="true" label="Activer les Fonctions des TAGs." left="10" tool_tip="CERTAINES FONCTIONS NE SONT PLUS ACTIVABLES SUITE AUX NOUVELLES MESURES DU LINDEN LAB." name="show_my_tag_check"/>
+      <check_box bottom_delta="-25" follows="top" label="Activer les Fonctions des TAGs." left="10" tool_tip="CERTAINES FONCTIONS NE SONT PLUS ACTIVABLES SUITE AUX NOUVELLES MESURES DU LINDEN LAB." name="show_my_tag_check"/>
      <combo_box follows="top" bottom_delta="-24" height="18" left_delta="24" max_chars="32" tool_tip="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" name="tag_spoofing_combobox" width="130">
        <combo_item name="Singularity" value="f25263b7-6167-4f34-a4ef-af65213b2e39">Singularity</combo_item>
      </combo_box>
-      <check_box bottom_delta="-23" control_name="AscentShowSelfTag" follows="top" height="16" initial_value="true" label="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" left_delta="-24" tool_tip="Le viewer utilis&#xE9; par les avatars ne peut plus &#xEA;tre visible depuis que Linden lab l&#x27;a d&#xE9;sactiv&#xE9;" name="show_self_tag_check"/>
-      <check_box bottom_delta="-20" control_name="AscentShowSelfTagColor" follows="top" height="16" initial_value="true" label="Afficher sa propre couleur custom " tool_tip="Vous seul la voyez." name="show_self_tag_color_check"/>
-      <check_box bottom_delta="-20" control_name="AscentShowFriendsTag" follows="top" height="16" initial_value="true" label="Afficher le tag (Friend)" tool_tip="Rajoute (friends) dans le tag quand vous voyez un(e) ami(e)." name="show_friend_tag_check"/>
+      <check_box bottom_delta="-23" follows="top" label="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" left_delta="-24" tool_tip="Le viewer utilis&#xE9; par les avatars ne peut plus &#xEA;tre visible depuis que Linden lab l&#x27;a d&#xE9;sactiv&#xE9;" name="show_self_tag_check"/>
+      <check_box bottom_delta="-20" follows="top" label="Afficher sa propre couleur custom " tool_tip="Vous seul la voyez." name="show_self_tag_color_check"/>
+      <check_box bottom_delta="-20" follows="top" label="Afficher le tag (Friend)" tool_tip="Rajoute (friends) dans le tag quand vous voyez un(e) ami(e)." name="show_friend_tag_check"/>
      <!-- End of Left Side -->
-      <check_box bottom_delta="87" control_name="AscentUseCustomTag" follows="top" height="16" initial_value="true" label="Choisir une couleur custom (Mode Local uniquement)" left_delta="205" tool_tip="Vous seul(e) la voyez." name="customize_own_tag_check"/>
-      <text bottom_delta="-17" left_delta="25" follows="top" height="10" name="custom_tag_label_text">Label :</text>
-      <line_editor bottom_delta="-6" follows="top" font="SansSerif" height="18" left_delta="35" name="custom_tag_label_box" tool_tip="" width="100"/>
-      <text bottom_delta="6" left_delta="110" follows="top" height="10" name="custom_tag_color_text">Couleur :</text>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-22"        can_apply_immediately="false" color="1 1 1 1" follows="top" height="34" left_delta="35" name="custom_tag_color_swatch" control_name="AscentCustomTagColor" tool_tip="" width="30" />
-      <check_box bottom_delta="-8" control_name="AscentShowOthersTag" follows="top" height="16" initial_value="true" label="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" left_delta="-205" tool_tip="Le viewer utilis&#xE9; par les avatars ne peut plus &#xEA;tre visible depuis que Linden lab l&#x27;a d&#xE9;sactiv&#xE9;" name="show_other_tag_check"/>
-      <check_box bottom_delta="-20" control_name="AscentShowOthersTagColor" follows="top" height="16" initial_value="true" label="Afficher la couleur pour les autres avatars" left_delta="0" tool_tip="" name="show_client_tag_color_check"/>
-      <check_box bottom_delta="-20" control_name="AscentShowIdleTime" follows="top" height="16" initial_value="true" label="Afficher la dur&#xE9;e du 'IDLE'" tool_tip="Affiche le temps pendant lequel l'avatar est immobile." name="show_idle_time_check"/>
-      <check_box bottom_delta="-20" control_name="AscentUpdateTagsOnLoad" follows="top" height="16" initial_value="true" label="Chercher automatiquement les Mises &#xE0; Jour des Tags" left_delta="-205" tool_tip="" name="update_tags_check"/>
-      <button bottom_delta="0" control_name="ManualUpdate" name="update_clientdefs" follows="top" label="MAJ Manuelle" height="18" left_delta="340" width="110"/>
+      <check_box bottom_delta="87" follows="top" label="Choisir une couleur custom (Mode Local uniquement)" left_delta="205" tool_tip="Vous seul(e) la voyez." name="customize_own_tag_check"/>
+      <text bottom_delta="-17" left_delta="25" follows="top" name="custom_tag_label_text">Label :</text>
+      <line_editor bottom_delta="-6" left_delta="35" name="custom_tag_label_box" width="100"/>
+      <text bottom_delta="6" left_delta="110" follows="top" name="custom_tag_color_text">Couleur :</text>
+      <color_swatch bottom_delta="-22" follows="top" height="34" left_delta="35" name="custom_tag_color_swatch" width="30" />
+      <check_box bottom_delta="-8" follows="top" label="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" left_delta="-205" tool_tip="Le viewer utilis&#xE9; par les avatars ne peut plus &#xEA;tre visible depuis que Linden lab l&#x27;a d&#xE9;sactiv&#xE9;" name="show_other_tag_check"/>
+      <check_box bottom_delta="-20" follows="top" label="Afficher la couleur pour les autres avatars" left_delta="0" tool_tip="" name="show_client_tag_color_check"/>
+      <check_box bottom_delta="-20" follows="top" label="Afficher la dur&#xE9;e du 'IDLE'" tool_tip="Affiche le temps pendant lequel l'avatar est immobile." name="show_idle_time_check"/>
+      <check_box bottom_delta="-20" follows="top" label="Chercher automatiquement les Mises &#xE0; Jour des Tags" left_delta="-205" name="update_tags_check"/>
+      <button bottom_delta="0" name="update_clientdefs" follows="top" label="MAJ Manuelle" left_delta="340" width="110"/>
      <!-- End of Client Tag settings -->
-      <text bottom_delta="-25" follows="top" height="10" left="20" name="effects_color_textbox">Couleurs de mes effets :</text>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34" can_apply_immediately="true" color="1 1 1 1" control_name="EffectColor" follows="top" height="47" label="Effets" left_delta="138" name="effect_color_swatch" width="44"/>
-      <check_box bottom_delta="-20" control_name="AscentUseStatusColors" follows="top" height="16" initial_value="true" label="Activer les couleurs pour: Amis, Linden, etc..." left="10" tool_tip="" name="use_status_check"/>
-      <text bottom_delta="-20" follows="top" height="10" left_delta="10" name="friends_color_textbox">Choix des couleurs :
+      <text bottom_delta="-25" follows="top" left="20" name="effects_color_textbox">Couleurs de mes effets :</text>
+      <color_swatch bottom_delta="-34" follows="top" height="47" label="Effets" left_delta="138" name="effect_color_swatch" width="44"/>
+      <check_box bottom_delta="-20" follows="top" label="Activer les couleurs pour: Amis, Linden, etc..." left="10" name="use_status_check"/>
+      <text bottom_delta="-20" follows="top" left_delta="10" name="friends_color_textbox">Choix des couleurs :
 (Radar, Tag, Minimap)</text>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34" can_apply_immediately="true" color="1 1 1 1" control_name="AscentFriendColor" follows="top" height="47" label="Amis" left_delta="138" name="friend_color_swatch" width="44" tool_tip=""/>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="1 1 1 1" control_name="AscentEstateOwnerColor" follows="top" height="47" label="Estate" left_delta="54" name="estate_owner_color_swatch" width="44" tool_tip=""/>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.6 0.6 1 1" control_name="AscentLindenColor" follows="top" height="47" label="Lindens" left_delta="54" name="linden_color_swatch" width="44" tool_tip=""/>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.8 1 1 1" control_name="AscentMutedColor" follows="top" height="47" label="Mut&#xE9;" left_delta="54" name="muted_color_swatch" width="44" tool_tip=""/>
+      <color_swatch bottom_delta="-34" follows="top" height="47" label="Amis" left_delta="138" name="friend_color_swatch" width="44"/>
+      <color_swatch bottom_delta="0" follows="top" height="47" label="Estate" left_delta="54" name="estate_owner_color_swatch" width="44"/>
+      <color_swatch bottom_delta="0" follows="top" height="47" label="Lindens" left_delta="54" name="linden_color_swatch" width="44"/>
+      <color_swatch bottom_delta="0" follows="top" height="47" label="Mut&#xE9;" left_delta="54" name="muted_color_swatch" width="44"/>
    </panel>
-    <panel border="true" left="1" bottom="-190" height="180" width="500" label="Body Dyn. (Bouger les n&#xE9;n&#xE9;s)" name="Body Dynamics">
-      <check_box bottom_delta="-25" follows="top" height="16" label="Activer les &#x22;physics&#x22; des n&#xE9;n&#xE9;s voire du popotin des avatars ^^" left="10" name="EmBreastsToggle" control_name="EmeraldBreastPhysicsToggle" tool_tip=""/>
-      <slider bottom_delta="-20" left="10" name="EmeraldBoobMass" control_name="EmeraldBoobMass" decimal_digits="0" follows="top" height="18" increment="1" label="Masse :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
-      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobHardness" control_name="EmeraldBoobHardness" decimal_digits="0" follows="top" height="18" increment="1" label="Rebond :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
-      <slider bottom_delta="-20" name="EmeraldBoobVelMax" control_name="EmeraldBoobVelMax" decimal_digits="0" follows="top" height="18" increment="1" label="V&#xE9;locit&#xE9; max :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
-      <slider bottom_delta="-20" name="EmeraldBoobFriction" control_name="EmeraldBoobFriction" decimal_digits="0" follows="top" height="18" increment="1" label="Friction :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
-      <slider bottom_delta="-20" name="EmeraldBoobVelMin" control_name="EmeraldBoobVelMin" decimal_digits="0" follows="top" height="18" increment="1" label="V&#xE9;locit&#xE9; min :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
+    <panel label="Body Dyn. (Bouger les n&#xE9;n&#xE9;s)" name="Body Dynamics">
+      <check_box bottom_delta="-25" follows="top" label="Activer les &#x22;physics&#x22; des n&#xE9;n&#xE9;s voire du popotin des avatars ^^" left="10" name="EmBreastsToggle"/>
+      <slider bottom_delta="-20" left="10" name="EmeraldBoobMass" follows="top" height="18" label="Masse :" label_width="100" width="250"/>
+      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobHardness" follows="top" height="18" label="Rebond :" label_width="100" width="250"/>
+      <slider bottom_delta="-20" name="EmeraldBoobVelMax"follows="top" label="V&#xE9;locit&#xE9; max :" label_width="100" width="250"/>
+      <slider bottom_delta="-20" name="EmeraldBoobFriction" follows="top" label="Friction :" label_width="100" width="250"/>
+      <slider bottom_delta="-20" name="EmeraldBoobVelMin" follows="top" label="V&#xE9;locit&#xE9; min :" label_width="100" width="250"/>
      <text bottom_delta="-20" height="15" left="10" name="av_mod_textbox" follows="top">Modifier l'offset de l'avatar</text>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="X Modif." label_width="65" left_delta="5" max_val="0.15" min_val="-0.15" name="X Modifier" width="128" control_name="AscentAvatarXModifier" tool_tip=""/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Y Modif." label_width="65" max_val="0.20" min_val="-0.20" name="Y Modifier" width="128" control_name="AscentAvatarYModifier" tool_tip=""/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.1" label="Z Modif." label_width="65" max_val="5.0" min_val="-5.0" name="Z Modifier" width="128" control_name="AscentAvatarZModifier" tool_tip=""/>
+      <spinner bottom_delta="-20" follows="top" label="X Modif." label_width="65" left_delta="5" name="X Modifier" width="128"/>
+      <spinner bottom_delta="-20" follows="top" label="Y Modif." label_width="65" name="Y Modifier" width="128"/>
+      <spinner bottom_delta="-20" follows="top" label="Z Modif." label_width="65" name="Z Modifier" width="128"/>
    </panel>
  </tab_container>
 </panel>
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -5,7 +5,7 @@
 		D&#xE9;cocher cette option pour passer en mode plein &#xE9;cran.
 	</text_editor>
 	<text name="WindowSizeLabel">
-		Taille de la fen&#xEA;tre:
+		Taille de la fen&#xEA;tre :
 	</text>
 	<combo_box name="windowsize combo">
 		<combo_item name="640x480">
@@ -25,10 +25,10 @@
 		</combo_item>
 	</combo_box>
 	<text name="DisplayResLabel" width="165">
-		R&#xE9;solution de l'affichage:
+		R&#xE9;solution de l'affichage :
 	</text>
 	<text name="AspectRatioLabel1" tool_tip="largeur/hauteur">
-		Rapport hauteur/largeur:
+		Rapport hauteur/largeur :
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
 		<combo_item name="4:3(StandardCRT)">
@@ -45,71 +45,61 @@
 		</combo_item>
 	</combo_box>
 	<text name="text">
-		R&#xE9;solution d'affichage:
+		R&#xE9;solution d'affichage :
 	</text>
 	<text name="Fullscreen Aspect Ratio:">
-		Format de plein &#xE9;cran:
+		Format de plein &#xE9;cran :
 	</text>
 	<text name="(width / height)">
 		(largeur / hauteur)
 	</text>
 	<text name="UI Size:">
-		Taille de l'IU:
+		Taille de l'IU :
 	</text>
 	<text name="(meters, lower is faster)">
 		(mètres, moins = plus rapide)
 	</text>
 	<text name="text2">
-		Options d'affichage:
+		Options d'affichage :
 	</text>
-	<check_box label="Lancer Singularity dans une fen&#xEA;tre (et non pas, PAR la fen&#xEA;tre)" name="windowed mode"/>
+	<check_box label="Lancer Singularity dans une fen&#xEA;tre (non pas, PAR la fen&#xEA;tre)" name="windowed mode"/>
+	<button left="330" width="165" label="Param&#xE8;tres recommand&#xE9;s" tool_tip="Reset to recommended graphics settings" name="Defaults"/>
 	<check_box label="Auto-d&#xE9;tection du ratio" left="350" name="aspect_auto_detect"/>
 	<check_box label="Utiliser &#xE9;chelle de r&#xE9;solution ind&#xE9;pendante" name="ui_auto_scale"/>
 	<check_box label="Montrer l'avatar en vue subjective" name="avfp"/>
-	<spinner label="Distance d'affichage:" name="draw_distance"/>
-	<text name="HigherText">
-		Qualit&#xE9; et
-	</text>
-	<text name="QualityText">
-		Performance :
-	</text>
-	<text left="105" name="FasterText">
-		Plus rapide
-	</text>
-	<text name="ShadersPrefText">
-		Faible
-	</text>
-	<text name="ShadersPrefText2">
-		Moyen
-	</text>
-	<text name="ShadersPrefText3">
-		Elev&#xE9;
-	</text>
-	<text name="ShadersPrefText4">
-		Ultra
-	</text>
-	<text bottom="-86" left="325" name="HigherText2">
-		Plus &#xE9;lev&#xE9;e
-	</text>
+	<spinner label="Distance d'affichage :" name="draw_distance"/>
+	<check_box label="Auto-detect ratio" name="aspect_auto_detect"/>
+
+  <tab_container name="graphics_tab">
+	<panel label="Main" name="Main">
+	<text bottom="330"  height="12" left="10" name="QualityText">Qualité / Perfs:</text>
+	<text bottom_delta="0"  height="12" left="125" name="FasterText">Rapidité</text>
+	<text bottom_delta="-16" height="12" left_delta="45" name="ShadersPrefText">Bas</text>
+	<text bottom_delta="0" height="12" left_delta="30" name="ShadersPrefText2">Medium</text>
+	<text bottom_delta="0" height="12" left_delta="52" name="ShadersPrefText3">Haut</text>
+	<text bottom_delta="0" height="12" left_delta="35" name="ShadersPrefText4">Ultra</text>
+	<text bottom_delta="16"  height="12"	left_delta="23" name="QualityText2">Qualité</text>
 	<text name="QualityText2" visible="false"/>
 	<check_box label="Personnaliser" left="395" name="CustomSettings"/>
 	<text name="ShadersText">
-		Effets:
+		Effets :
 	</text>
-	<check_box label="Pla&#xE7;age de relief et brillance" name="BumpShiny"/>
+	<check_box label="Eau Transparente" name="TransparentWater"/>
+	<check_box label="Placage de relief et brillance" name="BumpShiny"/>
+	<check_box label="Lumi&#xE8;re locales" name="LightingDetailRadio"/>
 	<check_box label="Effets de base" name="BasicShaders" tool_tip="D&#xE9;sactiver cette option peut emp&#xEA;cher certains drivers de cartes graphiques de planter."/>
 	<check_box label="Effets atmosph&#xE9;riques" name="WindLightUseAtmosShaders"/>
 	<check_box label="D&#xE9;lissage" name="RenderDeferred" width="256" />
 	<check_box label="Occlusion ambiante" name="UseSSAO"/>
 	<check_box label="Profondeur de champ" name="RenderDepthOfField"/>
 	<check_box label="Illumination globale (Experimental)" name="RenderDeferredGI" width="256"/>
-	<text bottom_delta="-17" name="ReflectionDetailText" width="128">
-		Reflets:
+	<text  name="ReflectionDetailText" width="128">
+		Reflets :
 	</text>
 	<combo_box bottom_delta="-20" label="Reflection Detail" name="ReflectionDetailCombo">
 		<combo_item name="0">
           Aucun
-		</combo_item>
+           </combo_item>
 		<combo_item name="1">
 			Terrain et arbres
 		</combo_item>
@@ -123,22 +113,29 @@
 			Tout
 		</combo_item>
 	</combo_box>
-	<text bottom_delta="-17" name="ShadowDetailText" width="128">
-		Ombres att&#xE9;nu&#xE9;es:
-	</text>
-	<combo_box bottom_delta="-20" label="Shadow Detail" name="ShadowDetailCombo">
-	<combo_item name="0">
-		D&#xE9;sactiv&#xE9;
+  <text name="TerrainScaleText">Echelle du terrain:</text>
+  <combo_box label="Echelle du terrain" name="TerrainScaleCombo">
+    <combo_item name="Low">Faible</combo_item>
+    <combo_item name="Medium">Medium</combo_item>
+    <combo_item name="High">Haute</combo_item>
+    <combo_item name="Ultra">Ultra</combo_item>
+  </combo_box>
+  <text bottom_delta="-17" name="ShadowDetailText" width="128">
+    Ombres att&#xE9;nu&#xE9;es :
+  </text>
+  <combo_box bottom_delta="-20" label="Shadow Detail" name="ShadowDetailCombo">
+    <combo_item name="0">
+      D&#xE9;sactiv&#xE9;
    </combo_item>
    <combo_item name="1">
-        Ombres solaires
+      Ombres solaires
    </combo_item>
    <combo_item name="2">
-        Ombres des projecteurs
+      Ombres des projecteurs
    </combo_item>
  </combo_box>
 	<text name="AvatarRenderingText">
-		Rendu de l'avatar:
+		Rendu de l'avatar :
 	</text>
 	<check_box label="Avatars &#xE9;loign&#xE9;s en 2D" name="AvatarImpostors"/>
 	<check_box label="Acc&#xE9;l&#xE9;ration du rendu" name="AvatarVertexProgram"/>
@@ -149,18 +146,18 @@
 	<text name="DrawDistanceMeterText2">
 		m
 	</text>
-	<slider label="Limite d'affichage:" name="DrawDistance"/>
-	<slider label="Nombre de particules max.:" label_width="143" name="MaxParticleCount"/>
-	<slider label="Qualit&#xE9; post-traitement:" label_width="125" name="RenderPostProcess"/>
+	<slider label="Limite d'affichage :" name="DrawDistance"/>
+	<slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/>
+	<slider label="Qualit&#xE9; post-traitement :" label_width="125" name="RenderPostProcess"/>
 	<text name="MeshDetailText">
-		D&#xE9;tails des rendus:
+		D&#xE9;tails des rendus :
 	</text>
-	<slider label="  Objets:" name="ObjectMeshDetail"/>
-	<slider label="  Flexiprims:" name="FlexibleMeshDetail"/>
-	<slider label="  Arbres:" name="TreeMeshDetail"/>
-	<slider label="  Avatars:" name="AvatarMeshDetail"/>
-	<slider label="  Relief:" name="TerrainMeshDetail"/>
-	<slider label="  Ciel:" name="SkyMeshDetail"/>
+	<slider label="  Objets :" name="ObjectMeshDetail"/>
+	<slider label="  Flexiprims :" name="FlexibleMeshDetail"/>
+	<slider label="  Arbres :" name="TreeMeshDetail"/>
+	<slider label="  Avatars :" name="AvatarMeshDetail"/>
+	<slider label="  Relief :" name="TerrainMeshDetail"/>
+	<slider label="  Ciel :" name="SkyMeshDetail"/>
 	<text name="PostProcessText">
 		Faible
 	</text>
@@ -183,7 +180,7 @@
 		Faible
 	</text>
 	<text name="LightingDetailText">
-		Sources lumineuses:
+		Sources lumineuses :
 	</text>
 	<radio_group name="LightingDetailRadio">
 		<radio_item name="SunMoon">
@@ -194,7 +191,7 @@
 		</radio_item>
 	</radio_group>
 	<text left="380" name="TerrainDetailText">
-		Rendu du terrain:
+		Rendu du terrain :
 	</text>
 	<radio_group name="TerrainDetailRadio">
 		<radio_item name="0">
@@ -204,9 +201,35 @@
 			Elev&#xE9;
 		</radio_item>
 	</radio_group>
-	<button label="Param&#xE8;tres recommand&#xE9;s" left="20" name="Defaults" width="200"/>
-	<!--button label="Advanced" left="130" name="CustomSettingsButton"/-->
-	<button label="Configuration du mat&#xE9;riel" left="240" name="GraphicsHardwareButton" width="220"/>
+  </panel>
+
+  <panel name="Hardware" label="Configuration du mat&#xE9;riel">
+	<check_box bottom="-22" label="Filtre anisotrope (plus lent si activ&#xE9;)" left="5" name="ani"/>
+    <text bottom="-37" left="10" name="Antialiasing:">Antialiasing:</text>
+    <combo_box bottom="-41" label="Antialiasing" left="148" name="fsaa">
+      <combo_item name="FSAADisabled">Disabled</combo_item>
+      <combo_item name="2x">2x</combo_item>
+      <combo_item name="4x">4x</combo_item>
+      <combo_item name="8x">8x</combo_item>
+      <combo_item name="16x">16x</combo_item>
+    </combo_box>
+    <spinner bottom_delta="70" label="M&#xE9;moire graphique (MB):" label_width="138" left="10" name="GrapicsCardTextureMemory"
+     tool_tip="Taille de la m&#xE9;moire allou&#xE9;e aux textures. Par d&#xE9;faut, c&#x27;est celle de la carte graphique. La réduire peut am&#xE9;liorer les performances mais peut aussi rendre les textures floues." width="202"/>
+    <check_box bottom_delta="-25" label="Activer OpenGL Vertex Buffer Objects" left="5" name="vbo"
+     tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu'ils sont activés."/>
+    <check_box bottom_delta="-18" label="Activer Streamed VBOs" left="14" name="vbo_stream"
+     tool_tip="La performance peut être ameliorée si les VBO sont activés. Désactivé, on observe une meilleure performance pour certains processeurs AMD."/>
+    <check_box bottom_delta="-25" label="Activer la m&#xE9;moire tampon de la trame" left="5" name="fbo"
+     tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu'ils sont activés."/>
+    <spinner bottom="-42" label="Gamma:" label_width="138" left="250" name="gamma" width="202" tool_tip="(0 = défaut, valeur faible = plus lumineux)"/>
+    <spinner bottom_delta="70" label="Coefficient de Brouillard :" label_width="138" name="fog" width="202"/>
+    <text bottom_delta="-50" name="note">
+Note: Le Gamma et le brouillard, sont inactifs
+quand les effets atmosphériques
+le sont également.
+    </text>
+  </panel>
+ </tab_container>
 	<text name="resolution_format">
 		[RES_X] x [RES_Y]
 	</text>
--- a/install.xml
+++ b/install.xml
@@ -853,9 +853,9 @@
          <key>linux64</key>
          <map>
            <key>md5sum</key>
-            <string>c6f662eaa9aeaf03f73779393640f386</string>
+            <string>50ab4b0642c427e062f4e86b5421eb01</string>
            <key>url</key>
-            <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/llqtwebkit-linux-x86_64-20120716.tar.bz2</uri>
+            <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/llqtwebkit-4.7.1-linux64-20130116.tar.bz2</uri>
          </map>
          <key>windows</key>
          <map>