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

2013-04-20 03:13:00 +02:00
parent d593ebfa34 3bdeb8e8a8
commit f83717255f
20 changed files with 367 additions and 263 deletions
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -486,10 +486,14 @@ LLThreadSafeRefCount::LLThreadSafeRefCount() :

 LLThreadSafeRefCount::~LLThreadSafeRefCount()
 { 
+	llassert(mRef == 0);
+	/* TEMPORARILY disable erroring out on deleting this object with
+	   nonzero reference count until the problem in AIStateMachine is fixed
 	if (mRef != 0)
 	{
 		llerrs << "deleting non-zero reference" << llendl;
 	}
+	*/
 }

 //============================================================================
--- a/indra/lscript/lscript_byteformat.h
+++ b/indra/lscript/lscript_byteformat.h
@@ -536,6 +536,7 @@ typedef enum e_lscript_runtime_permissions
 	SCRIPT_PERMISSION_TRACK_CAMERA,
 	SCRIPT_PERMISSION_CONTROL_CAMERA,
 	SCRIPT_PERMISSION_TELEPORT,
+	SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS,
 	SCRIPT_PERMISSION_EOF
 } LSCRIPTRunTimePermissions;

@@ -553,6 +554,7 @@ const U32 LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_EOF] =
 	(0x1 << 10),//	SCRIPT_PERMISSION_TRACK_CAMERA
 	(0x1 << 11),//	SCRIPT_PERMISSION_CONTROL_CAMERA
 	(0x1 << 12),//	SCRIPT_PERMISSION_TELEPORT
+	(0x1 << 15),//  SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS
 };

 // http_request string constants
--- a/indra/lscript/lscript_library/lscript_library.cpp
+++ b/indra/lscript/lscript_library/lscript_library.cpp
@@ -532,6 +532,14 @@ void LLScriptLibrary::init()
 	addFunction(10.f, 0.f, dummy_func, "llUpdateCharacter", NULL, "l");
 	addFunction(10.f, 0.f, dummy_func, "llWanderWithin", NULL, "vvl");

+	// Server RC LeTigre 12.10.12.265819 new function
+	addFunction(0.f, 0.f, dummy_func, "llGetSimStats", "f", "i");
+
+	// Server RC LeTigre 13.03.22.272565 new function
+	addFunction(0.f, 0.f, dummy_func, "llSetAnimationOverride", NULL, "ss");
+	addFunction(0.f, 0.f, dummy_func, "llGetAnimationOverride", "s", "s");
+	addFunction(0.f, 0.f, dummy_func, "llResetAnimationOverride", NULL, "s");
+
 	// SL-LSL Functions to be added above this line
 	// ---------------------------------------------
 	// NOTE bytecode placement no longer applies, viewers do not compile scripts anymore (confirmed with LL, also noted by Phoenix/Firestorm team.)
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -52,7 +52,7 @@ changed			changed( integer change ):Triggered various event change the task:(tes
 remote_data     remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY)
 http_response   http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests
 http_request	http_request(key id, string method, string body):Triggered when task receives an http request against a public URL
-transaction_result		transaction_result(key id, integer success, string data):Triggered when task receives asynchronous data.
+transaction_result		transaction_result(key id, integer success, string data): Triggered when currency is given to task
 path_update		path_update(integer type, list reserved):Triggered when the state of a pathfinder character changes. Note; "list reserved" is not currently used

 # integer constants
@@ -99,6 +99,7 @@ PERMISSION_CHANGE_LINKS			Passed to llRequestPermissions library function to req
 PERMISSION_TRACK_CAMERA			Passed to llRequestPermissions library function to request permission to track agent's camera
 PERMISSION_CONTROL_CAMERA		Passed to llRequestPermissions library function to request permission to change agent's camera
 PERMISSION_TELEPORT				Passed to llRequestPermissions library function to request permission to teleport agent
+PERMISSION_OVERRIDE_ANIMATIONS  Passed to llRequestPermissions library function to request permission to override agent's animations

 DEBUG_CHANNEL		Chat channel reserved for debug and error messages from scripts
 PUBLIC_CHANNEL		Chat channel that broadcasts to all nearby users
--- a/indra/newview/app_settings/lsl_functions_sl.xml
+++ b/indra/newview/app_settings/lsl_functions_sl.xml
@@ -1013,5 +1013,12 @@
 <!-- Server RC LeTigre 12.10.12.265819 new function -->
   <key>llGetSimStats</key>
   <map/>
+<!-- Server RC LeTigre 13.03.22.272565 new function -->
+   <key>llSetAnimationOverride</key>
+   <map/>
+   <key>llGetAnimationOverride</key>
+   <map/>
+   <key>llResetAnimationOverride</key>
+   <map/>
  </map>
 </llsd>
--- a/indra/newview/llestateinfomodel.h
+++ b/indra/newview/llestateinfomodel.h
@@ -56,7 +56,8 @@ public:
 	const std::string&	getName()					const { return mName; }
 	const LLUUID&		getOwnerID()				const { return mOwnerID; }
 	U32					getID()						const { return mID; }
-	F32					getSunHour()				const { return getUseFixedSun() ? mSunHour : 0.f; }
+	F32					getSunHour()				const { return mSunHour; }
+	bool				getGlobalTime()				const { return !(mSunHour || getUseFixedSun()); }

 	// setters
 	void setUseFixedSun(bool val);
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -160,6 +160,39 @@ void unpack_request_params(
 */


+namespace
+{
+	void on_caps_received(LLTabContainer* tab)
+	{
+		if (!tab) return;
+		const LLViewerRegion* region = gAgent.getRegion();
+		tab->enableTabButton(tab->getIndexForPanel(tab->getPanelByName("panel_env_info")), region && !region->getCapability("EnvironmentSettings").empty());
+	}
+
+	void handle_opposite(const bool& off, LLUICtrl* opposite)
+	{
+		opposite->setEnabled(!off);
+		if (off) opposite->setValue(false);
+	}
+
+	void on_change_use_other_sun(const LLSD& param, LLUICtrl* opposite, LLUICtrl* slider)
+	{
+		handle_opposite(param.asBoolean(), opposite);
+		slider->setEnabled(false);
+	}
+
+	void on_change_fixed_sun(const LLSD& param, LLUICtrl* opposite, LLUICtrl* slider)
+	{
+		bool fixed_sun = param.asBoolean();
+		handle_opposite(fixed_sun, opposite);
+		slider->setEnabled(fixed_sun);
+	}
+
+	const float get_sun_hour(const LLUICtrl* sun_hour)
+	{
+		return sun_hour->getEnabled() ? sun_hour->getValue().asFloat() : 0.f;
+	}
+}

 bool estate_dispatch_initialized = false;

@@ -352,6 +385,15 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
 		LLTrans::findString(sim_type, sim_type); // try localizing sim product name
 	}

+	// Disable Environment Tab when not supported
+	if (region)
+	{
+		if (region->capabilitiesReceived())
+			on_caps_received(tab);
+		else
+			region->setCapabilitiesReceivedCallback(boost::bind(on_caps_received, tab));
+	}
+
 	// GENERAL PANEL
 	panel = tab->getChild<LLPanel>("General");
 	panel->getChild<LLUICtrl>("region_text")->setValue(LLSD(sim_name));
@@ -629,6 +671,27 @@ bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region)
 	getChildView("im_btn")->setEnabled(allow_modify);
 	getChildView("manage_telehub_btn")->setEnabled(allow_modify);

+	// Support Legacy Region Environment
+	{
+		const LLRegionInfoModel& region_info = LLRegionInfoModel::instance();
+		bool estate_sun = region_info.mUseEstateSun;
+		getChild<LLUICtrl>("use_estate_sun_check")->setValue(estate_sun);
+		getChild<LLUICtrl>("fixed_sun_check")->setEnabled(allow_modify && !estate_sun);
+		getChild<LLUICtrl>("sun_hour_slider")->setEnabled(allow_modify && !estate_sun);
+		if (estate_sun)
+		{
+			getChild<LLUICtrl>("use_estate_sun_check")->setEnabled(allow_modify);
+			getChild<LLUICtrl>("fixed_sun_check")->setValue(false);
+		}
+		else
+		{
+			bool fixed_sun = region_info.getUseFixedSun();
+			getChild<LLUICtrl>("use_estate_sun_check")->setEnabled(allow_modify && !fixed_sun);
+			getChild<LLUICtrl>("fixed_sun_check")->setValue(fixed_sun);
+			getChild<LLUICtrl>("sun_hour_slider")->setValue(region_info.mSunHour);
+		}
+	}
+
 	// Data gets filled in by processRegionInfo

 	return LLPanelRegionInfo::refreshFromRegion(region);
@@ -647,6 +710,9 @@ BOOL LLPanelRegionGeneralInfo::postBuild()
 	initCtrl("access_combo");
 	initCtrl("restrict_pushobject");
 	initCtrl("block_parcel_search_check");
+	initCtrl("use_estate_sun_check");
+	initCtrl("fixed_sun_check");
+	initCtrl("sun_hour_slider");

 	initHelpBtn("terraform_help",		"HelpRegionBlockTerraform");
 	initHelpBtn("fly_help",				"HelpRegionBlockFly");
@@ -658,12 +724,23 @@ BOOL LLPanelRegionGeneralInfo::postBuild()
 	initHelpBtn("land_resell_help",	"HelpRegionLandResell");
 	initHelpBtn("parcel_changes_help", "HelpParcelChanges");
 	initHelpBtn("parcel_search_help", "HelpRegionSearch");
+	initHelpBtn("use_estate_sun_help",	"HelpRegionUseEstateSun");
+	initHelpBtn("fixed_sun_help",		"HelpRegionFixedSun");

 	childSetAction("kick_btn", boost::bind(&LLPanelRegionGeneralInfo::onClickKick, this));
 	childSetAction("kick_all_btn", onClickKickAll, this);
 	childSetAction("im_btn", onClickMessage, this);
 	childSetAction("manage_telehub_btn", boost::bind(&LLPanelRegionGeneralInfo::onClickManageTelehub, this));

+	// Set up the Legacy Region Environment checkboxes
+	{
+		LLUICtrl* estate_sun = getChild<LLUICtrl>("use_estate_sun_check");
+		LLUICtrl* fixed_sun = getChild<LLUICtrl>("fixed_sun_check");
+		LLUICtrl* hour_slider = getChild<LLUICtrl>("sun_hour_slider");
+		estate_sun->setCommitCallback(boost::bind(on_change_use_other_sun, _2, fixed_sun, hour_slider));
+		fixed_sun->setCommitCallback(boost::bind(on_change_fixed_sun, _2, estate_sun, hour_slider));
+	}
+
 	return LLPanelRegionInfo::postBuild();
 }

@@ -839,6 +916,13 @@ BOOL LLPanelRegionGeneralInfo::sendUpdate()
 		sendEstateOwnerMessage(gMessageSystem, "setregioninfo", invoice, strings);
 	}

+	// Send the Legacy Region Environment
+	LLRegionInfoModel& region_info = LLRegionInfoModel::instance();
+	region_info.mUseEstateSun = getChild<LLUICtrl>("use_estate_sun_check")->getValue().asBoolean();
+	region_info.setUseFixedSun(getChild<LLUICtrl>("fixed_sun_check")->getValue().asBoolean());
+	region_info.mSunHour = get_sun_hour(getChild<LLUICtrl>("sun_hour_slider"));
+	region_info.sendRegionTerrain(LLFloaterRegionInfo::getLastInvoice());
+
 	// if we changed access levels, tell user about it
 	LLViewerRegion* region = gAgent.getRegion();
 	if (region && (getChild<LLUICtrl>("access_combo")->getValue().asInteger() != region->getSimAccess()) )
@@ -2015,11 +2099,16 @@ BOOL LLPanelEstateInfo::postBuild()
 {
 	// set up the callbacks for the generic controls
 	initCtrl("externally_visible_check");
+	initCtrl("use_global_time_check");
+	initCtrl("fixed_sun_check");
+	initCtrl("sun_hour_slider");
 	initCtrl("allow_direct_teleport");
 	initCtrl("limit_payment");
 	initCtrl("limit_age_verified");
 	initCtrl("voice_chat_check");
 	initHelpBtn("estate_manager_help",			"HelpEstateEstateManager");
+	initHelpBtn("use_global_time_help",			"HelpEstateUseGlobalTime");
+	initHelpBtn("fixed_sun_help",				"HelpEstateFixedSun");
 	initHelpBtn("externally_visible_help",		"HelpEstateExternallyVisible");
 	initHelpBtn("allow_direct_teleport_help",	"HelpEstateAllowDirectTeleport");
 	initHelpBtn("allow_resident_help",			"HelpEstateAllowResident");
@@ -2027,6 +2116,15 @@ BOOL LLPanelEstateInfo::postBuild()
 	initHelpBtn("ban_resident_help",			"HelpEstateBanResident");
 	initHelpBtn("voice_chat_help",                  "HelpEstateVoiceChat");

+	// Set up the Legacy Estate Environment checkboxes
+	{
+		LLUICtrl* global_time = getChild<LLUICtrl>("use_global_time_check");
+		LLUICtrl* fixed_sun = getChild<LLUICtrl>("fixed_sun_check");
+		LLUICtrl* hour_slider = getChild<LLUICtrl>("sun_hour_slider");
+		global_time->setCommitCallback(boost::bind(on_change_use_other_sun, _2, fixed_sun, hour_slider));
+		fixed_sun->setCommitCallback(boost::bind(on_change_fixed_sun, _2, global_time, hour_slider));
+	}
+
 	getChild<LLUICtrl>("allowed_avatar_name_list")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeChildCtrl, this, _1));
 	LLNameListCtrl *avatar_name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");
 	if (avatar_name_list)
@@ -2106,14 +2204,36 @@ void LLPanelEstateInfo::refreshFromEstate()
 	getChild<LLUICtrl>("limit_payment")->setValue(estate_info.getDenyAnonymous());
 	getChild<LLUICtrl>("limit_age_verified")->setValue(estate_info.getDenyAgeUnverified());

-	// Ensure appriopriate state of the management UI
+	// Ensure appropriate state of the management UI
 	updateControls(gAgent.getRegion());
+	// Support Legacy Estate Environment
+	{
+		const LLEstateInfoModel& estate_info = LLEstateInfoModel::instance();
+		bool global_time = estate_info.getGlobalTime();
+		getChild<LLUICtrl>("use_global_time_check")->setValue(global_time);
+		getChild<LLUICtrl>("fixed_sun_check")->setEnabled(!global_time);
+		getChild<LLUICtrl>("sun_hour_slider")->setEnabled(!global_time);
+		if (global_time)
+		{
+			getChild<LLUICtrl>("use_global_time_check")->setEnabled(true);
+			getChild<LLUICtrl>("fixed_sun_check")->setValue(false);
+		}
+		else
+		{
+			bool fixed_sun = estate_info.getUseFixedSun();
+			getChild<LLUICtrl>("use_global_time_check")->setEnabled(!fixed_sun);
+			getChild<LLUICtrl>("fixed_sun_check")->setValue(fixed_sun);
+			F32 sun_hour = estate_info.getSunHour();
+			if (sun_hour < 6.0f) sun_hour += 24.0f;
+			getChild<LLUICtrl>("sun_hour_slider")->setValue(sun_hour);
+		}
+	}
 	refresh();
 }

 BOOL LLPanelEstateInfo::sendUpdate()
 {
-	llinfos << "LLPanelEsateInfo::sendUpdate()" << llendl;
+	llinfos << "LLPanelEstateInfo::sendUpdate()" << llendl;

 	LLNotification::Params params("ChangeLindenEstate");
 	params.functor(boost::bind(&LLPanelEstateInfo::callbackChangeLindenEstate, this, _1, _2));
@@ -2141,8 +2261,9 @@ bool LLPanelEstateInfo::callbackChangeLindenEstate(const LLSD& notification, con
 			LLEstateInfoModel& estate_info = LLEstateInfoModel::instance();

 			// update model
-			estate_info.setUseFixedSun(false); // we don't support fixed sun estates anymore
 			estate_info.setIsExternallyVisible(getChild<LLUICtrl>("externally_visible_check")->getValue().asBoolean());
+			estate_info.setUseFixedSun(getChild<LLUICtrl>("fixed_sun_check")->getValue().asBoolean());
+			estate_info.setSunHour(get_sun_hour(getChild<LLUICtrl>("sun_hour_slider")));
 			estate_info.setAllowDirectTeleport(getChild<LLUICtrl>("allow_direct_teleport")->getValue().asBoolean());
 			estate_info.setDenyAnonymous(getChild<LLUICtrl>("limit_payment")->getValue().asBoolean());
 			estate_info.setDenyAgeUnverified(getChild<LLUICtrl>("limit_age_verified")->getValue().asBoolean());
--- a/indra/newview/llpaneldisplay.cpp
+++ b/indra/newview/llpaneldisplay.cpp
@@ -885,7 +885,7 @@ void LLPanelDisplay::apply()

 void LLPanelDisplay::onChangeQuality(LLUICtrl* caller)
 {
-	LLSliderCtrl* sldr = static_cast<LLSliderCtrl*>(caller);
+	LLSlider* sldr = dynamic_cast<LLSlider*>(caller);

 	if(sldr == NULL)
 	{
--- a/indra/newview/llregioninfomodel.cpp
+++ b/indra/newview/llregioninfomodel.cpp
@@ -35,6 +35,7 @@
 // viewer
 #include "llagent.h"
 #include "llviewerregion.h"
+#include "llestateinfomodel.h" // For supporting legacy environment

 void LLRegionInfoModel::reset()
 {
@@ -107,6 +108,17 @@ void LLRegionInfoModel::sendRegionTerrain(const LLUUID& invoice) const
 	strings.push_back(buffer);
 	buffer = llformat("%f", mSunHour);
 	strings.push_back(buffer);
+	if (mUseEstateSun)
+	{
+		// Grab estate info, the user decided to set the region back to estate time. JC
+		LLEstateInfoModel& estate_info = LLEstateInfoModel::instance();
+		estate_global_time = estate_info.getGlobalTime();
+		if (!estate_global_time)
+		{
+			estate_fixed_sun = estate_info.getUseFixedSun();
+			estate_sun_hour = estate_info.getSunHour();
+		}
+	}
 	buffer = llformat("%s", (estate_global_time ? "Y" : "N") );
 	strings.push_back(buffer);
 	buffer = llformat("%s", (estate_fixed_sun ? "Y" : "N") );
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -2404,6 +2404,14 @@ BOOL LLPipeline::updateDrawableGeom(LLDrawable* drawablep, BOOL priority)
 	if (update_complete && assertInitialized())
 	{
 		drawablep->setState(LLDrawable::BUILT);
+		//Workaround for 'missing prims' until it's fixed upstream by LL.
+		//Sometimes clearing CLEAR_INVISIBLE and FORCE_INVISIBLE in LLPipeline::stateSort was too late. Do it here instead, before
+		//the rebuild state is picked up on and LLVolumeGeometryManager::rebuildGeom is called.
+		//If the FORCE_INVISIBLE isn't cleared before the rebuildGeom call, the geometry will NOT BE REBUILT!
+		if(drawablep->isState(LLDrawable::CLEAR_INVISIBLE))
+		{
+			drawablep->clearState(LLDrawable::FORCE_INVISIBLE|LLDrawable::CLEAR_INVISIBLE);
+		}
 		mGeometryChanges++;
 	}
 	return update_complete;
--- a/indra/newview/skins/apollo/keywords.ini
+++ b/indra/newview/skins/apollo/keywords.ini
@@ -52,7 +52,7 @@ changed			changed( integer change ):Triggered various event change the task:(tes
 remote_data     remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY)
 http_response   http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests
 http_request	http_request(key id, string method, string body):Triggered when task receives an http request against a public URL
-transaction_result		transaction_result(key id, integer success, string data):Triggered when task receives asynchronous data.
+transaction_result		transaction_result(key id, integer success, string data): Triggered when currency is given to task
 path_update		path_update(integer type, list reserved):Triggered when the state of a pathfinder character changes. Note; "list reserved" is not currently used

 # integer constants
@@ -99,6 +99,7 @@ PERMISSION_CHANGE_LINKS			Passed to llRequestPermissions library function to req
 PERMISSION_TRACK_CAMERA			Passed to llRequestPermissions library function to request permission to track agent's camera
 PERMISSION_CONTROL_CAMERA		Passed to llRequestPermissions library function to request permission to change agent's camera
 PERMISSION_TELEPORT				Passed to llRequestPermissions library function to request permission to teleport agent
+PERMISSION_OVERRIDE_ANIMATIONS  Passed to llRequestPermissions library function to request permission to override agent's animations

 DEBUG_CHANNEL		Chat channel reserved for debug and error messages from scripts
 PUBLIC_CHANNEL		Chat channel that broadcasts to all nearby users
--- a/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
@@ -82,10 +82,10 @@
    <view_border
     bevel_style="none"
     follows="top|left"
-     height="95"
+     height="110"
     layout="topleft"
     left="10"
-     bottom_delta="-100"
+     bottom_delta="-115"
     width="460" />

    <check_box
@@ -95,7 +95,7 @@
     layout="topleft"
     left="20"
     name="externally_visible_check"
-     bottom_delta="70"
+     bottom_delta="90"
     width="200" />
    <button
     bottom_delta="0"
@@ -112,9 +112,9 @@
     height="20"
     label="Allow Voice Chat"
     layout="topleft"
-     left="250"
+     left_delta="-200"
     name="voice_chat_check"
-     bottom_delta="0"
+     bottom_delta="-18"
     width="200" />
    <button
     bottom_delta="0"
@@ -133,7 +133,7 @@
     layout="topleft"
     left_delta="-200"
     name="allow_direct_teleport"
-     bottom_delta="-20"
+     bottom_delta="-18"
     width="80" />
    <button
     bottom_delta="0"
@@ -144,6 +144,13 @@
     name="allow_direct_teleport_help"
     left_delta="200"
     width="18" />
+    <check_box bottom_delta="36" follows="left|top" height="20" label="Use Global Time" left="250" name="use_global_time_check" width="200" />
+    <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" name="use_global_time_help" left_delta="200" width="18" />
+    <check_box bottom_delta="-18" follows="left|top" height="20" label="Fixed Sun" left_delta="-200" name="fixed_sun_check" width="100" />
+    <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" name="fixed_sun_help" left_delta="200" width="18" />
+    <icon bottom_delta="-27" follows="left|top" height="20" image_name="icon_day_cycle.tga" left_delta="-160" name="daycycle" width="160"/>
+    <slider bottom_delta="-16" follows="left|top" height="20" increment="0.001"
+     label="Phase" left_delta="-35" max_val="30" min_val="6" name="sun_hour_slider" show_text="false" width="200" />
    <button
     enabled="false"
     follows="left|top"
@@ -151,9 +158,9 @@
     label="Apply"
     layout="topleft"
     name="apply_btn"
-     bottom_delta="-38"
-     left_delta="-200"
-     width="97" />
+     bottom_delta="-23"
+     left_delta="90"
+     width="120" />

    <text
     type="string"
@@ -164,7 +171,7 @@
     layout="topleft"
     left="20"
     name="Only Allow"
-     bottom_delta="38"
+     bottom_delta="28"
     width="278">
        Allow access only to Residents who:
    </text>
@@ -177,7 +184,7 @@
     left_delta="0"
     name="limit_payment"
     tool_tip="Residents must have payment information on file to access this estate."
-     bottom_delta="-18"
+     bottom_delta="-16"
     width="278" />
    <check_box
     follows="top|left"
@@ -188,7 +195,7 @@
     left_delta="0"
     name="limit_age_verified"
     tool_tip="Residents must be age 18 or older to access this estate. See support.secondlife.com for more information."
-     bottom_delta="-18"
+     bottom_delta="-16"
     width="278" />

    <text
@@ -198,7 +205,7 @@
     height="20"
     layout="topleft"
     name="estate_manager_label"
-     bottom_delta="-40"
+     bottom_delta="-28"
     left="10"
     width="200">
        Estate Managers:
@@ -220,7 +227,7 @@
     layout="topleft"
     left="250"
     name="allow_resident_label"
-     bottom_delta="0"
+     bottom_delta="-4"
     width="200">
        Allowed Residents:
    </text>
@@ -241,7 +248,7 @@
     height="71"
     layout="topleft"
     left="10"
-     bottom_delta="-76"
+     bottom_delta="-72"
     width="220" />
    <name_list
     follows="left|top"
@@ -320,7 +327,7 @@
     layout="topleft"
     left="10"
     name="allow_group_label"
-     bottom_delta="-30"
+     bottom_delta="-28"
     width="200">
        Allowed Groups:
    </text>
@@ -341,7 +348,7 @@
     layout="topleft"
     left="250"
     name="ban_resident_label"
-     bottom_delta="0"
+     bottom_delta="-4"
     width="200">
        Banned Residents:
    </text>
@@ -362,7 +369,7 @@
     height="71"
     layout="topleft"
     left="10"
-     bottom_delta="-76"
+     bottom_delta="-72"
     width="220" />
    <name_list
     follows="left|top"
@@ -440,7 +447,7 @@
     layout="topleft"
     left="10"
     name="message_estate_btn"
-     bottom_delta="-43"
+     bottom_delta="-28"
     width="220" />
    <button
     follows="left|top"
--- a/indra/newview/skins/default/xui/en-us/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_region_general.xml
@@ -85,7 +85,14 @@
 	</combo_box>
 	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
 	     left="205" name="access_help" width="18" />
-	<button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
+    <check_box bottom_delta="52" follows="left|top" height="20" label="Use Estate Sun" left="250" name="use_estate_sun_check" width="200" />
+    <button bottom_delta="-2" follows="left|top" font="SansSerifSmall" height="18" label="?" name="use_estate_sun_help" left_delta="200" width="18" />
+    <check_box bottom_delta="-18" follows="left|top" height="20" label="Fixed Sun" left_delta="-200" name="fixed_sun_check" width="100" />
+    <button bottom_delta="-2" follows="left|top" font="SansSerifSmall" height="18" label="?" name="fixed_sun_help" left_delta="200" width="18" />
+    <icon bottom_delta="-23" follows="left|top" height="20" image_name="icon_day_cycle.tga" left_delta="-160" name="daycycle" width="160"/>
+    <slider bottom_delta="-15" follows="left|top" height="20" increment="0.001"
+     label="Phase" left_delta="-35" max_val="30" min_val="6" name="sun_hour_slider" show_text="false" width="200" />
+	<button bottom_delta="-20" enabled="false" follows="left|top" height="20" label="Apply"
 	     left="108" name="apply_btn" width="100" />
 	<button bottom_delta="-60" follows="left|top" height="20"
 	     label="Teleport Home One User..." left="10" name="kick_btn" width="250" />
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -1828,15 +1828,15 @@ Returns a list consisting of the following three values for each hit: UUID, Link
 	</string>
 	<string name="LSLTipText_llRegionSayTo">
 llRegionSayTo(key target, integer channel, string msg)
-Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
+Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region.
 	</string>
 	<string name="LSLTipText_llGetSPMaxMemory">
 integer llGetSPMaxMemory()
-Returns the integer of the most bytes used while llScriptProfiler was last active.
+Returns the maximum used memory for the current script. Only valid after using PROFILE_SCRIPT_MEMORY. Non-mono scripts always use 16k.
 	</string>
 	<string name="LSLTipText_llGetUsedMemory">
 integer llGetUsedMemory()
-Returns the integer of the number of bytes of memory currently in use by the script.
+Returns the current used memory for the current script. Non-mono scripts always use 16k.
 	</string>
 	<string name="LSLTipText_llScriptProfiler">
 llScriptProfiler(integer flags)
@@ -1844,11 +1844,15 @@ Enables or disables script profiling options. Currently only supports PROFILE_SC
 MAY SIGNIFICANTLY REDUCE SCRIPT PERFORMANCE!
 	</string>
 	<string name="LSLTipText_llSetMemoryLimit">
-integer llSetMemoryLimit(integer mem)
-Request ''limit'' bytes to be reserved for this script.
+integer llSetMemoryLimit(integer limit)
+Request limit bytes to be reserved for this script.
+Returns a success/failure flag (STATUS_OK when sucessful, another of the STATUS_* flags on failure) for whether the memory limit was set.
+Only relevant for Mono-compiled scripts.
 	</string>
 	<string name="LSLTipText_llGetMemoryLimit">
 integer llGetMemoryLimit()
+Get the maximum memory a script can use.
+Returns the integer amount of memory the script can use in bytes.
 	</string>
 	<string name="LSLTipText_llSetLinkMedia">
 llSetLinkMedia(integer link, integer face, list params)
@@ -1863,11 +1867,12 @@ integer llClearLinkMedia(integer link, integer face)
 Clears (deletes) the media and all params from the given face on linked prim(s).
 	</string>
 	<string name="LSLTipText_llSetContentType">
-llSetContentType(key request_id, integer content_type)
+llSetContentType(key id, integer content_type)
 Set the Internet media type of an LSL HTTP server response.
+content_type may be one of CONTENT_TYPE_TEXT (default) "text/plain", or CONTENT_TYPE_HTML "text/html", only valid for embedded browsers on content owned by the person viewing. Falls back to "text/plain" otherwise.
 	</string>
 	<string name="LSLTipText_llLinkSitTarget">
-llLinkSitTarget(integer link, vector offset, rotation rot );
+llLinkSitTarget(integer link, vector offset, rotation rot)
 Set the sit location for the linked prim(s). The sit location is relative to the prim's position and rotation.
 	</string>
 	<string name="LSLTipText_llAvatarOnLinkSitTarget">
@@ -1876,7 +1881,8 @@ If an avatar is sitting on the sit target, return the avatar&apos;s key, NULL_KE
 	</string>
 	<string name="LSLTipText_llSetLinkCamera">
 llSetLinkCamera(integer link, vector eye, vector at)
-Sets the camera eye offset, and the offset that the camera is looking at, for avatars that sit on the linked prim.
+Sets the camera eye offset, and the offset that camera is looking at, for avatars that sit on the linked prim.
+The two vector parameters are offsets relative to the object's center and expressed in local coordinates.
 	</string>
 	<string name="LSLTipText_llSetVelocity">
 llSetVelocity(vector velocity, integer local)
@@ -1897,8 +1903,8 @@ llGetPhysicsMaterial() returns the gravity multiplier, restitution, friction, an
 llGetMassMKS() returns the mass of the linkset in kilograms.
 	</string>
 	<string name="LSLTipText_llGenerateKey">
-llGenerateKey()
-Retun a unique generated key
+key llGenerateKey()
+Return a unique generated key
 	</string>
 	<string name="LSLTipText_llSetKeyframedMotion">
 llSetKeyframedMotion(list keyframes, list options)
@@ -1924,13 +1930,6 @@ For AI Character: Navigate to destination.
 llCreateCharacter(list options)
 Convert linkset to AI Character which can navigate the world.
 	</string>
-	<!-- Pathfinding -->
-	<string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
-	<string name="Pathfinding_Object_Attr_None">None</string>
-	<string name="Pathfinding_Object_Attr_Permanent">Affects navmesh</string>
-	<string name="Pathfinding_Object_Attr_Character">Character</string>
-	<string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
-
 	<string name="LSLTipText_llPursue">
 llPursue(key target, list options)
 For AI Character: Chase after a target.
@@ -2000,6 +1999,18 @@ A region's global coordinates can be retrieved using llRequestSimulatorData(regi
 float llGetSimStats(integer stat_type)
 Returns the value of a particular simulator statistic.
 	</string>
+	<string name="LSLTipText_llSetAnimationOverride">
+llSetAnimationOverride(string anim_state, string anim)
+Set the animation (anim) that will play for the given animation state (anim_state).
+	</string>
+	<string name="LSLTipText_llGetAnimationOverride">
+string llGetAnimationOverride(string anim_state)
+Returns a string that is the name of the animation that is being used for the specified animation state (anim_state).
+	</string>
+	<string name="LSLTipText_llResetAnimationOverride">
+llResetAnimationOverride(string anim_state)
+Resets the animation override of the specified animation state (anim_state) to the corresponding default value.
+	</string>
 <!-- GOD FUNCTIONS -->
 	<string name="LSLTipText_llGodLikeRezObject">
 llGodLikeRezObject( key inventory, vector pos )
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -27,21 +27,6 @@
 				Leyla Linden
 			</text>
 			<button label="Profil..." label_selected="Profil..." name="Profile..."/>
-			<string name="group_owned_text">
-				(Propriété du Groupe)
-			</string>
-			<string name="profile_text">
-				Profil...
-			</string>
-			<string name="info_text">
-				Infos...
-			</string>
-			<string name="public_text">
-				(public)
-			</string>
-			<string name="none_text">
-				(aucun)
-			</string>
 			<text name="Group:">
 				Groupe:
 			</text>
@@ -91,6 +76,7 @@
 			</text>
 			<button label="Acheter le terrain" label_selected="Achat du terrain" left="130" name="Buy Land..." width="125"/>
 			<button label="Acheter pour le groupe" label_selected="Achat du terrain pour le groupe" name="Buy For Group..."/>
+			<button name="Scripts..." width="110"/>
 			<button label="Acheter un pass" label_selected="Achat d&#x27;un pass" left="130" name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125"/>
 			<button label="Abandonner le terrain" label_selected="Abandon du terrain" name="Abandon Land..."/>
 			<button label="Redemander le terrain" label_selected="Redemande le terrain" name="Reclaim Land..."/>
@@ -113,6 +99,21 @@
 			<string name="need_tier_to_modify">
 				Pour modifier ce terrain, vous devez approuver votre achat.
 			</string>
+			<string name="group_owned_text">
+				(Propriété du Groupe)
+			</string>
+			<string name="profile_text">
+				Profil...
+			</string>
+			<string name="info_text">
+				Infos...
+			</string>
+			<string name="public_text">
+				(public)
+			</string>
+			<string name="none_text">
+				(aucun)
+			</string>
 			<string name="sale_pending_text">
 				(vente en cours)
 			</string>
@@ -290,12 +291,6 @@ Allez dans le menu Monde &gt; A propos du terrain ou sélectionnez une autre par
 				Options du terrain:
 			</text>
 			<check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n'y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/>
-			<string name="push_restrict_text">
-				Pas de bousculades
-			</string>
-			<string name="push_restrict_region_text">
-				Pas de bousculades (les règles de la région priment)
-			</string>
 			<check_box label="Pas de bousculades" name="PushRestrictCheck" tool_tip="Empêche l'utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain." bottom="-140" left="14"/>
 			<check_box label="Afficher dans la recherche ([DIRECTORYFEE]) sous" name="ShowDirectoryCheck" tool_tip="Affiche la parcelle dans les résultats de recherche" bottom="-160"/>
 			<string name="search_enabled_tooltip">
@@ -444,6 +439,12 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 					Lieu d'arrivée libre
 				</combo_item>
 			</combo_box>
+			<string name="push_restrict_text">
+				Pas de bousculades
+			</string>
+			<string name="push_restrict_region_text">
+				Pas de bousculades (les règles de la région priment)
+			</string>
 		</panel>
 		<panel label="Médias" name="land_media_panel">
 			<text name="with media:" width="70">
@@ -495,17 +496,6 @@ Select the thumbnail to choose a different texture.
 			<text name="pixels">
 				Pixels
 			</text>
-			<text name="Interaction:">
-				  Interaction:
-			</text>
-			<radio_group name="radio_navigate_allow">
-				<radio_item name="Anyone" tool_tip="Chaque résident peut intervenir sur le média.">
-					Tous
-				</radio_item>
-				<radio_item name="Group" tool_tip="Les permissions du groupe contrôlent qui peux intervenir sur le média.">
-					Groupe
-				</radio_item>
-			</radio_group>
 		</panel>
 		<panel name="land_audio_panel">
 			<text name="MusicURL:">
--- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
@@ -1,85 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="item properties" title="Propriétés de l'objet de l'inventaire">
-	<text name="LabelItemNameTitle">
-		Nom:
-	</text>
-	<text name="LabelItemDescTitle">
-		Description:
-	</text>
-	<text name="LabelCreatorTitle">
-		Créateur:
-	</text>
-	<text name="LabelCreatorName">
-		Nicole Linden
-	</text>
-	<button label="Profil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">
-		Propriétaire:
-	</text>
-	<text name="LabelOwnerName">
-		Thrax Linden
-	</text>
-	<button label="Profil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">
-		Acquis:
-	</text>
-	<text name="LabelAcquiredDate">
-		Wed May 24 12:50:46 2006
-	</text>
-	<text name="OwnerLabel">
-		Vous pouvez:
-	</text>
+	<text name="LabelItemNameTitle">Nom:</text>
+	<text name="LabelCreatorTitle">Créateur:</text>
+	<text name="LabelOwnerTitle">Propriétaire:</text>
+	<text name="LabelAcquiredTitle">Acquis :</text>
+	<text name="OwnerLabel">Vous Pouvez:</text>
 	<check_box label="Modifier" name="CheckOwnerModify"/>
 	<check_box label="Copier" name="CheckOwnerCopy"/>
 	<check_box label="Revendre/Donner" name="CheckOwnerTransfer"/>
-	<text name="BaseMaskDebug">
-		B:
-	</text>
-	<text name="OwnerMaskDebug">
-		O:
-	</text>
-	<text name="GroupMaskDebug">
-		G:
-	</text>
-	<text name="EveryoneMaskDebug">
-		E:
-	</text>
-	<text name="NextMaskDebug">
-		N:
-	</text>
-	<check_box label="Partager avec le groupe" name="CheckShareWithGroup"/>
-	<check_box label="Autoriser tout le monde à copier" name="CheckEveryoneCopy"/>
-	<text name="NextOwnerLabel" width="192">
-		Le prochain propriétaire pourra :
-	</text>
+	<text bottom_delta="-1" name="GroupLabel">Les Membres du Groupe peuvent:</text>
+	<check_box label="Modifer" name="CheckGroupMod"/>
+	<check_box label="Copier" name="CheckGroupCopy"/>
+	<check_box label="Déplacer" name="CheckGroupMove"/>
+	<text bottom_delta="-10" name="EveryoneLabel">Tout le Monde peux:</text>
+	<check_box bottom_delta="-20" label="Copier" name="CheckEveryoneCopy"/>
+	<check_box label="Déplacer" name="CheckEveryoneMove"/>
+	<text name="NextOwnerLabel" width="150">Le Prochain Propriétaire peux:</text>
 	<check_box label="Modifier" name="CheckNextOwnerModify"/>
 	<check_box label="Copier" name="CheckNextOwnerCopy"/>
 	<check_box label="Revendre/Donner" name="CheckNextOwnerTransfer"/>
-	<text name="SaleLabel">
-		Marquer l'objet:
-	</text>
-	<check_box label="À vendre" name="CheckPurchase"/>
+	<text name="SaleLabel">Marquer l'objet:</text>
+	<check_box label="A Vendre" name="CheckPurchase"/>
 	<radio_group name="RadioSaleType">
-		<radio_item name="radio">
-			Original
-		</radio_item>
-		<radio_item name="radio2">
-			Copie
-		</radio_item>
+		<radio_item name="radio">Original</radio_item>
+		<radio_item name="radio2">Copie</radio_item>
 	</radio_group>
-	<text name="TextPrice">
-		Prix:  [CURRENCY]
-	</text>
-	<string name="unknown">
-		(inconnu)
-	</string>
-	<string name="public">
-		(public)
-	</string>
-	<string name="you_can">
-		Vous pouvez:
-	</string>
-	<string name="owner_can">
-		Le propriétaire peut:
-	</string>
+	<text name="TextPrice">Prix:  [CURRENCY]</text>
+	<string name="unknown">(Inconnu au Bataillon)</string>
+	<string name="you_can">Vous pouvez:</string>
+	<string name="owner_can">Le Propriétaire peux:</string>
 </floater>
--- a/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
+++ b/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
@@ -1,94 +1,80 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" width="600">
-	<button label="Enregistrer" label_selected="Enregistrer" name="Save" width="100"/>
-	<button label="Annuler" label_selected="Annuler" left="280" name="Cancel" width="100"/>
-	<check_box label="Silhouette" name="checkbox_Shape"/>
-	<check_box label="Peau" name="checkbox_Skin"/>
-	<check_box label="Cheveux" name="checkbox_Hair"/>
-	<check_box label="Yeux" name="checkbox_Eyes"/>
-	<check_box label="Donner le nom du dossier &#10;&#xE0; l'ensemble" name="rename"/>
-	  <check_box name="checkbox_use_outfits" label="Utiliser un dossier Viewer 2"/>
-	<check_box name="checkbox_use_links" label="Utiliser des Liens pour les No Copy, No Mod ou les éléments 'multi worn'"/>
-	<check_box label="Chemise" name="checkbox_Shirt"/>
-	<check_box label="Pantalon" name="checkbox_Pants"/>
-	<check_box label="Chaussures" name="checkbox_Shoes"/>
+<floater name="modal container" title="Cr&#xE9;er un ensemble" width="600">
+  <button label="Enregistrer" label_selected="Enregistrer" name="Save" width="100"/>
+  <button label="Annuler" label_selected="Annuler" left="280" name="Cancel" width="100"/>
+  <check_box label="Silhouette" name="checkbox_Shape"/>
+  <check_box label="Peau" name="checkbox_Skin"/>
+  <check_box label="Cheveux" name="checkbox_Hair"/>
+  <check_box label="Yeux" name="checkbox_Eyes"/>
+  <check_box label="Donner le nom du dossier &#10;&#xE0; l'ensemble" name="rename"/>
+  <check_box name="checkbox_use_outfits" label="Utiliser un dossier Viewer 2"/>
+  <check_box name="checkbox_use_links" label="Utiliser des Liens pour les No Copy, No Mod ou les éléments 'multi worn'"/>
+  <check_box label="Chemise" name="checkbox_Shirt"/>
+  <check_box label="Pantalon" name="checkbox_Pants"/>
+  <check_box label="Chaussures" name="checkbox_Shoes"/>
  <check_box label="Chaussettes" name="checkbox_socks"/>
-	<check_box label="Veste" name="checkbox_Jacket"/>
+  <check_box label="Veste" name="checkbox_Jacket"/>
  <check_box label="Gants" name="checkbox_gloves"/>
-	<check_box label="Tee Shirt" name="checkbox_Undershirt"/>
-	<check_box label="culotte" name="checkbox_Underpants"/>
-	<check_box label="Jupe" name="checkbox_Skirt"/>
-	<check_box label="Poitrine" left="225" name="checkbox_Chest"/>
-	<check_box label="Crâne" left="225" name="checkbox_Skull"/>
-	<check_box label="Epaule gauche" left="225" name="checkbox_Left Shoulder"/>
-	<check_box label="Epaule droite" left="225" name="checkbox_Right Shoulder"/>
-	<check_box label="Main gauche" left="225" name="checkbox_Left Hand"/>
-	<check_box label="Main droite" left="225" name="checkbox_Right Hand"/>
-	<check_box label="Pied gauche" left="225" name="checkbox_Left Foot"/>
-	<check_box label="Pied droit" left="225" name="checkbox_Right Foot"/>
-	<check_box label="Colonne" left="225" name="checkbox_Spine"/>
-	<check_box label="Bassin" left="225" name="checkbox_Pelvis"/>
-	<check_box label="Bouche" left="225" name="checkbox_Mouth"/>
-	<check_box label="Menton" left="225" name="checkbox_Chin"/>
-	<check_box label="Oreille gauche" left="225" name="checkbox_Left Ear"/>
-	<check_box label="Oreille droite" left="325" name="checkbox_Right Ear"/>
-	<check_box label="Oeil gauche" left="325" name="checkbox_Left Eyeball"/>
-	<check_box label="Oeil droit" left="325" name="checkbox_Right Eyeball"/>
-	<check_box label="Nez" left="325" name="checkbox_Nose"/>
-	<check_box label="Bras droit" left="325" name="checkbox_R Upper Arm"/>
-	<check_box label="Avant-bras droit" left="325" name="checkbox_R Forearm"/>
-	<check_box label="Bras gauche" left="325" name="checkbox_L Upper Arm"/>
-	<check_box label="Avant-bras gauche" left="325" name="checkbox_L Forearm"/>
-	<check_box label="Hanche droite" left="325" name="checkbox_Right Hip"/>
-	<check_box label="Cuisse droite" left="325" name="checkbox_R Upper Leg"/>
-	<check_box label="Jambe droite" left="325" name="checkbox_R Lower Leg"/>
-	<check_box label="Hanche gauche" left="325" name="checkbox_Left Hip"/>
-	<check_box label="Cuisse gauche" left="325" name="checkbox_L Upper Leg"/>
-	<check_box label="Jambe gauche" left="460" name="checkbox_L Lower Leg"/>
-	<check_box label="Estomac" left="460" name="checkbox_Stomach"/>
-	<check_box label="Pectoral gauche" left="460" name="checkbox_Left Pec"/>
-	<check_box label="Pectoral droit" left="460" name="checkbox_Right Pec"/>
-	  <check_box label="Cou" left="460" name="checkbox_Neck"/>
-	<check_box label="Root" left="460" name="checkbox_Root"/>
-	<check_box label="Centre 2" left="460" name="checkbox_Center 2"/>
-	<check_box label="En haut à droite" left="460" name="checkbox_Top Right"/>
-	<check_box label="En haut" left="460" name="checkbox_Top"/>
-	<check_box label="En haut à gauche" left="460" name="checkbox_Top Left"/>
-	<check_box label="Centre" left="460" name="checkbox_Center"/>
-	<check_box label="En bas à gauche" left="460" name="checkbox_Bottom Left"/>
-	<check_box label="En bas" left="460" name="checkbox_Bottom"/>
-	<check_box label="En bas à droite" left="460" name="checkbox_Bottom Right"/>
-	<text name="Make New Outfit">
-		Cr&#xE9;er un ensemble
-	</text>
-	<text name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on.   &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it.">
+  <check_box label="Tee Shirt" name="checkbox_Undershirt"/>
+  <check_box label="culotte" name="checkbox_Underpants"/>
+  <check_box label="Jupe" name="checkbox_Skirt"/>
+  <check_box label="Poitrine" left="225" name="checkbox_Chest"/>
+  <check_box label="Crâne" left="225" name="checkbox_Skull"/>
+  <check_box label="Epaule gauche" left="225" name="checkbox_Left Shoulder"/>
+  <check_box label="Epaule droite" left="225" name="checkbox_Right Shoulder"/>
+  <check_box label="Main gauche" left="225" name="checkbox_Left Hand"/>
+  <check_box label="Main droite" left="225" name="checkbox_Right Hand"/>
+  <check_box label="Pied gauche" left="225" name="checkbox_Left Foot"/>
+  <check_box label="Pied droit" left="225" name="checkbox_Right Foot"/>
+  <check_box label="Colonne" left="225" name="checkbox_Spine"/>
+  <check_box label="Bassin" left="225" name="checkbox_Pelvis"/>
+  <check_box label="Bouche" left="225" name="checkbox_Mouth"/>
+  <check_box label="Menton" left="225" name="checkbox_Chin"/>
+  <check_box label="Oreille gauche" left="225" name="checkbox_Left Ear"/>
+  <check_box label="Oreille droite" left="325" name="checkbox_Right Ear"/>
+  <check_box label="Oeil gauche" left="325" name="checkbox_Left Eyeball"/>
+  <check_box label="Oeil droit" left="325" name="checkbox_Right Eyeball"/>
+  <check_box label="Nez" left="325" name="checkbox_Nose"/>
+  <check_box label="Bras droit" left="325" name="checkbox_R Upper Arm"/>
+  <check_box label="Avant-bras droit" left="325" name="checkbox_R Forearm"/>
+  <check_box label="Bras gauche" left="325" name="checkbox_L Upper Arm"/>
+  <check_box label="Avant-bras gauche" left="325" name="checkbox_L Forearm"/>
+  <check_box label="Hanche droite" left="325" name="checkbox_Right Hip"/>
+  <check_box label="Cuisse droite" left="325" name="checkbox_R Upper Leg"/>
+  <check_box label="Jambe droite" left="325" name="checkbox_R Lower Leg"/>
+  <check_box label="Hanche gauche" left="325" name="checkbox_Left Hip"/>
+  <check_box label="Cuisse gauche" left="325" name="checkbox_L Upper Leg"/>
+  <check_box label="Jambe gauche" left="460" name="checkbox_L Lower Leg"/>
+  <check_box label="Estomac" left="460" name="checkbox_Stomach"/>
+  <check_box label="Pectoral gauche" left="460" name="checkbox_Left Pec"/>
+  <check_box label="Pectoral droit" left="460" name="checkbox_Right Pec"/>
+  <check_box label="Cou" left="460" name="checkbox_Neck"/>
+  <check_box left="460" name="checkbox_Root"/>
+  <check_box label="Centre 2" left="460" name="checkbox_Center 2"/>
+  <check_box label="En haut à droite" left="460" name="checkbox_Top Right"/>
+  <check_box label="En haut" left="460" name="checkbox_Top"/>
+  <check_box label="En haut à gauche" left="460" name="checkbox_Top Left"/>
+  <check_box label="Centre" left="460" name="checkbox_Center"/>
+  <check_box label="En bas à gauche" left="460" name="checkbox_Bottom Left"/>
+  <check_box label="En bas" left="460" name="checkbox_Bottom"/>
+  <check_box label="En bas à droite" left="460" name="checkbox_Bottom Right"/>
+  <!--text name="Make New Outfit">
+    Cr&#xE9;er un ensemble
+  </text-->
+  <text name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on.   &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it.">
 		Les ensembles sont des dossiers qui contiennent des habits et des parties du corps.
 Faire glisser le dossier contenant un ensemble vers l&#x27;avatar pour lui faire porter.

 Le bouton Cr&#xE9;er un ensemble vous permet de cr&#xE9;er un dossier et d'y sauvegarder les copies
 des articles que vous portez maintenant.
-	</text>
-	<text name="Folder name:">
-		Nom du dossier :
-	</text>
-	<text name="Items to include in outfit:">
-		Articles &#xE0; inclure &#xE0; l'ensemble  :
-	</text>
-	  <button label="Sélect. TOUT" name="Check All" width="85" />
-  <button label="Déselect. TOUT" left_delta="110" name="Uncheck All" width="105" />
-	<text name="Body Parts:">
-		Parties du corps :
-	</text>
-	<text name="Clothes:">
-		Habits :
-	</text>
-	<text name="Attachments:">
-		Attachements  :
-	</text>
-	<text name="Options:">
-		Options :
-	</text>
-	<line_editor name="name ed">
-		Nouvelle tenue
-	</line_editor>
+  </text>
+  <text name="Folder name:">Nom du dossier :</text>
+  <text name="Items to include in outfit:">Articles &#xE0; inclure &#xE0; l'ensemble :</text>
+  <button label="Sélect. TOUT" name="Check All"/>
+  <button label="Déselect. TOUT" name="Uncheck All"/>
+  <text name="Body Parts:">Parties du corps :</text>
+  <text left="115" name="Clothes:">Habits :</text>
+  <text left="227" name="Attachments:">Attachements :</text>
+  <text name="Options:">Options :</text>
+  <line_editor name="name ed">Nouvelle tenue</line_editor>
 </floater>
--- 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,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Chat Avanc&#xE9;" name="ascsys">
-  <tab_container label="Advanced Chat" name="Ascent Chat">
-     <panel label="Chat/IM" name="Chat/IM">
+  <tab_container name="Ascent Chat">

+    <panel label="Chat/IM" name="Chat/IM">
      <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"/>
@@ -11,12 +11,11 @@
      <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_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 name="time_format_text_box">Type d'heure :</text>
      <combo_box name="time_format_combobox">
        <combo_item name="24hours">Horloge 24/H</combo_item>
@@ -29,22 +28,23 @@
        <combo_item name="day_first">JJ/MM/AAAA</combo_item>
        <combo_item name="month_first">MM/JJ/AAA</combo_item>
      </combo_box>
-	  <check_box label="Secondes dans les horaires de log" name="seconds_in_log"/>
+      <check_box label="Secondes dans les horaires de log" name="seconds_in_log"/>
      <!-- Auto-responder -->
      <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="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 left_delta="280" name="text_box1">Texte de la r&#xE9;ponse :</text>
+      <text bottom_delta="140" left_delta="280" 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 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"/>
@@ -65,20 +65,19 @@
      <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="Me notifier quand un spam est bloqu&#xE9;" name="Notify On Spam"/>
      <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>
+      <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="Invit. de frais de grp" name="Group Fee 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="Notices de groupes" name="Group Notices"/>
      <check_box label="Active les sons des gestures" name="Enable Gesture Sounds"/>
-	</panel>
+    </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"/>
@@ -99,9 +98,8 @@ Clic droit sur le mot mal &#xE9;crit et choisir son remplacement.
      <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>
-</panel>
+</panel>
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -19,31 +19,23 @@
 	<check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox"/>
 	<text name="group_titles_textbox">Titres de groupe :</text>
 	<check_box label="Masquer tous les titres de groupe" name="show_all_title_checkbox"/>
-	<check_box label="Masquer mon titre de groupe" name="show_my_title_checkbox"/>
-	<color_swatch label="" name="effect_color_swatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
-	<text name="UI Size:">Taille de l'interface :</text>
-	<slider name="ui_scale_slider"/>
 	<check_box label="Utiliser une échelle indépendante de la résolution" name="ui_auto_scale"/>
 	<spinner label="Absent(e) après :" name="afk_timeout_spinner"/>
 	<check_box label="Avertir lorsque je dépense ou reçois des L$" name="notify_money_change_checkbox"/>
 	<check_box label="Sans afficher dans le coin" name="no_transaction_clutter_checkbox" tool_tip="Toujours présente mais momentanément affichée en bas"/>
 	<text name="maturity_desired_label">Catégories :</text>
-	<text name="maturity_desired_prompt">Acc&#xE8;s au contenu classé :</text>
+	<text name="maturity_desired_prompt">Acc&#xE8;s au contenu classé :</text>
 	<combo_box name="maturity_desired_combobox" left="340">
 		<combo_item name="Desired_Adult">PG, Mature, Adulte</combo_item>
 		<combo_item name="Desired_Mature">PG et Mature</combo_item>
 		<combo_item name="Desired_PG">PG uniquement</combo_item>
 	</combo_box>
 	<text name="maturity_desired_textbox" left="340">PG uniquement</text>
-	<text name="start_location_textbox">Lieu de départ :</text>
-	<text name="show_names_textbox">Afficher les noms :</text>
-	<text bottom="-174" name="effects_color_textbox">
-Couleur du faisceau
-de sélection :
-	</text>
+	<text name="start_location_textbox">Lieu de départ :</text>
+	<text name="show_names_textbox">Afficher les noms :</text>
 	<text name="seconds_textbox">secondes</text>
 	<text name="crash_report_textbox">Rapports de crash :</text>
-	<text name="language_textbox">Langue :</text>
+	<text name="language_textbox">Langue :</text>
 	<text left_delta="313" name="language_textbox2">(redémarrage requis)</text>
 	<combo_box name="language_combobox" width="166">
 		<combo_item name="System Default Language">Choix par défaut</combo_item>
--- a/indra/newview/skins/gemini/keywords.ini
+++ b/indra/newview/skins/gemini/keywords.ini
@@ -52,7 +52,7 @@ changed			changed( integer change ):Triggered various event change the task:(tes
 remote_data     remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY)
 http_response   http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests
 http_request	http_request(key id, string method, string body):Triggered when task receives an http request against a public URL
-transaction_result		transaction_result(key id, integer success, string data):Triggered when task receives asynchronous data.
+transaction_result		transaction_result(key id, integer success, string data): Triggered when currency is given to task
 path_update		path_update(integer type, list reserved):Triggered when the state of a pathfinder character changes. Note; "list reserved" is not currently used

 # integer constants
@@ -99,6 +99,7 @@ PERMISSION_CHANGE_LINKS			Passed to llRequestPermissions library function to req
 PERMISSION_TRACK_CAMERA			Passed to llRequestPermissions library function to request permission to track agent's camera
 PERMISSION_CONTROL_CAMERA		Passed to llRequestPermissions library function to request permission to change agent's camera
 PERMISSION_TELEPORT				Passed to llRequestPermissions library function to request permission to teleport agent
+PERMISSION_OVERRIDE_ANIMATIONS  Passed to llRequestPermissions library function to request permission to override agent's animations

 DEBUG_CHANNEL		Chat channel reserved for debug and error messages from scripts
 PUBLIC_CHANNEL		Chat channel that broadcasts to all nearby users