Merge branch 'master' into VarRegion

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
 	{

indra/llui/llradiogroup.cpp

@@ -316,7 +316,8 @@ void LLRadioGroup::setValue( const LLSD& value )
 		}
 		else
 		{
-			llwarns << "LLRadioGroup::setValue: value not found: " << value_name << llendl;
+			llwarns << "LLRadioGroup::setValue: radio_item with name=\"" << value_name << "\" not found, radio_group values are set by radio_item name not value.  Falling back on LLUICtrl::setValue." << llendl;
+			LLUICtrl::setValue(value);
 		}
 	}
 }

indra/newview/app_settings/settings.xml

@@ -749,6 +749,61 @@ Found in Advanced->Rendering->Info Displays</string>
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>ContactsUseHorizontalButtons</key>
+    <map>
+      <key>Comment</key>
+	  <string>Whether or not groups and friends lists use horizontal buttons at the bottom of the panel or vertical ones on the right, requires a restart.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>UseConciseIMButtons</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether or not IMs use buttons concisely on the same line as the name of the receiver, changes apply to new IMs only.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>UseConciseGroupChatButtons</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether or not group chats use buttons concisely on the same line as the group name, changes apply to new group chats only.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>UseConciseConferenceButtons</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether or not conferences use buttons concisely on the same line as the name of the conference, changes apply to new conferences only.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>ShowLocalChatFloaterBar</key>
+    <map>
+      <key>Comment</key>
+	  <string>Whether or not local chat should have an input bar, requires a restart.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>OtherChatsTornOff</key>
     <map>
       <key>Comment</key>
@@ -769,6 +824,17 @@ Found in Advanced->Rendering->Info Displays</string>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>CommunicateSpecificShortcut</key>
+    <map>
+      <key>Comment</key>
+	  <string>When true, the keyboard shortcut for Communicate will not bring up the torn off Friends List.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
       <integer>0</integer>
     </map>
     <key>MarketImporterUpdateFreq</key>
@@ -6114,6 +6180,22 @@ This should be as low as possible, but too low may break functionality</string>
         <integer>0</integer>
       </array>
     </map>
+    <key>FloaterChatBarlessRect</key>
+    <map>
+      <key>Comment</key>
+	  <string>Rectangle for chat history without input bar</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>0</integer>
+        <integer>172</integer>
+        <integer>500</integer>
+        <integer>0</integer>
+      </array>
+    </map>
     <key>FloaterClothingRect</key>
     <map>
       <key>Comment</key>
@@ -6133,7 +6215,23 @@ This should be as low as possible, but too low may break functionality</string>
     <key>FloaterContactsRect</key>
     <map>
       <key>Comment</key>
-      <string>Rectangle for chat history</string>
+      <string>Rectangle for contacts floater</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>0</integer>
+        <integer>390</integer>
+        <integer>395</integer>
+        <integer>0</integer>
+      </array>
+    </map>
+    <key>FloaterContactsHorizRect</key>
+    <map>
+      <key>Comment</key>
+      <string>Rectangle for contacts floater in horizontal mode</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -6178,6 +6276,22 @@ This should be as low as possible, but too low may break functionality</string>
         <integer>0</integer>
       </array>
     </map>
+    <key>FloaterDebugSettingsRect</key>
+    <map>
+      <key>Comment</key>
+      <string>Rectangle for the Debug Settings floater</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>0</integer>
+        <integer>300</integer>
+        <integer>245</integer>
+        <integer>0</integer>
+      </array>
+    </map>
     <key>FloaterEnvRect</key>
     <map>
       <key>Comment</key>
@@ -6629,7 +6743,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>
@@ -7689,7 +7814,7 @@ This should be as low as possible, but too low may break functionality</string>
     <key>WebProfileURL</key>
     <map>
       <key>Comment</key>
-      <string>URL for SL Web Profiles</string>
+      <string>URL for Web Profiles</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -7697,17 +7822,6 @@ This should be as low as possible, but too low may break functionality</string>
       <key>Value</key>
       <string>https://my.secondlife.com/[AGENT_NAME]</string>
     </map>
-    <key>WebProfileNonProductionURL</key>
-    <map>
-        <key>Comment</key>
-        <string>URL for SL Web Profiles on Non-Production grids</string>
-        <key>Persist</key>
-        <integer>0</integer>
-        <key>Type</key>
-        <string>String</string>
-        <key>Value</key>
-        <string>https://my-demo.secondlife.com/[AGENT_NAME]</string>
-    </map>
     <key>HighResSnapshot</key>
     <map>
       <key>Comment</key>

indra/newview/app_settings/settings_ascent_coa.xml

@@ -31,7 +31,7 @@
       <integer>1</integer>
     </map>
 
-    <key>MoyMiniMapCustomColor</key>
+        <key>MoyMiniMapCustomColor</key>
 		<map>
 			<key>Comment</key>
 			<string>Custom minimap color you wish to have.</string>
@@ -256,6 +256,20 @@
           <key>IsCOA</key>
           <integer>1</integer>
         </map>
+        <!--TODO: implement this and make MoyMiniMapCustomColor more flexible
+        <key>ColorCustomChat</key>
+        <map>
+          <key>Comment</key>
+          <string>Color chat from users you have chosen using MoyMiniMapCustomColor</string>
+          <key>Persist</key>
+          <integer>1</integer>
+          <key>Type</key>
+          <string>Boolean</string>
+          <key>Value</key>
+          <integer>0</integer>
+          <key>IsCOA</key>
+          <integer>1</integer>
+        </map-->
         <key>AscentReportClientUUID</key>
 		<map>
 			<key>Comment</key>

indra/newview/app_settings/settings_per_account.xml

@@ -357,22 +357,6 @@
 			<string>This is an autoresponse!</string>
 		</map>
 	</map>
-	<key>MoyMiniMapCustomColor</key>
-	<map>
-		<key>Comment</key>
-		<string>Custom minimap color you wish to have.</string>
-		<key>Persist</key>
-		<integer>1</integer>
-		<key>Type</key>
-		<string>Color4</string>
-		<key>Value</key>
-		<array>
-			<real>0.375</real>
-			<real>1.0</real>
-			<real>1.0</real>
-			<real>1.0</real>
-		</array>
-	</map>
 	<!-- Ascent Account-Specific (Always) -->
     <!-- General additions -->
     <key>rkeastInventoryPreviousCount</key>

indra/newview/ascentprefschat.cpp

@@ -325,7 +325,6 @@ void LLPrefsAscentChat::onCommitKeywords(LLUICtrl* ctrl, void* user_data)
 void LLPrefsAscentChat::refreshValues()
 {
     //Chat/IM -----------------------------------------------------------------------------
-    mWoLfVerticalIMTabs             = gSavedSettings.getBOOL("WoLfVerticalIMTabs");
     mIMAnnounceIncoming             = gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming");
     mHideTypingNotification         = gSavedSettings.getBOOL("AscentHideTypingNotification");
     mShowGroupNameInChatIM          = gSavedSettings.getBOOL("OptionShowGroupNameInChatIM");
@@ -336,7 +335,6 @@ void LLPrefsAscentChat::refreshValues()
     mLinksForChattingObjects        = gSavedSettings.getU32("LinksForChattingObjects");
     mSecondsInChatAndIMs            = gSavedSettings.getBOOL("SecondsInChatAndIMs");
     mSecondsInLog                   = gSavedSettings.getBOOL("SecondsInLog");
-    mOtherChatsTornOff              = gSavedSettings.getBOOL("OtherChatsTornOff");
 
     std::string format = gSavedSettings.getString("ShortTimeFormat");
     if (format.find("%p") == -1)
@@ -374,6 +372,16 @@ void LLPrefsAscentChat::refreshValues()
     mIMResponseItem                 = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseItem");
     mIMResponseText                 = gSavedPerAccountSettings.getString("AscentInstantMessageResponse");
 
+	//Chat UI -----------------------------------------------------------------------------
+	mWoLfVerticalIMTabs             = gSavedSettings.getBOOL("WoLfVerticalIMTabs");
+	mOtherChatsTornOff              = gSavedSettings.getBOOL("OtherChatsTornOff");
+	mShowLocalChatFloaterBar        = gSavedSettings.getBOOL("ShowLocalChatFloaterBar");
+	mHorizButt                      = gSavedSettings.getBOOL("ContactsUseHorizontalButtons");
+	mOneLineIMButt                  = gSavedSettings.getBOOL("UseConciseIMButtons");
+	mOneLineGroupButt               = gSavedSettings.getBOOL("UseConciseGroupChatButtons");
+	mOneLineConfButt                = gSavedSettings.getBOOL("UseConciseConferenceButtons");
+	mOnlyComm                       = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
+
     //Spam --------------------------------------------------------------------------------
 	mEnableAS                       = gSavedSettings.getBOOL("AntiSpamEnabled");
     mGlobalQueue                    = gSavedSettings.getBOOL("_NACL_AntiSpamGlobalQueue");
@@ -532,7 +540,6 @@ void LLPrefsAscentChat::refresh()
 void LLPrefsAscentChat::cancel()
 {
     //Chat/IM -----------------------------------------------------------------------------
-    gSavedSettings.setBOOL("WoLfVerticalIMTabs",                   mWoLfVerticalIMTabs);
     gSavedSettings.setBOOL("AscentInstantMessageAnnounceIncoming", mIMAnnounceIncoming);
     gSavedSettings.setBOOL("AscentHideTypingNotification",         mHideTypingNotification);
     gSavedSettings.setBOOL("OptionShowGroupNameInChatIM",          mShowGroupNameInChatIM);
@@ -543,7 +550,6 @@ void LLPrefsAscentChat::cancel()
     gSavedSettings.setU32("LinksForChattingObjects",               mLinksForChattingObjects);
     gSavedSettings.setBOOL("SecondsInChatAndIMs",                  mSecondsInChatAndIMs);
     gSavedSettings.setBOOL("SecondsInLog",                         mSecondsInLog);
-    gSavedSettings.setBOOL("OtherChatsTornOff",                    mOtherChatsTornOff);
 
     std::string short_date, long_date, short_time, long_time, timestamp;
 
@@ -594,6 +600,16 @@ void LLPrefsAscentChat::cancel()
     gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem",    mIMResponseItem);
     gSavedPerAccountSettings.setString("AscentInstantMessageResponse",      mIMResponseText);
 
+	//Chat UI -----------------------------------------------------------------------------
+	gSavedSettings.setBOOL("WoLfVerticalIMTabs",                   mWoLfVerticalIMTabs);
+	gSavedSettings.setBOOL("OtherChatsTornOff",                    mOtherChatsTornOff);
+	gSavedSettings.setBOOL("ShowLocalChatFloaterBar",              mShowLocalChatFloaterBar);
+	gSavedSettings.setBOOL("ContactsUseHorizontalButtons",         mHorizButt);
+	gSavedSettings.setBOOL("UseConciseIMButtons",                  mOneLineIMButt);
+	gSavedSettings.setBOOL("UseConciseGroupChatButtons",           mOneLineGroupButt);
+	gSavedSettings.setBOOL("UseConciseConferenceButtons",          mOneLineConfButt);
+	gSavedSettings.setBOOL("CommunicateSpecificShortcut",          mOnlyComm);
+
     //Spam --------------------------------------------------------------------------------
 	gSavedSettings.setBOOL("AntiSpamEnabled",                mEnableAS);
     gSavedSettings.setBOOL("_NACL_AntiSpamGlobalQueue",      mGlobalQueue);

indra/newview/ascentprefschat.h

@@ -62,7 +62,6 @@ protected:
     static void onCommitKeywords(LLUICtrl* ctrl, void* user_data);
 
     //Chat/IM -----------------------------------------------------------------------------
-    BOOL mWoLfVerticalIMTabs;
     BOOL mIMAnnounceIncoming;
     BOOL mHideTypingNotification;
     BOOL mShowGroupNameInChatIM;
@@ -77,7 +76,6 @@ protected:
         U32 tempDateFormat;
     BOOL mSecondsInChatAndIMs;
     BOOL mSecondsInLog;
-    BOOL mOtherChatsTornOff;
 
     BOOL mIMResponseAnyone;
     BOOL mIMResponseFriends;
@@ -88,6 +86,16 @@ protected:
     BOOL mIMResponseItem;
     std::string mIMResponseText;
 
+    //Chat UI -----------------------------------------------------------------------------
+	bool mWoLfVerticalIMTabs;
+	bool mOtherChatsTornOff;
+	bool mShowLocalChatFloaterBar;
+	bool mHorizButt;
+	bool mOneLineIMButt;
+	bool mOneLineGroupButt;
+	bool mOneLineConfButt;
+	bool mOnlyComm;
+
     //Spam --------------------------------------------------------------------------------
     BOOL mEnableAS;
     BOOL mGlobalQueue;

indra/newview/ascentprefsvan.cpp

@@ -211,11 +211,12 @@ void LLPrefsAscentVan::refreshValues()
     mEstateOwnerColor		= gSavedSettings.getColor4("AscentEstateOwnerColor");
     mLindenColor			= gSavedSettings.getColor4("AscentLindenColor");
     mMutedColor				= gSavedSettings.getColor4("AscentMutedColor");
-    //mCustomColor			= gSavedSettings.getColor4("MoyMiniMapCustomColor");
+    mCustomColor			= gSavedSettings.getColor4("MoyMiniMapCustomColor");
 	mColorFriendChat        = gSavedSettings.getBOOL("ColorFriendChat");
 	mColorEOChat            = gSavedSettings.getBOOL("ColorEstateOwnerChat");
 	mColorLindenChat        = gSavedSettings.getBOOL("ColorLindenChat");
 	mColorMutedChat         = gSavedSettings.getBOOL("ColorMutedChat");
+//	mColorCustomChat        = gSavedSettings.getBOOL("ColorCustomChat");
 
     //Body Dynamics --------------------------------------------------------------------------
     mBreastPhysicsToggle    = gSavedSettings.getBOOL("EmeraldBreastPhysicsToggle");
@@ -293,11 +294,12 @@ void LLPrefsAscentVan::cancel()
     gSavedSettings.setColor4("AscentEstateOwnerColor",   mEstateOwnerColor);
     gSavedSettings.setColor4("AscentLindenColor",        mLindenColor);
     gSavedSettings.setColor4("AscentMutedColor",         mMutedColor);
-//    gSavedSettings.setColor4("MoyMiniMapCustomColor",    mCustomColor);
+    gSavedSettings.setColor4("MoyMiniMapCustomColor",    mCustomColor);
     gSavedSettings.setBOOL("ColorFriendChat",            mColorFriendChat);
     gSavedSettings.setBOOL("ColorEstateOwnerChat",       mColorEOChat);
     gSavedSettings.setBOOL("ColorLindenChat",            mColorLindenChat);
     gSavedSettings.setBOOL("ColorMutedChat",             mColorMutedChat);
+//	gSavedSettings.setBOOL("ColorCustomChat",            mColorCustomChat);
 
     //Body Dynamics --------------------------------------------------------------------------
     gSavedSettings.setBOOL("EmeraldBreastPhysicsToggle", mBreastPhysicsToggle);

indra/newview/ascentprefsvan.h

@@ -82,10 +82,12 @@ protected:
     LLColor4 mEstateOwnerColor;
     LLColor4 mLindenColor;
     LLColor4 mMutedColor;
+	LLColor4 mCustomColor;
 	bool mColorFriendChat;
 	bool mColorEOChat;
 	bool mColorLindenChat;
 	bool mColorMutedChat;
+//	bool mColorCustomChat;
     //Body Dynamics
     BOOL mBreastPhysicsToggle;
     F32 mBoobMass;

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)
 	{

indra/newview/hippogridmanager.cpp

@@ -73,7 +73,7 @@ HippoGridInfo::Platform HippoGridInfo::getPlatform()
 
 bool HippoGridInfo::isOpenSimulator() const
 {
-	return (mPlatform == HippoGridInfo::PLATFORM_OPENSIM);
+	return (mPlatform == HippoGridInfo::PLATFORM_OPENSIM || mPlatform == HippoGridInfo::PLATFORM_AURORA);
 }
 
 bool HippoGridInfo::isAurora() const

indra/newview/hippolimits.cpp

@@ -52,9 +52,9 @@ void HippoLimits::setAuroraLimits()
 {
 	mMaxAgentGroups = gHippoGridManager->getConnectedGrid()->getMaxAgentGroups();
 	if (mMaxAgentGroups < 0) mMaxAgentGroups = 50;
-	mMaxPrimScale = 256.0f;
+	mMaxPrimScale = 8192.0f;
 	mMinPrimScale = 0.001f;
-	mMaxHeight = 8192.0f;
+	mMaxHeight = 10000.0f;
 	mMinHoleSize = 0.001f;
 	mMaxHollow = 99.0f;
 }

indra/newview/llcompilequeue.cpp

@@ -55,6 +55,7 @@
 #include "llviewerobject.h"
 #include "llviewerregion.h"
 #include "llresmgr.h"
+
 #include "llbutton.h"
 #include "lldir.h"
 #include "llnotificationsutil.h"
@@ -207,8 +208,7 @@ BOOL LLFloaterScriptQueue::start()
 	args["[COUNT]"] = llformat ("%d", mObjectIDs.count());
 	buffer = getString ("Starting", args);
 
-	LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
+	getChild<LLScrollListCtrl>("queue output")->addSimpleElement(buffer, ADD_BOTTOM);
-	list->setCommentText(buffer);
 
 	return nextObject();
 }
@@ -240,12 +240,9 @@ BOOL LLFloaterScriptQueue::nextObject()
 	} while((mObjectIDs.count() > 0) && !successful_start);
 	if(isDone() && !mDone)
 	{
-		
+		mDone = true;
-		LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
+		getChild<LLScrollListCtrl>("queue output")->addSimpleElement(getString("Done"), ADD_BOTTOM);
-
+		getChildView("close")->setEnabled(TRUE);
-		mDone = TRUE;
-		list->setCommentText(getString("Done"));
-		childSetEnabled("close",TRUE);
 	}
 	return successful_start;
 }
@@ -283,6 +280,40 @@ BOOL LLFloaterScriptQueue::popNext()
 /// Class LLFloaterCompileQueue
 ///----------------------------------------------------------------------------
 
+class LLCompileFloaterUploadQueueSupplier : public LLAssetUploadQueueSupplier
+{
+public:
+
+	LLCompileFloaterUploadQueueSupplier(const LLUUID& queue_id) :
+		mQueueId(queue_id)
+	{
+	}
+
+	virtual LLAssetUploadQueue* get() const
+	{
+		LLFloaterCompileQueue* queue = (LLFloaterCompileQueue*) LLFloaterScriptQueue::findInstance(mQueueId);
+		if(NULL == queue)
+		{
+			return NULL;
+		}
+		return queue->getUploadQueue();
+	}
+
+	virtual void log(std::string message) const
+	{
+		LLFloaterCompileQueue* queue = (LLFloaterCompileQueue*) LLFloaterScriptQueue::findInstance(mQueueId);
+		if(NULL == queue)
+		{
+			return;
+		}
+
+		queue->getChild<LLScrollListCtrl>("queue output")->addSimpleElement(message, ADD_BOTTOM);
+	}
+
+private:
+	LLUUID mQueueId;
+};
+
 // static
 LLFloaterCompileQueue* LLFloaterCompileQueue::create(BOOL mono)
 {
@@ -291,48 +322,8 @@ LLFloaterCompileQueue* LLFloaterCompileQueue::create(BOOL mono)
 	LLRect rect = gSavedSettings.getRect("CompileOutputRect");
 	rect.translate(left - rect.mLeft, top - rect.mTop);
 	LLFloaterCompileQueue* new_queue = new LLFloaterCompileQueue("queue", rect);
-	
-	class LLCompileFloaterUploadQueueSupplier : public LLAssetUploadQueueSupplier
-	{
-	public:
-	
-		LLCompileFloaterUploadQueueSupplier(const LLUUID& queue_id) :
-			mQueueId(queue_id)
-		{
-		}
-		
-		virtual LLAssetUploadQueue* get() const 
-		{
-			LLFloaterCompileQueue* queue = 
-				(LLFloaterCompileQueue*) LLFloaterScriptQueue::findInstance(mQueueId);
-			
-			if(NULL == queue)
-			{
-				return NULL;
-			}
-			
-			return queue->mUploadQueue;
-		}
 
-		virtual void log(std::string message) const
+	new_queue->mUploadQueue = new LLAssetUploadQueue(new LLCompileFloaterUploadQueueSupplier(new_queue->getID()));
-		{
-			LLFloaterCompileQueue* queue = 
-				(LLFloaterCompileQueue*) LLFloaterScriptQueue::findInstance(mQueueId);
-
-			if(NULL == queue)
-			{
-				return;
-			}
-
-			LLScrollListCtrl* list = queue->getChild<LLScrollListCtrl>("queue output");
-			list->setCommentText(message.c_str());
-		}
-		
-	private:
-		LLUUID mQueueId;
-	};
-																 															 
-	new_queue->mUploadQueue = new LLAssetUploadQueue(new LLCompileFloaterUploadQueueSupplier(new_queue->getID()));															 
 	new_queue->mMono = mono;
 	new_queue->open();
 	return new_queue;
@@ -414,8 +405,8 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
 	llinfos << "LLFloaterCompileQueue::scriptArrived()" << llendl;
 	LLScriptQueueData* data = (LLScriptQueueData*)user_data;
 	if(!data) return;
-	LLFloaterCompileQueue* queue = static_cast<LLFloaterCompileQueue*> 
+	LLFloaterCompileQueue* queue = static_cast<LLFloaterCompileQueue*> (LLFloaterScriptQueue::findInstance(data->mQueueID));
-				(LLFloaterScriptQueue::findInstance(data->mQueueID));
+
 	std::string buffer;
 	if(queue && (0 == status))
 	{
@@ -519,8 +510,7 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
 	}
 	if(queue && (buffer.size() > 0)) 
 	{
-		LLScrollListCtrl* list = queue->getChild<LLScrollListCtrl>("queue output");
+		queue->getChild<LLScrollListCtrl>("queue output")->addSimpleElement(buffer, ADD_BOTTOM);
-		list->setCommentText(buffer);
 	}
 	delete data;
 }
@@ -543,8 +533,7 @@ void LLFloaterCompileQueue::onSaveBytecodeComplete(const LLUUID& asset_id, void*
 {
 	llinfos << "LLFloaterCompileQueue::onSaveBytecodeComplete()" << llendl;
 	LLCompileQueueData* data = (LLCompileQueueData*)user_data;
-	LLFloaterCompileQueue* queue = static_cast<LLFloaterCompileQueue*> 
+	LLFloaterCompileQueue* queue = static_cast<LLFloaterCompileQueue*> (LLFloaterScriptQueue::findInstance(data->mQueueID));
-				(LLFloaterScriptQueue::findInstance(data->mQueueID));
 	if(queue && (0 == status) && data)
 	{
 		queue->saveItemByItemID(data->mItemId);
@@ -692,7 +681,7 @@ void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj,
 	// find all of the lsl, leaving off duplicates. We'll remove
 	// all matching asset uuids on compilation success.
 	LLDynamicArray<const char*> names;
-	
+
 	LLInventoryObject::object_list_t::const_iterator it = inv->begin();
 	LLInventoryObject::object_list_t::const_iterator end = inv->end();
 	for ( ; it != end; ++it)
@@ -704,10 +693,9 @@ void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj,
 			if (object)
 			{
 				LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
-				LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
 				std::string buffer;
 				buffer = getString("Resetting") + LLTrans::getString(":") + " " + item->getName();
-				list->setCommentText(buffer);
+				getChild<LLScrollListCtrl>("queue output")->addSimpleElement(buffer, ADD_BOTTOM);
 				LLMessageSystem* msg = gMessageSystem;
 				msg->newMessageFast(_PREHASH_ScriptReset);
 				msg->nextBlockFast(_PREHASH_AgentData);
@@ -754,7 +742,7 @@ void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
 	// find all of the lsl, leaving off duplicates. We'll remove
 	// all matching asset uuids on compilation success.
 	LLDynamicArray<const char*> names;
-	
+
 	LLInventoryObject::object_list_t::const_iterator it = inv->begin();
 	LLInventoryObject::object_list_t::const_iterator end = inv->end();
 	for ( ; it != end; ++it)
@@ -769,7 +757,7 @@ void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
 				LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
 				std::string buffer;
 				buffer = getString("Running") + LLTrans::getString(":") + " " + item->getName();
-				list->setCommentText(buffer);
+				list->addSimpleElement(buffer, ADD_BOTTOM);
 
 				LLMessageSystem* msg = gMessageSystem;
 				msg->newMessageFast(_PREHASH_SetScriptRunning);
@@ -818,7 +806,7 @@ void LLFloaterNotRunQueue::handleInventory(LLViewerObject* viewer_obj,
 	// find all of the lsl, leaving off duplicates. We'll remove
 	// all matching asset uuids on compilation success.
 	LLDynamicArray<const char*> names;
-	
+
 	LLInventoryObject::object_list_t::const_iterator it = inv->begin();
 	LLInventoryObject::object_list_t::const_iterator end = inv->end();
 	for ( ; it != end; ++it)
@@ -833,8 +821,8 @@ void LLFloaterNotRunQueue::handleInventory(LLViewerObject* viewer_obj,
 				LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
 				std::string buffer;
 				buffer = getString("NotRunning") + LLTrans::getString(":") + " " + item->getName();
-				list->setCommentText(buffer);
+				list->addSimpleElement(buffer, ADD_BOTTOM);
-	
+
 				LLMessageSystem* msg = gMessageSystem;
 				msg->newMessageFast(_PREHASH_SetScriptRunning);
 				msg->nextBlockFast(_PREHASH_AgentData);

indra/newview/llcompilequeue.h

@@ -79,7 +79,7 @@ protected:
 								  LLInventoryObject::object_list_t* inv,
 								 S32 serial_num,
 								 void* queue);
-	
+
 	// This is called by inventoryChanged
 	virtual void handleInventory(LLViewerObject* viewer_obj,
 								 LLInventoryObject::object_list_t* inv) = 0;
@@ -105,7 +105,7 @@ protected:
 	// Object Queue
 	LLDynamicArray<LLUUID> mObjectIDs;
 	LLUUID mCurrentObjectID;
-	BOOL mDone;
+	bool mDone;
 
 	LLUUID mID;
 	static LLMap<LLUUID, LLFloaterScriptQueue*> sInstances;
@@ -143,6 +143,8 @@ public:
 	// remove any object in mScriptScripts with the matching uuid.
 	void removeItemByItemID(const LLUUID& item_id);
 
+	LLAssetUploadQueue* getUploadQueue() { return mUploadQueue; }
+
 protected:
 	LLFloaterCompileQueue(const std::string& name, const LLRect& rect);
 	virtual ~LLFloaterCompileQueue();
@@ -200,12 +202,10 @@ public:
 protected:
 	LLFloaterResetQueue(const std::string& name, const LLRect& rect);
 	virtual ~LLFloaterResetQueue();
-	
+
 	// This is called by inventoryChanged
 	virtual void handleInventory(LLViewerObject* viewer_obj,
-								 LLInventoryObject::object_list_t* inv);
+								 LLInventoryObject::object_list_t* inv);	
-
-protected:
 };
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -224,12 +224,10 @@ public:
 protected:
 	LLFloaterRunQueue(const std::string& name, const LLRect& rect);
 	virtual ~LLFloaterRunQueue();
-	
+
 	// This is called by inventoryChanged
 	virtual void handleInventory(LLViewerObject* viewer_obj,
 								 LLInventoryObject::object_list_t* inv);
-
-protected:
 };
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -252,8 +250,6 @@ protected:
 	// This is called by inventoryChanged
 	virtual void handleInventory(LLViewerObject* viewer_obj,
 								 LLInventoryObject::object_list_t* inv);
-
-protected:
 };
 
 #endif // LL_LLCOMPILEQUEUE_H

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),
@@ -476,6 +492,15 @@ void LLFloaterAvatarList::assessColumns()
 		mAvatarList->getColumn(LIST_AVATAR_NAME)->mDynamicWidth = TRUE;
 		mAvatarList->getColumn(LIST_AVATAR_NAME)->mRelWidth = -1;
 	}
+	else if (!hide_client)
+	{
+		mAvatarList->getColumn(LIST_CLIENT)->setWidth(0);
+		mAvatarList->getColumn(LIST_AVATAR_NAME)->setWidth(0);
+		mAvatarList->getColumn(LIST_AVATAR_NAME)->mDynamicWidth = FALSE;
+		mAvatarList->getColumn(LIST_AVATAR_NAME)->mRelWidth = 0;
+		mAvatarList->getColumn(LIST_CLIENT)->mDynamicWidth = TRUE;
+		mAvatarList->getColumn(LIST_CLIENT)->mRelWidth = -1;
+	}
 
 	mAvatarList->updateLayout();
 }
@@ -558,7 +583,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)
@@ -650,8 +675,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;
@@ -663,37 +689,17 @@ void LLFloaterAvatarList::updateAvatarList()
 				ids << "," << id.asString();
 				++num_ids;
 
-				if(ids.tellp() > 200)
+				if (ids.tellp() > 200)
 				{
-					gMessageSystem->newMessage("ScriptDialogReply");
+					send_keys_message(transact_num, num_ids, ids.str());
-					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();
 
 					num_ids = 0;
 					ids.seekp(0);
 					ids.str("");
 				}
 			}
-			if(num_ids > 0)
+			if (num_ids > 0)
-			{
+				send_keys_message(transact_num, num_ids, ids.str());
-				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();
-			}
 		}
 	}
 
@@ -1387,19 +1393,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
+	if (!regionp) return;//ALWAYS VALIDATE DATA
-	std::ostringstream ids;
+
 	static int last_transact_num = 0;
 	int transact_num = (int)gFrameCount;
-	int num_ids = 0;
 
-	if(!gSavedSettings.getBOOL("RadarChatKeys"))
+	if (transact_num > last_transact_num)
-	{
-		return;
-	}
-
-	if(transact_num > last_transact_num)
 	{
 		last_transact_num = transact_num;
 	}
@@ -1410,7 +1414,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);
@@ -1419,67 +1425,54 @@ void LLFloaterAvatarList::sendKeys()
 		++num_ids;
 
 
-		if(ids.tellp() > 200)
+		if (ids.tellp() > 200)
 		{
-			gMessageSystem->newMessage("ScriptDialogReply");
+			send_keys_message(transact_num, num_ids, ids.str());
-			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();
 
 			num_ids = 0;
 			ids.seekp(0);
 			ids.str("");
 		}
 	}
-	if(num_ids > 0)
+	if (num_ids > 0)
-	{
+		send_keys_message(transact_num, num_ids, ids.str());
-		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();
-	}
 }
 //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.
+		static LLCachedControl<bool> on("RadarChatKeys");
-		if(gSavedSettings.getBOOL("RadarChatKeys"))
+		static LLCachedControl<bool> do_not_ask("RadarChatKeysStopAsking");
-		{
+		if (on)
 			LLFloaterAvatarList::getInstance()->sendKeys();
-		}else
+		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);
-			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);
-		}
 	}
 }
 // 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;
 }
 

indra/newview/llfloaterchat.cpp

@@ -108,7 +108,8 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
 	mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, NULL);
 	// do not automatically open singleton floaters (as result of getInstance())
 	BOOL no_open = FALSE;
-	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_chat_history.xml",&getFactoryMap(),no_open);
+	bool show_bar = gSavedSettings.getBOOL("ShowLocalChatFloaterBar");
+	LLUICtrlFactory::getInstance()->buildFloater(this, (show_bar ? "floater_chat_history.xml" : "floater_chat_history_barless.xml"), &getFactoryMap(), no_open);
 
 	childSetCommitCallback("show mutes",onClickToggleShowMute,this); //show mutes
 	childSetCommitCallback("translate chat",onClickToggleTranslateChat,this);

indra/newview/llfloaterchatterbox.cpp

@@ -54,7 +54,8 @@ LLFloaterMyFriends::LLFloaterMyFriends(const LLSD& seed)
 	mFactoryMap["groups_panel"] = LLCallbackMap(LLFloaterMyFriends::createGroupsPanel, NULL);
 	// do not automatically open singleton floaters (as result of getInstance())
 	BOOL no_open = FALSE;
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_my_friends.xml", &getFactoryMap(), no_open);
+	static LLCachedControl<bool> horiz("ContactsUseHorizontalButtons");
+	LLUICtrlFactory::getInstance()->buildFloater(this, (horiz ? "floater_my_friends_horiz.xml" : "floater_my_friends.xml"), &getFactoryMap(), no_open);
 }
 
 LLFloaterMyFriends::~LLFloaterMyFriends()

indra/newview/llfloatersettingsdebug.cpp

@@ -31,117 +31,129 @@
  */
 
 #include "llviewerprecompiledheaders.h"
+
 #include "llfloatersettingsdebug.h"
-#include "llfloater.h"
+
-#include "lluictrlfactory.h"
-#include "llfirstuse.h"
-#include "llcombobox.h"
-#include "llspinctrl.h"
 #include "llcolorswatch.h"
+//#include "llfirstuse.h"
+#include "llfloater.h"
+#include "llscrolllistctrl.h"
+#include "llspinctrl.h"
+#include "lltexteditor.h"
+#include "lluictrlfactory.h"
 #include "llviewercontrol.h"
+#include "llwindow.h"
 
 // [RLVa:KB]
 #include "rlvhandler.h"
 #include "rlvextensions.h"
 // [/RLVa:KB]
 
-LLFloaterSettingsDebug* LLFloaterSettingsDebug::sInstance = NULL;
+LLFloaterSettingsDebug::LLFloaterSettingsDebug()
-
+:	LLFloater(std::string("Configuration Editor"))
-LLFloaterSettingsDebug::LLFloaterSettingsDebug() : LLFloater(std::string("Configuration Editor"))
+,	mCurrentControlVariable(NULL)
+,	mOldControlVariable(NULL)
+,	mOldSearchTerm(std::string("---"))
 {
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_settings_debug.xml");
 }
 
 LLFloaterSettingsDebug::~LLFloaterSettingsDebug()
 {
-	sInstance = NULL;
+	if (mOldControlVariable)
+		mOldControlVariable->getCommitSignal()->disconnect(boost::bind(&LLFloaterSettingsDebug::onSettingSelect, this));
 }
 
 BOOL LLFloaterSettingsDebug::postBuild()
 {
-	LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
+	mSettingsScrollList = getChild<LLScrollListCtrl>("settings_scroll_list");
 
 	struct f : public LLControlGroup::ApplyFunctor
 	{
-		LLComboBox* combo;
+		settings_map_t* map;
-		f(LLComboBox* c) : combo(c) {}
+		f(settings_map_t* m) : map(m) {}
 		virtual void apply(const std::string& name, LLControlVariable* control)
 		{
 			if (!control->isHiddenFromSettingsEditor())
 			{
-				combo->add(name, (void*)control);
+				(*map)[name]=control;
 			}
 		}
-	} func(settings_combo);
+	} func(&mSettingsMap);
 
 	gSavedSettings.applyToAll(&func);
 	gSavedPerAccountSettings.applyToAll(&func);
 	gColors.applyToAll(&func);
 
-	settings_combo->sortByName();
+	// Populate the list
-	settings_combo->setCommitCallback(onSettingSelect);
+	{
-	settings_combo->setCallbackUserData(this);
+		for(settings_map_t::iterator it = mSettingsMap.begin(); it != mSettingsMap.end(); it++)
-	settings_combo->updateSelection();
+		{
+			LLSD item;
+			item["columns"][0]["value"] = it->second->getName();
+			mSettingsScrollList->addElement(item, ADD_BOTTOM, it->second);
+		}
+	}
+	mSettingsScrollList->sortByColumnIndex(0, true);
+	mSettingsScrollList->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onSettingSelect, this));
 
-	childSetCommitCallback("val_spinner_1", onCommitSettings);
+	llinfos << mSettingsScrollList->getItemCount() << " total debug settings displayed." << llendl;
-	childSetUserData("val_spinner_1", this);
+
-	childSetCommitCallback("val_spinner_2", onCommitSettings);
+	getChild<LLUICtrl>("val_spinner_1")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
-	childSetUserData("val_spinner_2", this);
+	getChild<LLUICtrl>("val_spinner_2")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
-	childSetCommitCallback("val_spinner_3", onCommitSettings);
+	getChild<LLUICtrl>("val_spinner_3")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
-	childSetUserData("val_spinner_3", this);
+	getChild<LLUICtrl>("val_spinner_4")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
-	childSetCommitCallback("val_spinner_4", onCommitSettings);
+	getChild<LLUICtrl>("val_text")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
-	childSetUserData("val_spinner_4", this);
+	getChild<LLUICtrl>("boolean_combo")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
-	childSetCommitCallback("val_text", onCommitSettings);
+	getChild<LLUICtrl>("color_swatch")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
-	childSetUserData("val_text", this);
+	getChild<LLUICtrl>("copy_btn")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCopyToClipboard, this));
-	childSetCommitCallback("boolean_combo", onCommitSettings);
+	getChild<LLUICtrl>("default_btn")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onClickDefault, this));
-	childSetUserData("boolean_combo", this);
+	getChild<LLSearchEditor>("search_settings_input")->setSearchCallback(onUpdateFilter, this);
-	childSetCommitCallback("color_swatch", onCommitSettings);
-	childSetUserData("color_swatch", this);
-	childSetAction("default_btn", onClickDefault, this);
 	mComment = getChild<LLTextEditor>("comment_text");
 	return TRUE;
 }
 
 void LLFloaterSettingsDebug::draw()
 {
-	LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
+	// check for changes in control visibility, like RLVa does
-	LLControlVariable* controlp = static_cast<LLControlVariable*>(settings_combo->getCurrentUserdata());
+	if(mCurrentControlVariable && mCurrentControlVariable->isHiddenFromSettingsEditor() != mOldVisibility)
-	updateControl(controlp ? controlp->getCOAActive() : NULL);
+		updateControl();
 
 	LLFloater::draw();
 }
 
-//static
+LLControlVariable* LLFloaterSettingsDebug::getControlVariable()
-void LLFloaterSettingsDebug::show(void*)
 {
-	if (sInstance == NULL)
+	LLScrollListItem* item = mSettingsScrollList->getFirstSelected();
-	{
+	if (!item) return NULL;
-		sInstance = new LLFloaterSettingsDebug();
 
-		LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_settings_debug.xml");
+	LLControlVariable* controlp = static_cast<LLControlVariable*>(item->getUserdata());
-	}
 
-	sInstance->open();		/* Flawfinder: ignore */
+	return controlp ? controlp->getCOAActive() : NULL;
 }
 
-//static 
+void LLFloaterSettingsDebug::onSettingSelect()
-void LLFloaterSettingsDebug::onSettingSelect(LLUICtrl* ctrl, void* user_data)
 {
-	LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
+	mCurrentControlVariable = getControlVariable();
-	LLComboBox* combo_box = static_cast<LLComboBox*>(ctrl);
-	LLControlVariable* controlp = static_cast<LLControlVariable*>(combo_box->getCurrentUserdata());
 
-	floaterp->updateControl(controlp ? controlp->getCOAActive() : NULL);
+	if (mOldControlVariable == mCurrentControlVariable) return;
+
+	// unbind change control signal from previously selected control
+	if(mOldControlVariable)
+		mOldControlVariable->getCommitSignal()->disconnect(boost::bind(&LLFloaterSettingsDebug::onSettingSelect, this));
+
+	// bind change control signal, so we can see updates to the current control in realtime
+	if(mCurrentControlVariable)
+		mCurrentControlVariable->getCommitSignal()->connect(boost::bind(&LLFloaterSettingsDebug::onSettingSelect, this));
+
+	mOldControlVariable = mCurrentControlVariable;
+
+	updateControl();
 }
 
-//static
+void LLFloaterSettingsDebug::onCommitSettings()
-void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
 {
-	LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
+	if (!mCurrentControlVariable)
-
-	LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
-	LLControlVariable* controlp = static_cast<LLControlVariable*>(settings_combo->getCurrentUserdata());
-	controlp = controlp ? controlp->getCOAActive() : NULL;
-	if(!controlp)//Uh oh!
 		return;
 
 	LLVector3 vector;
@@ -152,88 +164,89 @@ void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
 	LLColor4U col4U;
 	LLColor4 color_with_alpha;
 
-	switch(controlp->type())
+	switch(mCurrentControlVariable->type())
 	{		
 	  case TYPE_U32:
-		controlp->set(floaterp->childGetValue("val_spinner_1"));
+		mCurrentControlVariable->set(getChild<LLUICtrl>("val_spinner_1")->getValue());
 		break;
 	  case TYPE_S32:
-		controlp->set(floaterp->childGetValue("val_spinner_1"));
+		mCurrentControlVariable->set(getChild<LLUICtrl>("val_spinner_1")->getValue());
 		break;
 	  case TYPE_F32:
-		controlp->set(LLSD(floaterp->childGetValue("val_spinner_1").asReal()));
+		mCurrentControlVariable->set(LLSD(getChild<LLUICtrl>("val_spinner_1")->getValue().asReal()));
 		break;
 	  case TYPE_BOOLEAN:
-		controlp->set(floaterp->childGetValue("boolean_combo"));
+		mCurrentControlVariable->set(getChild<LLUICtrl>("boolean_combo")->getValue());
 		break;
 	  case TYPE_STRING:
-		controlp->set(LLSD(floaterp->childGetValue("val_text").asString()));
+		mCurrentControlVariable->set(LLSD(getChild<LLUICtrl>("val_text")->getValue().asString()));
 		break;
 	  case TYPE_VEC3:
-		vector.mV[VX] = (F32)floaterp->childGetValue("val_spinner_1").asReal();
+		vector.mV[VX] = (F32)getChild<LLUICtrl>("val_spinner_1")->getValue().asReal();
-		vector.mV[VY] = (F32)floaterp->childGetValue("val_spinner_2").asReal();
+		vector.mV[VY] = (F32)getChild<LLUICtrl>("val_spinner_2")->getValue().asReal();
-		vector.mV[VZ] = (F32)floaterp->childGetValue("val_spinner_3").asReal();
+		vector.mV[VZ] = (F32)getChild<LLUICtrl>("val_spinner_3")->getValue().asReal();
-		controlp->set(vector.getValue());
+		mCurrentControlVariable->set(vector.getValue());
 		break;
 	  case TYPE_VEC3D:
-		vectord.mdV[VX] = floaterp->childGetValue("val_spinner_1").asReal();
+		vectord.mdV[VX] = getChild<LLUICtrl>("val_spinner_1")->getValue().asReal();
-		vectord.mdV[VY] = floaterp->childGetValue("val_spinner_2").asReal();
+		vectord.mdV[VY] = getChild<LLUICtrl>("val_spinner_2")->getValue().asReal();
-		vectord.mdV[VZ] = floaterp->childGetValue("val_spinner_3").asReal();
+		vectord.mdV[VZ] = getChild<LLUICtrl>("val_spinner_3")->getValue().asReal();
-		controlp->set(vectord.getValue());
+		mCurrentControlVariable->set(vectord.getValue());
 		break;
 	  case TYPE_RECT:
-		rect.mLeft = floaterp->childGetValue("val_spinner_1").asInteger();
+		rect.mLeft = getChild<LLUICtrl>("val_spinner_1")->getValue().asInteger();
-		rect.mRight = floaterp->childGetValue("val_spinner_2").asInteger();
+		rect.mRight = getChild<LLUICtrl>("val_spinner_2")->getValue().asInteger();
-		rect.mBottom = floaterp->childGetValue("val_spinner_3").asInteger();
+		rect.mBottom = getChild<LLUICtrl>("val_spinner_3")->getValue().asInteger();
-		rect.mTop = floaterp->childGetValue("val_spinner_4").asInteger();
+		rect.mTop = getChild<LLUICtrl>("val_spinner_4")->getValue().asInteger();
-		controlp->set(rect.getValue());
+		mCurrentControlVariable->set(rect.getValue());
 		break;
 	  case TYPE_COL4:
-		col3.setValue(floaterp->childGetValue("color_swatch"));
+		col3.setValue(getChild<LLUICtrl>("val_color_swatch")->getValue());
-		col4 = LLColor4(col3, (F32)floaterp->childGetValue("val_spinner_4").asReal());
+		col4 = LLColor4(col3, (F32)getChild<LLUICtrl>("val_spinner_4")->getValue().asReal());
-		controlp->set(col4.getValue());
+		mCurrentControlVariable->set(col4.getValue());
 		break;
 	  case TYPE_COL3:
-		controlp->set(floaterp->childGetValue("color_swatch"));
+		mCurrentControlVariable->set(getChild<LLUICtrl>("val_color_swatch")->getValue());
-		//col3.mV[VRED] = (F32)floaterp->childGetValue("val_spinner_1").asC();
+		//col3.mV[VRED] = (F32)getChild<LLUICtrl>("val_spinner_1")->getValue().asC();
-		//col3.mV[VGREEN] = (F32)floaterp->childGetValue("val_spinner_2").asReal();
+		//col3.mV[VGREEN] = (F32)getChild<LLUICtrl>("val_spinner_2")->getValue().asReal();
-		//col3.mV[VBLUE] = (F32)floaterp->childGetValue("val_spinner_3").asReal();
+		//col3.mV[VBLUE] = (F32)getChild<LLUICtrl>("val_spinner_3")->getValue().asReal();
-		//controlp->set(col3.getValue());
+		//mCurrentControlVariable->set(col3.getValue());
 		break;
 	  case TYPE_COL4U:
-		col3.setValue(floaterp->childGetValue("color_swatch"));
+		col3.setValue(getChild<LLUICtrl>("val_color_swatch")->getValue());
 		col4U.setVecScaleClamp(col3);
-		col4U.mV[VALPHA] = floaterp->childGetValue("val_spinner_4").asInteger();
+		col4U.mV[VALPHA] = getChild<LLUICtrl>("val_spinner_4")->getValue().asInteger();
-		controlp->set(col4U.getValue());
+		mCurrentControlVariable->set(col4U.getValue());
 		break;
 	  default:
 		break;
 	}
 }
 
-// static
+void LLFloaterSettingsDebug::onClickDefault()
-void LLFloaterSettingsDebug::onClickDefault(void* user_data)
 {
-	LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
+	if (mCurrentControlVariable)
-	LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
-	LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
-
-	if (controlp)
 	{
-		controlp = controlp->getCOAActive();
+		mCurrentControlVariable->resetToDefault(true);
-		controlp->resetToDefault(true);
+		updateControl();
-		floaterp->updateControl(controlp);
 	}
 }
 
-// we've switched controls, or doing per-frame update, so update spinners, etc.
+void LLFloaterSettingsDebug::onCopyToClipboard()
-void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
+{
+	if (mCurrentControlVariable)
+		getWindow()->copyTextToClipboard(utf8str_to_wstring(mCurrentControlVariable->getName()));
+}
+
+// we've switched controls, so update spinners, etc.
+void LLFloaterSettingsDebug::updateControl()
 {
 	LLSpinCtrl* spinner1 = getChild<LLSpinCtrl>("val_spinner_1");
 	LLSpinCtrl* spinner2 = getChild<LLSpinCtrl>("val_spinner_2");
 	LLSpinCtrl* spinner3 = getChild<LLSpinCtrl>("val_spinner_3");
 	LLSpinCtrl* spinner4 = getChild<LLSpinCtrl>("val_spinner_4");
-	LLColorSwatchCtrl* color_swatch = getChild<LLColorSwatchCtrl>("color_swatch");
+	LLColorSwatchCtrl* color_swatch = getChild<LLColorSwatchCtrl>("val_color_swatch");
+	LLUICtrl* bool_ctrl = getChild<LLUICtrl>("boolean_combo");
 
 	if (!spinner1 || !spinner2 || !spinner3 || !spinner4 || !color_swatch)
 	{
@@ -247,45 +260,33 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 	spinner3->setVisible(FALSE);
 	spinner4->setVisible(FALSE);
 	color_swatch->setVisible(FALSE);
-	childSetVisible("val_text", FALSE);
+	getChildView("val_text")->setVisible( FALSE);
 	mComment->setText(LLStringUtil::null);
+	childSetEnabled("copy_btn", false);
+	childSetEnabled("default_btn", false);
+	bool_ctrl->setVisible(false);
 
-	if (controlp)
+	if (mCurrentControlVariable)
 	{
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.1d
+// [RLVa:KB] - Checked: 2011-05-28 (RLVa-1.4.0a) | Modified: RLVa-1.4.0a
-		if (rlv_handler_t::isEnabled())
+		// If "HideFromEditor" was toggled while the floater is open then we need to manually disable access to the control
-		{
+		mOldVisibility = mCurrentControlVariable->isHiddenFromSettingsEditor();
-			// Don't allow changing DBG_WRITE debug settings under @setdebug=n
+		spinner1->setEnabled(!mOldVisibility);
-			bool fEnable = !( (gRlvHandler.hasBehaviour(RLV_BHVR_SETDEBUG)) && 
+		spinner2->setEnabled(!mOldVisibility);
-				(RlvExtGetSet::getDebugSettingFlags(controlp->getName()) & RlvExtGetSet::DBG_WRITE) );
+		spinner3->setEnabled(!mOldVisibility);
-			// Don't allow toggling "Basic Shaders" and/or "Atmopsheric Shaders" through the debug settings under @setenv=n
+		spinner4->setEnabled(!mOldVisibility);
-			fEnable &= !((gRlvHandler.hasBehaviour(RLV_BHVR_SETENV)) && 
+		color_swatch->setEnabled(!mOldVisibility);
-				(("VertexShaderEnable" == controlp->getName()) || ("WindLightUseAtmosShaders" == controlp->getName())));
+		childSetEnabled("val_text", !mOldVisibility);
-			#ifdef RLV_EXTENSION_STARTLOCATION
+		bool_ctrl->setEnabled(!mOldVisibility);
-				// Don't allow toggling RLVaLoginLastLocation
+		childSetEnabled("default_btn", !mOldVisibility);
-				fEnable &= !(RLV_SETTING_LOGINLASTLOCATION == controlp->getName());
-			#endif // RLV_EXTENSION_STARTLOCATION
-
-			// NOTE: this runs per-frame so there's no need to explictly handle onCommitSettings() or onClickDefault()
-			spinner1->setEnabled(fEnable);
-			spinner2->setEnabled(fEnable);
-			spinner3->setEnabled(fEnable);
-			spinner4->setEnabled(fEnable);
-			color_swatch->setEnabled(fEnable);
-			childSetEnabled("val_text", fEnable);
-			childSetEnabled("boolean_combo", fEnable);
-			childSetEnabled("default_btn", fEnable);
-		}
 // [/RLVa:KB]
 
-		controlp = controlp->getCOAActive();
+		childSetEnabled("copy_btn", true);
-		eControlType type = controlp->type();
 
-		//hide combo box only for non booleans, otherwise this will result in the combo box closing every frame
+		eControlType type = mCurrentControlVariable->type();
-		childSetVisible("boolean_combo", type == TYPE_BOOLEAN);
+
-		
+		mComment->setText(mCurrentControlVariable->getName() + std::string(": ") + mCurrentControlVariable->getComment());
 
-		mComment->setText(controlp->getComment());
 		spinner1->setMaxValue(F32_MAX);
 		spinner2->setMaxValue(F32_MAX);
 		spinner3->setMaxValue(F32_MAX);
@@ -311,7 +312,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 			spinner4->setIncrement(0.1f);
 		}
 
-		LLSD sd = controlp->get();
+		LLSD sd = mCurrentControlVariable->get();
 		switch(type)
 		{
 		  case TYPE_U32:
@@ -348,23 +349,24 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 			}
 			break;
 		  case TYPE_BOOLEAN:
-			if (!childHasFocus("boolean_combo"))
+			bool_ctrl->setVisible(true);
+			if (!bool_ctrl->hasFocus())
 			{
 				if (sd.asBoolean())
 				{
-					childSetValue("boolean_combo", LLSD("true"));
+					bool_ctrl->setValue(LLSD("TRUE"));
 				}
 				else
 				{
-					childSetValue("boolean_combo", LLSD(""));
+					bool_ctrl->setValue(LLSD("FALSE"));
 				}
 			}
 			break;
 		  case TYPE_STRING:
-			childSetVisible("val_text", TRUE);
+			getChildView("val_text")->setVisible( TRUE);
-			if (!childHasFocus("val_text"))
+			if (!getChild<LLUICtrl>("val_text")->hasFocus())
 			{
-				childSetValue("val_text", sd);
+				getChild<LLUICtrl>("val_text")->setValue(sd);
 			}
 			break;
 		  case TYPE_VEC3:
@@ -530,3 +532,58 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 	}
 
 }
+
+void LLFloaterSettingsDebug::onUpdateFilter(const std::string& searchTerm, void*)
+{
+	LLFloaterSettingsDebug::getInstance()->updateFilter(searchTerm);
+}
+
+void LLFloaterSettingsDebug::updateFilter(std::string searchTerm)
+{
+	// make sure not to reselect the first item in the list on focus restore
+	if (searchTerm == mOldSearchTerm) return;
+
+	mOldSearchTerm = searchTerm;
+
+	LLStringUtil::toLower(searchTerm);
+
+	mSettingsScrollList->deleteAllItems();
+
+	for(settings_map_t::iterator it = mSettingsMap.begin(); it != mSettingsMap.end(); it++)
+	{
+		bool addItem = searchTerm.empty();
+		if (!addItem)
+		{
+			std::string itemValue = it->second->getName();
+
+			LLStringUtil::toLower(itemValue);
+
+			if (itemValue.find(searchTerm, 0) != std::string::npos)
+			{
+				addItem = true;
+			}
+			else // performance: broken out to save toLower calls on comments
+			{
+				std::string itemComment = it->second->getComment();
+				LLStringUtil::toLower(itemComment);
+				if (itemComment.find(searchTerm, 0) != std::string::npos)
+					addItem = true;
+			}
+		}
+
+		if (addItem)
+		{
+			LLSD item;
+			item["columns"][0]["value"] = it->second->getName();
+			mSettingsScrollList->addElement(item, ADD_BOTTOM, it->second);
+		}
+	}
+	mSettingsScrollList->sortByColumnIndex(0, true);
+
+	// if at least one match was found, highlight and select the topmost entry in the list
+	// but only if actually a search term was given
+	if (mSettingsScrollList->getItemCount() && !searchTerm.empty())
+		mSettingsScrollList->selectFirstItem();
+
+	onSettingSelect();
+}

indra/newview/llfloatersettingsdebug.h

@@ -35,9 +35,13 @@
 
 #include "llcontrol.h"
 #include "llfloater.h"
-#include "lltexteditor.h"
 
-class LLFloaterSettingsDebug : public LLFloater
+class LLScrollListCtrl;
+class LLTextEditor;
+
+class LLFloaterSettingsDebug
+:	public LLFloater
+,	public LLSingleton<LLFloaterSettingsDebug>
 {
 public:
 	LLFloaterSettingsDebug();
@@ -46,17 +50,33 @@ public:
 	virtual BOOL postBuild();
 	virtual void draw();
 
-	void updateControl(LLControlVariable* control);
+	void updateControl();
 
-	static void show(void*);
+	// updates control filter to display in the controls list on keystroke
-	static void onSettingSelect(LLUICtrl* ctrl, void* user_data);
+	static void onUpdateFilter(const std::string& searchTerm, void*);
-	static void onCommitSettings(LLUICtrl* ctrl, void* user_data);
+	void updateFilter(std::string searchTerm);
-	static void onClickDefault(void* user_data);
+
+	void onSettingSelect();
+	void onCommitSettings();
+	void onClickDefault();
+	void onCopyToClipboard();
+
+private:
+	// returns a pointer to the currently selected control variable, or NULL
+	LLControlVariable* getControlVariable();
 
 protected:
-	static LLFloaterSettingsDebug* sInstance;
+	typedef std::map<std::string,LLControlVariable*> settings_map_t;
+
+	settings_map_t mSettingsMap;
+
+	std::string mOldSearchTerm;
+	LLControlVariable* mCurrentControlVariable;
+	LLControlVariable* mOldControlVariable;
+	bool mOldVisibility;
+
+	LLScrollListCtrl* mSettingsScrollList;
 	LLTextEditor* mComment;
 };
 
 #endif //LLFLOATERDEBUGSETTINGS_H
-

indra/newview/llimpanel.cpp

@@ -1184,40 +1184,43 @@ void LLFloaterIMPanel::init(const std::string& session_label)
     // [Ansariel: Display name support]
     mProfileButtonEnabled = FALSE;
     // [/Ansariel: Display name support]
-    
+
+	static LLCachedControl<bool> concise_im("UseConciseIMButtons");
+	static LLCachedControl<bool> concise_group("UseConciseGroupChatButtons");
+	static LLCachedControl<bool> concise_conf("UseConciseConferenceButtons");
 	std::string xml_filename;
 	switch(mDialog)
 	{
 	case IM_SESSION_GROUP_START:
 		mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, this);
-		xml_filename = "floater_instant_message_group.xml";
+		xml_filename = concise_group ? "floater_instant_message_group_concisebuttons.xml" : "floater_instant_message_group.xml";
 		mVoiceChannel = new LLVoiceChannelGroup(mSessionUUID, mSessionLabel);
 		break;
 	case IM_SESSION_INVITE:
 		mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, this);
 		if (gAgent.isInGroup(mSessionUUID))
 		{
-			xml_filename = "floater_instant_message_group.xml";
+			xml_filename = concise_group ? "floater_instant_message_group_concisebuttons.xml" : "floater_instant_message_group.xml";
 		}
 		else // must be invite to ad hoc IM
 		{
-			xml_filename = "floater_instant_message_ad_hoc.xml";
+			xml_filename = concise_conf ? "floater_instant_message_ad_hoc_concisebuttons.xml" : "floater_instant_message_ad_hoc.xml";
 		}
 		mVoiceChannel = new LLVoiceChannelGroup(mSessionUUID, mSessionLabel);
 		break;
 	case IM_SESSION_P2P_INVITE:
-		xml_filename = "floater_instant_message.xml";
+		xml_filename = concise_im ? "floater_instant_message_concisebuttons.xml" : "floater_instant_message.xml";
 		mVoiceChannel = new LLVoiceChannelP2P(mSessionUUID, mSessionLabel, mOtherParticipantUUID);
 		break;
 	case IM_SESSION_CONFERENCE_START:
 		mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, this);
-		xml_filename = "floater_instant_message_ad_hoc.xml";
+		xml_filename = concise_conf ? "floater_instant_message_ad_hoc_concisebuttons.xml" : "floater_instant_message_ad_hoc.xml";
 		mVoiceChannel = new LLVoiceChannelGroup(mSessionUUID, mSessionLabel);
 		break;
 	// just received text from another user
 	case IM_NOTHING_SPECIAL:
 
-		xml_filename = "floater_instant_message.xml";
+		xml_filename = concise_im ? "floater_instant_message_concisebuttons.xml" : "floater_instant_message.xml";
 		
 		mTextIMPossible = LLVoiceClient::getInstance()->isSessionTextIMPossible(mSessionUUID);
 		mProfileButtonEnabled = LLVoiceClient::getInstance()->isParticipantAvatar(mSessionUUID);
@@ -1227,7 +1230,7 @@ void LLFloaterIMPanel::init(const std::string& session_label)
 		break;
 	default:
 		llwarns << "Unknown session type" << llendl;
-		xml_filename = "floater_instant_message.xml";
+		xml_filename = concise_im ? "floater_instant_message_concisebuttons.xml" : "floater_instant_message.xml";
 		break;
 	}
 

indra/newview/llimview.cpp

@@ -1137,11 +1137,17 @@ LLFloaterIMPanel* LLIMMgr::createFloater(
 		gFloaterView->addChild(floater); // reparent to floater view
 		LLFloater* focused_floater = gFloaterView->getFocusedFloater(); // obtain the focused floater
 		floater->open(); // make the new chat floater appear
+		static LLCachedControl<bool> minimize("OtherChatsTornOffAndMinimized");
 		if (focused_floater != NULL) // there was a focused floater
 		{
-			floater->setMinimized(true); // so minimize this one, for now
+			floater->setMinimized(minimize); // so minimize this one, for now, if desired
 			focused_floater->setFocus(true); // and work around focus being removed by focusing on the last
 		}
+		else if (minimize)
+		{
+			floater->setFocus(false); // work around focus being granted to new floater
+			floater->setMinimized(true);
+		}
 	}
 	mFloaters.insert(floater->getHandle());
 	return floater;
@@ -1179,11 +1185,12 @@ LLFloaterIMPanel* LLIMMgr::createFloater(
 		static LLCachedControl<bool> minimize("OtherChatsTornOffAndMinimized");
 		if (focused_floater != NULL) // there was a focused floater
 		{
-			floater->setMinimized(true); // so minimize this one, for now
+			floater->setMinimized(minimize); // so minimize this one, for now, if desired
 			focused_floater->setFocus(true); // and work around focus being removed by focusing on the last
 		}
 		else if (minimize)
 		{
+			floater->setFocus(false); // work around focus being granted to new floater
 			floater->setMinimized(true);
 		}
 	}

indra/newview/llmaniptranslate.cpp

@@ -67,6 +67,7 @@
 #include "llworld.h"
 #include "llui.h"
 #include "pipeline.h"
+#include "hippogridmanager.h"
 
 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -547,6 +548,9 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 	{
 		F32 max_drag_distance = gSavedSettings.getF32("MaxDragDistance");
 
+		if (gHippoGridManager->getConnectedGrid()->isAurora())
+			max_drag_distance = llmin(10000.f, max_drag_distance);
+
 		if (relative_move.magVecSquared() > max_drag_distance * max_drag_distance)
 		{
 			lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (too far)" << llendl;

indra/newview/llpanelavatar.cpp

@@ -385,7 +385,7 @@ void LLPanelAvatarFirstLife::onClickImage(void* data)
 			S32 left, top;
 			gFloaterView->getNewFloaterPosition(&left, &top);
 			LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
-			rect.translate( left - rect.mLeft, top - rect.mTop );
+			rect.translate( left - rect.mLeft, rect.mTop - top ); // Changed to avoid textures being sunken below the window border.
 			LLPreviewTexture* preview = new LLPreviewTexture("preview task texture",
 													 rect,
 													 std::string("Profile First Life Picture"),
@@ -433,7 +433,7 @@ void LLPanelAvatarSecondLife::onClickImage(void* data)
 				S32 left, top;
 				gFloaterView->getNewFloaterPosition(&left, &top);
 				LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
-				rect.translate( left - rect.mLeft, top - rect.mTop );
+				rect.translate( left - rect.mLeft, rect.mTop - top ); // Changed to avoid textures being sunken below the window border.
 				LLPreviewTexture* preview = new LLPreviewTexture("preview task texture",
 														 rect,
 														 std::string("Profile Picture: ") +	name_text,

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)
+	if(!self) return;
-		self->mObject->updateVolume(mClipboardVolumeParams);
+
+	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)

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;

indra/newview/llpanelprofile.cpp

@@ -47,16 +47,7 @@ static const std::string PANEL_PICKS = "panel_picks";
 
 std::string getProfileURL(const std::string& agent_name)
 {
-	std::string url;
+	std::string url = gSavedSettings.getString("WebProfileURL");
-
-	if (gHippoGridManager->getConnectedGrid()->isInProductionGrid())
-	{
-		url = gSavedSettings.getString("WebProfileURL");
-	}
-	else
-	{
-		url = gSavedSettings.getString("WebProfileNonProductionURL");
-	}
 	LLSD subs;
 	subs["AGENT_NAME"] = agent_name;
 	url = LLWeb::expandURLSubstitutions(url,subs);

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);

indra/newview/llstartup.cpp

@@ -1076,7 +1076,7 @@ bool idle_startup()
 		gSavedSettings.getControl("_NACL_AntiSpamAmount")->getSignal()->connect(boost::bind(&NACLAntiSpamRegistry::handleNaclAntiSpamAmountChanged, _2));
         // NaCl End
 
-		//good as place as any to create user windlight directories
+		//good a place as any to create user windlight directories
 		std::string user_windlight_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight", ""));
 		LLFile::mkdir(user_windlight_path_name.c_str());		
 
@@ -4284,6 +4284,18 @@ bool process_login_success_response(std::string& password)
 		gSavedSettings.setString("MapServerURL", map_server_url);
 		LLWorldMap::gotMapServerURL(true);
 	}
+
+	if(gHippoGridManager->getConnectedGrid()->isOpenSimulator())
+	{
+		std::string web_profile_url = response["web_profile_url"];
+		if(!web_profile_url.empty())
+			gSavedSettings.setString("WebProfileURL", web_profile_url);
+	}
+	else if(!gHippoGridManager->getConnectedGrid()->isInProductionGrid())
+	{
+		gSavedSettings.setString("WebProfileURL", "https://my-demo.secondlife.com/[AGENT_NAME]");
+	}
+
 	// Initial outfit for the user.
 	LLSD initial_outfit = response["initial-outfit"][0];
 	if(initial_outfit.size())

indra/newview/lltexturecache.h

@@ -24,7 +24,7 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLTEXTURECACHE_
+#ifndef LL_LLTEXTURECACHE_H
 #define LL_LLTEXTURECACHE_H
 
 #include "lldir.h"

indra/newview/lltexturectrl.cpp

@@ -217,6 +217,7 @@ protected:
 	BOOL				mNoCopyTextureSelected;
 	F32					mContextConeOpacity;
 	LLSaveFolderState	mSavedFolderState;
+	BOOL				mSelectedItemPinned;
 	LLScrollListCtrl*   mLocalScrollCtrl; // tag: vaa emerald local_asset_browser
 };
 
@@ -249,7 +250,8 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
 	mSearchEdit(NULL),
 	mImmediateFilterPermMask(immediate_filter_perm_mask),
 	mNonImmediateFilterPermMask(non_immediate_filter_perm_mask),
-	mContextConeOpacity(0.f)
+	mContextConeOpacity(0.f),
+	mSelectedItemPinned(FALSE)
 {
 	mCanApplyImmediately = can_apply_immediately;
 	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_texture_ctrl.xml");
@@ -506,8 +508,13 @@ BOOL LLFloaterTexturePicker::postBuild()
 		mInventoryPanel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
 		mInventoryPanel->setAllowMultiSelect(FALSE);
 
-		// store this filter as the default one
+		// Disable auto selecting first filtered item because it takes away
-		mInventoryPanel->getRootFolder()->getFilter()->markDefault();
+		// selection from the item set by LLTextureCtrl owning this floater.
+		mInventoryPanel->getRootFolder()->setAutoSelectOverride(TRUE);
+
+		// Commented out to scroll to currently selected texture. See EXT-5403.
+		// // store this filter as the default one
+		// mInventoryPanel->getRootFolder()->getFilter()->markDefault();
 
 		// Commented out to stop opening all folders with textures
 		// mInventoryPanel->openDefaultFolderForType(LLAssetType::AT_TEXTURE);
@@ -675,6 +682,31 @@ void LLFloaterTexturePicker::draw()
 			// Draw X
 			gl_draw_x(interior, LLColor4::black );
 		}
+
+		if (mSelectedItemPinned) return;
+
+		LLFolderView* folder_view = mInventoryPanel->getRootFolder();
+		if (!folder_view) return;
+
+		LLInventoryFilter* filter = folder_view->getFilter();
+		if (!filter) return;
+
+		bool is_filter_active = folder_view->getCompletedFilterGeneration() < filter->getCurrentGeneration() &&
+				filter->isNotDefault();
+
+		// After inventory panel filter is applied we have to update
+		// constraint rect for the selected item because of folder view
+		// AutoSelectOverride set to TRUE. We force PinningSelectedItem
+		// flag to FALSE state and setting filter "dirty" to update
+		// scroll container to show selected item (see LLFolderView::doIdle()).
+		if (!is_filter_active && !mSelectedItemPinned)
+		{
+			folder_view->setPinningSelectedItem(mSelectedItemPinned);
+			folder_view->dirtyFilter();
+			folder_view->arrangeFromRoot();
+
+			mSelectedItemPinned = TRUE;
+		}
 	}
 }
 

indra/newview/llviewermenu.cpp

@@ -860,6 +860,7 @@ void init_menus()
 	menu->setCanTearOff(TRUE);
 	init_client_menu(menu);
 	gMenuBarView->addChild( menu );
+	rlvMenuToggleVisible();
 
 	menu = new LLMenuGL(SERVER_MENU_NAME);
 	menu->setCanTearOff(TRUE);
@@ -880,7 +881,7 @@ void init_menus()
 	
 	menu = new LLMenuGL(CLIENT_MENU_NAME);
 	menu->setCanTearOff(FALSE);
-	menu->addChild(new LLMenuItemCallGL("Debug Settings...", LLFloaterSettingsDebug::show, NULL, NULL));
+	menu->addChild(new LLMenuItemCallGL("Debug Settings...", handle_singleton_toggle<LLFloaterSettingsDebug>, NULL, NULL));
 	gLoginMenuBarView->addChild(menu);
 	menu->updateParent(LLMenuGL::sMenuContainer);
 
@@ -1064,15 +1065,13 @@ void init_client_menu(LLMenuGL* menu)
 
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.1b | OK
 	#ifdef RLV_ADVANCED_MENU
-		if (rlv_handler_t::isEnabled())
+		sub_menu = new LLMenuGL("RLVa Embedded");
-		{
+		init_debug_rlva_menu(sub_menu);
-			sub_menu = new LLMenuGL("RLVa");
+		menu->addChild(sub_menu);
-			sub_menu->setCanTearOff(TRUE);
+		// Top Level Menu as well
-			init_debug_rlva_menu(sub_menu);
+		sub_menu = new LLMenuGL("RLVa Main");
-			menu->addChild(sub_menu);
+		init_debug_rlva_menu(sub_menu);
-			sub_menu->setVisible(rlv_handler_t::isEnabled());
+		gMenuBarView->addChild(sub_menu);
-			sub_menu->setEnabled(rlv_handler_t::isEnabled());
-		}
 	#endif // RLV_ADVANCED_MENU
 // [/RLVa:KB]
 
@@ -1223,7 +1222,7 @@ void init_client_menu(LLMenuGL* menu)
 										&menu_check_control,
 										(void*)"SaveMinidump"));
 
-	menu->addChild(new LLMenuItemCallGL("Debug Settings...", LLFloaterSettingsDebug::show, NULL, NULL));
+	menu->addChild(new LLMenuItemCallGL("Debug Settings...", handle_singleton_toggle<LLFloaterSettingsDebug>, NULL, NULL));
 	menu->addChild(new LLMenuItemCheckGL("View Admin Options", &handle_admin_override_toggle, NULL, &check_admin_override, NULL, 'V', MASK_CONTROL | MASK_ALT));
 
 	menu->addChild(new LLMenuItemCallGL("Request Admin Status", 
@@ -1697,6 +1696,9 @@ void init_debug_avatar_menu(LLMenuGL* menu)
 // [RLVa:KB] - Checked: 2009-11-17 (RLVa-1.1.0d) | Modified: RLVa-1.1.0d | OK
 void init_debug_rlva_menu(LLMenuGL* menu)
 {
+	menu->setLabel(std::string("RLVa")); // Same menu, same label
+	menu->setCanTearOff(true);
+
 	// Debug options
 	{
 		LLMenuGL* pDbgMenu = new LLMenuGL("Debug");
@@ -2062,7 +2064,8 @@ class LLViewCommunicate : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
+		static LLCachedControl<bool> only_comm("CommunicateSpecificShortcut");
+		if (!only_comm && LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
 		{
 			LLFloaterMyFriends::toggleInstance();
 		}

indra/newview/llviewermessage.cpp

@@ -2011,7 +2011,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	// </edit>
 
 	BOOL is_busy = gAgent.getBusy();
-	BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat);
+	BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat)
+		// object IMs contain sender object id in session_id (STORM-1209)
+		|| dialog == IM_FROM_TASK && LLMuteList::getInstance()->isMuted(session_id);
 	BOOL is_linden = LLMuteList::getInstance()->isLinden(name);
 	BOOL is_owned_by_me = FALSE;
 
@@ -2509,7 +2511,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				info->mFolderID = gInventory.findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(info->mType));
 				std::string from_name;
 
-				from_name += "A group member named ";
+				from_name += LLTrans::getString("AGroupMemberNamed") + " ";
 				from_name += name;
 
 				info->mFromName = from_name;

indra/newview/rlvcommon.cpp

@@ -129,6 +129,8 @@ void RlvSettings::initClass()
 		if (gSavedSettings.controlExists(RLV_SETTING_AVATAROFFSET_Z))
 			gSavedSettings.getControl(RLV_SETTING_AVATAROFFSET_Z)->getSignal()->connect(boost::bind(&onChangedAvatarOffset, _2));
 
+		if (gSavedSettings.controlExists(RLV_SETTING_TOPLEVELMENU))
+			gSavedSettings.getControl(RLV_SETTING_TOPLEVELMENU)->getSignal()->connect(boost::bind(&onChangedMenuLevel));
 		fInitialized = true;
 	}
 }
@@ -155,6 +157,14 @@ bool RlvSettings::onChangedAvatarOffset(const LLSD& sdValue)
 	gAgent.sendAgentSetAppearance();
 	return true;
 }
+// Checked: 2011-08-16 (RLVa-1.4.0b) | Added: RLVa-1.4.0b
+bool RlvSettings::onChangedMenuLevel()
+{
+	rlvMenuToggleVisible();
+	return true;
+}
+
+// Checked: 2010-02-27 (RLVa-1.2.0a) | Added: RLVa-1.1.0i
 bool RlvSettings::onChangedSettingBOOL(const LLSD& sdValue, bool* pfSetting)
 {
 	if (pfSetting)
@@ -526,6 +536,36 @@ void rlvMenuToggleEnabled(void*)
 	return;
 }
 
+// Checked: 2011-08-16 (RLVa-1.4.0b) | Added: RLVa-1.4.0b
+void rlvMenuToggleVisible()
+{
+	bool fTopLevel = rlvGetSetting(RLV_SETTING_TOPLEVELMENU, true);
+	bool fRlvEnabled = rlv_handler_t::isEnabled();
+
+	//LLMenuGL* pRLVaMenuMain = gMenuBarView->getChildMenuByName("RLVa Main", FALSE);
+	// RELEASE-RLVa: LL defines CLIENT_MENU_NAME but we can't get to it from here so we need to keep those two in sync manually
+	LLMenuGL* pAdvancedMenu = gMenuBarView->getChildMenuByName("Advanced", FALSE);
+	//LLMenuGL* pRLVaMenuEmbed = pAdvancedMenu->getChildMenuByName("RLVa Embedded", FALSE);
+
+	gMenuBarView->setItemVisible("RLVa Main", (fRlvEnabled) && (fTopLevel));
+	if (!pAdvancedMenu) return;
+	pAdvancedMenu->setItemVisible("RLVa Embedded", (fRlvEnabled) && (!fTopLevel));
+
+	/* Singu Note: In the future when we have advanced menu in xml, we will want to use this to move the menu.
+	if ( (rlv_handler_t::isEnabled()) && (pRLVaMenuMain) && (pRLVaMenuEmbed) &&
+		 ( ((fTopLevel) && (1 == pRLVaMenuMain->getItemCount())) || ((!fTopLevel) && (1 == pRLVaMenuEmbed->getItemCount())) ) )
+	{
+		LLMenuGL* pMenuFrom = (fTopLevel) ? pRLVaMenuEmbed : pRLVaMenuMain;
+		LLMenuGL* pMenuTo = (fTopLevel) ? pRLVaMenuMain : pRLVaMenuEmbed;
+		while (LLMenuItemGL* pItem = pMenuFrom->getItem(1))
+		{
+			pMenuFrom->removeChild(pItem);
+			pMenuTo->addChild(pItem);
+			pItem->updateBranchParent(pMenuTo);
+		}
+	}*/
+}
+
 bool RlvEnableIfNot::handleEvent(LLPointer<LLEvent>, const LLSD& userdata)
 {
 	bool fEnable = true;

indra/newview/rlvcommon.h

@@ -198,7 +198,7 @@ typedef bool (RlvCommandHandler::*rlvCommandHandler)(const RlvCommand& rlvCmd, E
 
 BOOL rlvMenuCheckEnabled(void*);
 void rlvMenuToggleEnabled(void*);
-//void rlvMenuToggleVisible(void*);
+void rlvMenuToggleVisible();
 //bool rlvMenuEnableIfNot(const LLSD& sdParam);
 class RlvEnableIfNot : public LLMemberListener<LLView>
 {

indra/newview/rlvhandler.cpp

@@ -1054,14 +1054,6 @@ BOOL RlvHandler::setEnabled(BOOL fEnable)
 		RlvUIEnabler::getInstance();
 	}
 
-	// RELEASE-RLVa: LL defines CLIENT_MENU_NAME but we can't get to it from here so we need to keep those two in sync manually
-	LLMenuGL* pClientMenu = NULL;
-	if ( (gMenuBarView) && ((pClientMenu = gMenuBarView->getChildMenuByName("Advanced", FALSE)) != NULL) )
-	{
-		pClientMenu->setItemVisible("RLVa", m_fEnabled);
-		pClientMenu->setItemEnabled("RLVa", m_fEnabled);
-	}
-
 	return m_fEnabled;		// Return enabled/disabled state
 }
 

indra/newview/skins/default/xui/en-us/floater_chat_history_barless.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="true" can_tear_off="true" enabled="true" height="275" left="15"
+     min_height="150" min_width="425" name="chat floater" rect_control="FloaterChatBarlessRect" title="Local Chat" width="435">
+	<string name="ringing">Connecting to in-world Voice Chat...</string>
+	<string name="connected">Connected</string>
+	<string name="unavailable">Voice not available at your current location</string>
+	<string name="hang_up">Disconnected from in-world Voice Chat</string>
+	<string name="voice_icon">icn_voice-localchat.tga</string>
+	<string name="IM_logging_string">-- Instant message logging enabled --</string>
+	<string name="IM_end_log_string">-- End of Log --</string>
+	<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
+	<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
+	<string name="ScriptTakeMoney">Take in-world money ([CURRENCY]) from you</string>
+	<string name="ActOnControlInputs">Act on your control inputs</string>
+	<string name="RemapControlInputs">Remap your control inputs</string>
+	<string name="AnimateYourAvatar">Animate your avatar</string>
+	<string name="AttachToYourAvatar">Attach to your avatar</string>
+	<string name="ReleaseOwnership">Release ownership and become public</string>
+	<string name="LinkAndDelink">Link and delink from other objects</string>
+	<string name="AddAndRemoveJoints">Add and remove joints with other objects</string>
+	<string name="ChangePermissions">Change its permissions</string>
+	<string name="TrackYourCamera">Track your camera</string>
+	<string name="TeleportYourAgent">Teleport you</string>
+	<string name="ControlYourCamera">Control your camera</string>
+	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="260" left="0" orientation="horizontal" width="430" name="panels">
+		<layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0" min_width="275" name="im_contents_panel" width="305">
+			<combo_box follows="left|top" height="18" label="Gestures" left="6" name="Gesture" width="120">
+				<combo_item name="Gestures">Gestures</combo_item>
+			</combo_box>
+			<check_box bottom_delta="-2" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Show Muted Text" 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 bottom_delta="2" left_delta="120" follows="left|top" font="SansSerifSmall" height="20" width="100" label="Open History" name="chat_history_open" tool_tip="Click here to open chat history in external editor."/>
+			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn" right="305" tool_tip="Click here to show a list of active participants in this IM session." width="80"/>
+			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="5" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="104" left="5" max_length="2147483647" name="Chat History Editor" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
+			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="5" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="104" max_length="2147483647" name="Chat History Editor with mute" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
+			<panel bottom="0" left="0" name="chat_panel" height="0" width="0" visible="false">
+				<string name="gesture_label">Gestures</string>
+			</panel>
+		</layout_panel>
+		<layout_panel auto_resize="false" bottom="0" can_resize="true" filename="panel_speaker_controls.xml" height="120" left="0" min_width="140" name="active_speakers_panel" top_delta="0" visible="false" width="140"/>
+	</layout_stack>
+</floater>

indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc_concisebuttons.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="true" bottom="-298" can_close="true" can_minimize="false" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="297" label="(unknown)" left="1" min_height="100" min_width="300" name="im_floater" rect_control="" title="(unknown)" width="501">
+	<string name="ringing">Joining Voice Chat...</string>
+	<string name="connected">Connected, click End Call to hang up</string>
+	<string name="hang_up">Left Voice Chat</string>
+	<string name="voice_icon">icn_voice-groupfocus.tga</string>
+	<string name="title_string">Instant Message with [NAME]</string>
+	<string name="typing_start_string">[NAME] is typing...</string>
+	<string name="session_start_string">Starting session with [NAME], please wait.</string>
+	<string name="default_text_label">Click here to instant message.</string>
+	<button bottom="-20" follows="right|top" height="20" label="History" right="-165" name="history_btn" width="80"/>
+	<button bottom_delta="0" enabled="false" follows="right|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="80" name="start_call_btn" width="80"/>
+	<button bottom_delta="0" follows="right|top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" visible="false" width="80"/>
+	<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="420" name="toggle_active_speakers_btn" right="450" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
+	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="280" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
+		<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="295" left="0" min_width="115" name="im_contents_panel" width="495">
+			<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="260" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right|bottom" font="SansSerif" handle_edit_keys_directly="false" height="20" label="Click here to instant message" left="5" max_length="1022" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="425" spell_check="true"/>
+			<button bottom_delta="0" enabled="true" follows="right|bottom" height="20" label="Send" left="435" name="send_btn" scale_image="true" width="60"/>
+		</layout_panel>
+		<layout_panel auto_resize="false" bottom="0" can_resize="true" filename="panel_speaker_controls.xml" height="120" left="0" min_width="140" name="active_speakers_panel" top_delta="0" visible="false" width="140"/>
+	</layout_stack>
+	<string name="live_help_dialog">*** Welcome to Help Request ***
+Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/
+If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
+-=-=- Response times will vary, especially during peak times -=-=-</string>
+</floater>

indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="true" bottom="-298" can_close="true" can_resize="true" default_tab_group="1" follows="left|top|right|bottom" height="297" label="(unknown)" left="1" min_height="105" min_width="425" name="im_floater" rect_control="" title="(unknown)" width="501">
+	<string name="answering">Connecting...</string>
+	<string name="ringing">Calling...</string>
+	<string name="connected">Connected, click End Call to hang up</string>
+	<string name="hang_up">Call ended</string>
+	<string name="voice_icon">icn_voice-pvtfocus.tga</string>
+	<string name="title_string">Instant Message with [NAME]</string>
+	<string name="typing_start_string">[NAME] is typing...</string>
+	<string name="session_start_string">Starting session with [NAME], please wait.</string>
+	<string name="default_text_label">Click here to instant message.</string>
+	<string name="unavailable_text_label">Text chat is not available for this call.</string>
+	<string name="inventory_item_offered">Inventory item offered</string>
+	<button bottom="-20" follows="right|top" height="20" label="Profile" left="135" name="profile_callee_btn" width="60"/>
+	<button bottom="-20" follows="right|top" halign="center" height="20" label="History" left_delta="60" name="history_btn" visible="true" width="60"/>
+	<button bottom="-20" follows="right|top" height="20" label="Teleport" left_delta="60" name="profile_tele_btn" width="70"/>
+	<check_box bottom="-20" follows="right|top" height="20" left_delta="70" name="rp_mode">RP Mode</check_box>
+	<button bottom="-20" follows="right|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="67" name="start_call_btn" width="60"/>
+	<button bottom="-20" follows="right|top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" scale_image="true" label="End" name="end_call_btn" width="24"/>
+	<panel mouse_opaque="false" border="false" bottom="-20" follows="right|top" height="20" left_delta="16" name="speaker_controls" width="60">
+		<volume_slider bottom="0" follows="bottom" height="20" increment="0.05" initial_val="0.5" max_val="1.0" min_val="0.0" name="speaker_volume" width="48"/>
+		<button bottom="0" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="true" label="" left_delta="42" name="mute_btn" tool_tip="Mute voice" width="25"/>
+	</panel>
+	<text_editor bottom="28" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" height="245" left="5" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="488" word_wrap="true"/>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right" font="SansSerif" height="20" label="Click here to instant message" max_length="2147483647" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="423" spell_check="true"/>
+	<button bottom="5" follows="right|bottom" height="20" label="Send" left="433" name="send_btn" scale_image="true" width="60"/>
+	<string name="live_help_dialog">*** Welcome to Help Request ***
+Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/
+If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
+-=-=- Response times will vary, especially during peak times -=-=-</string>
+</floater>

indra/newview/skins/default/xui/en-us/floater_instant_message_group_concisebuttons.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="true" bottom="-298" can_close="true" can_minimize="true" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="297" label="(unknown)" left="1" min_height="100" min_width="330" name="im_floater" rect_control="" title="(unknown)" width="501">
+	<string name="ringing">Joining Voice Chat...</string>
+	<string name="connected">Connected, click End Call to hang up</string>
+	<string name="hang_up">Left Voice Chat</string>
+	<string name="voice_icon">icn_voice-groupfocus.tga</string>
+	<string name="title_string">Instant Message with [NAME]</string>
+	<string name="typing_start_string">[NAME] is typing...</string>
+	<string name="session_start_string">Starting session with [NAME], please wait.</string>
+	<string name="default_text_label">Click here to instant message.</string>
+	<string name="moderated_chat_label">(Moderated: Voices off by default)</string>
+	<string name="muted_text_label">Your text chat has been disabled by a Group Moderator.</string>
+	<button bottom="-20" follows="right|top" height="20" label="Group Info" right="-245" name="group_info_btn" tab_group="0" width="80"/>
+	<button bottom_delta="0" follows="right|top" height="20" label="History" left_delta="80" name="history_btn" width="80"/>
+	<button bottom_delta="0" enabled="false" follows="right|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Join Call" left_delta="80" name="start_call_btn" width="80"/>
+	<button bottom_delta="0" follows="right|top" halign="right" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" pad_right="12" visible="false" width="80"/>
+	<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="420" name="toggle_active_speakers_btn" right="450" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
+	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="280" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
+		<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="295" left="0" min_width="115" name="im_contents_panel" width="495">
+			<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="260" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right|bottom" font="SansSerif" height="20" left="5" max_length="1022" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="425" spell_check="true"/>
+			<button bottom="5" enabled="true" follows="right|bottom" height="20" label="Send" left="435" name="send_btn" scale_image="true" width="60"/>
+		</layout_panel>
+		<layout_panel auto_resize="false" bottom="0" can_resize="true" filename="panel_speaker_controls.xml" height="120" left="0" min_width="140" name="active_speakers_panel" top_delta="0" visible="false" width="140"/>
+	</layout_stack>
+	<string name="live_help_dialog">*** Welcome to Help Request ***
+Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/
+If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
+-=-=- Response times will vary, especially during peak times -=-=-</string>
+</floater>

indra/newview/skins/default/xui/en-us/floater_inventory.xml

@@ -11,8 +11,10 @@
    <button left="28" bottom_delta="0" height="22" width="22" follows="left|top" halign="center"
     label="" image_overlay="inv_expand_all.tga" name="Inventory.ExpandAll" mouse_opaque="true" font="SansSerif"
     tool_tip="Expand All"/>
+   <button left="50" bottom_delta="0" height="22" width="22" follows="left|top" label="" scale_image="true"
+    image_selected="UIImgBtnClosePressedUUID" image_unselected="UIImgBtnCloseActiveUUID" name="Inventory.ResetAll" tool_tip="Reset inventory: clear filters and collapse all folders."/>
  <text name="group_titles_textbox" halign="right" font="SansSerifSmall" follows="left|top"
-		height="16" left="43" bottom_delta="2" right="108">Quick Filter:</text>
+    height="16" left="43" bottom_delta="2" right="108">Type:</text>
 	<!-- Inventory Type Filter Labels -->
 	<string name="filter_type_all">All Types</string>
 	<string name="filter_type_animation">Animations</string>
@@ -27,7 +29,7 @@
 	<string name="filter_type_texture">Textures</string>
 	<string name="filter_type_snapshot">Snapshots</string>
 	<string name="filter_type_custom">Custom...</string>
-	<combo_box name="Quick Filter" label="Quick Filter" follows="left|top|right" height="20" left="110" right="-6" bottom_delta="0">
+	<combo_box name="Quick Filter" tool_tip="Filter by type" follows="left|top|right" height="20" left="110" right="-6" bottom_delta="0">
 		<combo_item name="filter_type_all">All Types</combo_item>
 		<separator />
 		<combo_item name="filter_type_animation">Animations</combo_item>

indra/newview/skins/default/xui/en-us/floater_my_friends_horiz.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="false" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" can_tear_off="true" height="390" min_height="205"
+     min_width="275" name="floater_my_friends"
+     rect_control="FloaterContactsHorizRect" title="Contacts" width="395">
+	<tab_container bottom="6" follows="left|right|top|bottom" height="364" left="4"
+	     name="friends_and_groups" tab_position="top" tab_min_width="0" width="383">
+		<panel bottom="0" filename="panel_friends_horiz.xml" label="Friends" left="0" name="friends_panel" width="370" />
+		<panel bottom="0" filename="panel_groups_horiz.xml" label="Groups" left="0" name="groups_panel" width="370" />
+	</tab_container>
+</floater>

indra/newview/skins/default/xui/en-us/floater_settings_debug.xml

@@ -1,31 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="215" name="settings_debug"
+     can_resize="true" height="220" name="settings_debug" min_height="220" min_width="285"
-     title="Debug Settings" width="350">
+     title="Debug Settings" width="300" rect_control="FloaterDebugSettingsRect">
-	<combo_box allow_text_entry="true" bottom="-50" follows="top|left" font="SansSerifSmall"
+    <search_editor bottom="-40" follows="top|left|right" height="20" label="Search" left="10" right="-10" max_chars="255" name="search_settings_input" tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the setting's name or comment."/>
-	     height="20" left="15" max_chars="255" name="settings_combo" />
+	<scroll_list height="20" bottom_delta="-24" follows="all" left="10" right="-10" name="settings_scroll_list" />
-	<text_editor bottom_delta="-75" enabled="false" height="60" width="320" hide_scrollbar="true"
+	<text_editor follows="left|right" bottom_delta="-64" enabled="false" height="60" width="320" left="10" right="-10" hide_scrollbar="true"
 	     name="comment_text" word_wrap="true" />
-	<combo_box bottom_delta="-30" follows="top|left" font="SansSerifSmall" height="20"
+	<radio_group bottom_delta="-48" draw_border="false" follows="bottom|left|right" height="36"
 	     left="15" name="boolean_combo" visible="false">
-		<combo_item name="TRUE" value="true">
+		<radio_item bottom="-18" height="15" name="TRUE" value="true">
-			TRUE
+			True
-		</combo_item>
+		</radio_item>
-		<combo_item name="FALSE" value="">
+		<radio_item bottom="-36" height="15" name="FALSE" value="">
-			FALSE
+			False
-		</combo_item>
+		</radio_item>
-	</combo_box>
+	</radio_group>
-	<line_editor bottom_delta="0" height="20" name="val_text" visible="false" width="300" />
+	<line_editor follows="bottom|left|right" bottom="52" left="15" right="-15" height="20" name="val_text" visible="false" width="300" />
 	<color_swatch bottom="30" can_apply_immediately="true" height="55" label="Color"
-	     name="color_swatch" visible="true" width="37" />
+	     name="val_color_swatch" visible="false" width="37" />
-	<spinner bottom_delta="25" height="20" label="x" label_width="40" max_val="10000000"
+	<spinner bottom_delta="31" height="24" label="x" label_width="40" max_val="10000000"
 	     name="val_spinner_1" visible="false" width="120" />
-	<spinner bottom_delta="0" height="20" label="x" label_width="40" left_delta="135"
+	<spinner bottom_delta="0" height="24" label="x" label_width="40" left_delta="135"
 	     max_val="10000000" name="val_spinner_2" visible="false" width="120" />
-	<spinner bottom_delta="-20" height="20" label="x" label_width="40" left="15"
+	<spinner bottom_delta="-23" height="24" label="x" label_width="40" left="15"
 	     max_val="10000000" name="val_spinner_3" visible="false" width="120" />
-	<spinner bottom_delta="0" height="20" label="x" label_width="40" left_delta="135"
+	<spinner bottom_delta="0" height="24" label="x" label_width="40" left_delta="135"
 	     max_val="10000000" name="val_spinner_4" visible="false" width="120" />
-	<button bottom="5" height="20" label="Reset to default" left="15" name="default_btn"
+	<button bottom="10" height="20" label="Copy Name" left="10" name="copy_btn" tool_tip="Copy the name of this setting."
-	     width="150" />
+	     width="130" />
+	<button follows="right" bottom_delta="0" height="20" label="Reset to default" right="-10" name="default_btn"
+	     width="130" />
 </floater>

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" />

indra/newview/skins/default/xui/en-us/menu_viewer.xml

@@ -577,7 +577,7 @@
 			<on_enable function="World.EnableBuyLand" />
 		</menu_item_call>
 		<menu_item_call bottom="-308" enabled="true" height="19" label="Region/Estate..." left="0"
-		     mouse_opaque="true" name="Region/Estate..." width="185">
+		     mouse_opaque="true" name="Region/Estate..." shortcut="alt|R" width="185">
 			<on_click function="ShowFloater" userdata="about region" />
 		</menu_item_call>
 		<menu_item_separator bottom="-316" enabled="true" height="8" label="-----------" left="0"

indra/newview/skins/default/xui/en-us/notifications.xml

@@ -7591,4 +7591,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>

indra/newview/skins/default/xui/en-us/panel_friends_horiz.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" name="friends">
+	<string name="Multiple">Multiple friends...</string>
+	<scroll_list bottom="70" can_resize="true" column_padding="0" draw_heading="true" follows="left|top|bottom|right" left="5" multi_select="true"
+	    name="friend_list" right="-5" search_column="1" tool_tip="Hold shift or control while clicking to select multiple friends" top="-40">
+		<column image="ff_online_status_button.tga" name="icon_online_status" tool_tip="Online status" width="20"/>
+		<column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name"/>
+		<column image="ff_visible_online_button.tga" name="icon_visible_online" tool_tip="Friend can see when you're online" width="20"/>
+		<column image="ff_visible_map_button.tga" name="icon_visible_map" tool_tip="Friend can locate you on the map" width="20"/>
+		<column image="ff_edit_mine_button.tga" name="icon_edit_mine" tool_tip="Friend can edit, delete or take objects" width="20"/>
+		<column image="ff_visible_online_button.tga" name="icon_visible_online_theirs" tool_tip="You can see when they are online (only updates on login)" width="20"/>
+		<column image="ff_visible_map_button.tga" name="icon_visible_map_theirs" tool_tip="You can locate them on the map" width="20"/>
+		<column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" tool_tip="You can edit this friend's objects" width="20"/>
+		<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 bottom_delta="-100" enabled="true" follows="left|top" font="SansSerif" height="18" name="buddy_search_lineedit" label="Contact Search" tool_tip="The friend name you want to search for" width="160"/>
+	<button bottom_delta="0" follows="top|right" height="22" label="0" left="-25" name="expand_collapse_btn" tool_tip="Expand/Collapse extra info" width="22"/>
+	<!--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 bottom="38" left="12" follows="left|bottom" height="32" name="friends" width="95">Online:</text>
+	<text bottom_delta="0" left_delta="60" follows="left|bottom" height="32" name="f_num" width="95">0000</text>
+	<text bottom_delta="0" left_delta="44" follows="left|bottom" height="32" name="sel" width="95">|       Selected:</text>
+	<text bottom_delta="0" left_delta="100" follows="left|bottom" height="32" name="s_num" width="95">0000</text>
+	<button bottom_delta="-8" left="5" follows="left|bottom" height="22" label="IM/Call" name="im_btn" tool_tip="Open Instant Message session" width="80"/>
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" height="22" label="Profile" name="profile_btn" tool_tip="Show picture, groups, and other information" width="80"/>
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" height="22" label="Teleport..." name="offer_teleport_btn" tool_tip="Offer this friend a teleport to your current location" width="80" />
+	<button bottom_delta="-24" left="5" follows="left|bottom" height="22" label="Pay..." name="pay_btn" tool_tip="Give in-world money ([CURRENCY]) to this friend" width="80"/>
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" height="22" label="Remove..." name="remove_btn" tool_tip="Remove this person from your friends list" width="80"/>
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" height="22" label="Add..." name="add_btn" tool_tip="Offer friendship to a resident" width="80"/>
+</panel>

indra/newview/skins/default/xui/en-us/panel_groups_horiz.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-371" height="300" left="280" mouse_opaque="true"
+     name="groups" width="350">
+	<scroll_list background_visible="true" bottom="109" column_padding="0" draw_border="true"
+	     draw_heading="true" draw_stripes="true" enabled="true"
+	     follows="left|top|right|bottom" left="5" mouse_opaque="true"
+	     multi_select="false" name="group list" tab_stop="true" top="-10"
+	     width="340">
+		<column dynamicwidth="true" label="Name" name="name" tool_tip="Name" />
+    <!--<column label="Active" name="is_active_group"
+		    tool_tip="Group is set as active" width="40" />-->
+    <column image_overlay="ff_visible_online.tga" name="is_listed_group"
+		    tool_tip="Group is visible in profile." width="20" />
+    <column image_overlay="icn_chat_overlay.tga" name="is_chattable_group"
+		    tool_tip="Receive group chat" width="20" />
+    <column image_overlay="smicon_warn.tga" name="is_notice_group"
+        tool_tip="Receive group notices" width="20" />
+	</scroll_list>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="groupdesc" v_pad="0" width="280">
+		Your currently active group is displayed in italics.
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-13" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="groupcount" v_pad="0" width="280">
+		You belong to [COUNT] groups (of [MAX] maximum).
+	</text>
+	<button bottom_delta="-24" follows="left|bottom" font="SansSerif" height="22"
+	     label="IM/Call" left="5" name="IM"
+	     tool_tip="Open Instant Message session" width="80" />
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
+	     label="Info" name="Info" width="80" />
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
+	     label="Activate" name="Activate" width="80" />
+	<button bottom_delta="-24" left="5" follows="left|bottom" font="SansSerif" height="22"
+	     label="Leave" name="Leave" width="80" />
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
+	     label="Create..." name="Create" width="80" />
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
+	     label="Search..." name="Search..." width="80" />
+	<button bottom_delta="-24" left="5" follows="left|bottom" font="SansSerif" height="22"
+	     label="Invite..." name="Invite..." width="80" />
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
+	     label="Titles..." name="Titles..." width="80" />
+  <string name="none">
+		none
+  </string>
+</panel>

indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml

@@ -4,13 +4,14 @@
 
     <panel border="true" left="1" bottom="-408" height="408" width="500" label="Chat/IM" name="Chat/IM">
       <text bottom="-15" left="15" name="objects_link_text_box">IMs:</text>
-      <check_box bottom_delta="-25" left="10" follows="top" initial_value="false" control_name="WoLfVerticalIMTabs" 
+      <check_box bottom_delta="-25" left="10" follows="left|top" initial_value="false" control_name="AscentInstantMessageAnnounceIncoming"
-        label="Use Vertical IMs (Requires a restart)" name="use_vertical_ims_check"/>
-      <check_box bottom_delta="-20" follows="top" control_name="OtherChatsTornOff" label="Open new IMs in separate floaters" name="chats_torn_off"/>
-      <check_box bottom_delta="-20" follows="left|top" initial_value="false" control_name="AscentInstantMessageAnnounceIncoming"
         label="Announce incoming instant messages" tool_tip="Opens an IM window when someone starts typing an IM to you. This gives you a heads up that someone is IMing you before they hit enter." name="quickstart_im_check"/>
       <check_box bottom_delta="-20" follows="left|top" control_name="AscentHideTypingNotification" initial_value="false"
         label="Don't send '[name] is typing...' in IMs" tool_tip="IM partners will not see '______ is typing...' when you're responding." name="hide_typing_check"/>
+      <check_box bottom_delta="-20" follows="left|top" control_name="AscentAllowMUpose" initial_value="false"
+        label="Allow MU pose method." tool_tip="Allows the use of both /me and : to perform emotes." name="allow_mu_pose_check"/>
+      <check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
+        label="Auto-close OOC comments." tool_tip="Will automatically append '))' to any message starting with '((', or visa versa." name="close_ooc_check"/>
 	  <!-- Left/Right Column split  
 		 <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
 		left="235" name="CmdDivisor" width="0"/>
@@ -22,11 +23,7 @@
         label="Do not echo/log notifications in chat" name="hide_notifications_in_chat_check"/>
       <check_box bottom_delta="-20" follows="left|top" control_name="OptionShowGroupNameInChatIM" initial_value="false"
         label="Show group name in chat" tool_tip="The name of the group will also be displayed if the IM is from group chat." name="append_group_name_check"/>
-      <check_box bottom="-120" left="10" control_name="AscentAllowMUpose" initial_value="false"
+      <text bottom="-150" left="10" follows="left|top" name="objects_link_text_box3">Show links on chatting object names in chat history for:</text>
-        label="Allow MU pose method." tool_tip="Allows the use of both /me and : to perform emotes." name="allow_mu_pose_check"/>
-      <check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
-        label="Auto-close OOC comments." tool_tip="Will automatically append '))' to any message starting with '((', or visa versa." name="close_ooc_check"/>
-      <text bottom_delta="-15" follows="left|top" name="objects_link_text_box3">Show links on chatting object names in chat history for:</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">No object</radio_item>
@@ -61,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,
@@ -69,6 +66,18 @@
       </text>
     </panel>
 
+    <panel border="true" bottom="-580" height="525" label="Chat UI" left="1" name="ChatUI" width="418">
+      <check_box bottom_delta="-25" left="10" follows="top" initial_value="false" control_name="WoLfVerticalIMTabs"
+        label="Use Vertical IMs (Requires a restart)" name="use_vertical_ims_check"/>
+      <check_box bottom_delta="-20" follows="top" control_name="OtherChatsTornOff" label="Open new IMs in separate floaters" name="chats_torn_off"/>
+      <check_box bottom_delta="-20" follows="left|top" control_name="ShowLocalChatFloaterBar" label="Show local chat bar in floater (Needs restart)" tool_tip="Whether or not to display the input bar at the bottom of the local chat floater." name="show_local_chat_floater_bar"/>
+      <check_box bottom_delta="-20" control_name="ContactsUseHorizontalButtons" follows="top" height="16" label="Use horizontal buttons for contacts floater (Needs restart)" tool_tip="When enabled, the buttons on the Friends and Groups panels will be at the bottom, horizontally arranged, instead of vertically arranged on the right." name="horiz_butt"/>	  
+      <check_box bottom_delta="-20" control_name="UseConciseIMButtons" follows="top" height="16" label="Buttons on the same line as name for IMs (Affects new IMs)" name="im_concise_butt"/>
+      <check_box bottom_delta="-20" control_name="UseConciseGroupChatButtons" follows="top" height="16" label="Buttons on group chat name line (Affects new group chats)" name="group_concise_butt"/>
+      <check_box bottom_delta="-20" control_name="UseConciseConferenceButtons" follows="top" height="16" label="Buttons on conference title line (Affects new conferences)" name="conf_concise_butt"/>
+      <check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Disallow communicate shortcut opening detached friends list" control_name="CommunicateSpecificShortcut" name="only_comm"/>
+    </panel>
+
     <panel border="true" left="1" bottom="-408" height="408" width="500" label="Spam" name="Spam">
       <check_box control_name="AntiSpamEnabled" label="Enable Antispam" name="enable_as" width="256" left="3"/>
       <button height="23" label="Reset antispam queues" label_selected="Reset antispam queues" name="reset_antispam" width="230" bottom_delta="0" left="260"/>

indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml

@@ -42,11 +42,13 @@
       <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 of Estate Managers"/>
       <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 of Lindens"/>
       <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="Muted" left_delta="54" name="muted_color_swatch" width="44" tool_tip="Color of Muted"/>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.375 1 1 1" control_name="MoyMiniMapCustomColor" follows="top" height="47" label="Custom (Minimap)" left_delta="54" name="custom_color_swatch" width="44" tool_tip="Color of users picked out on the minimap only"/>
       <text bottom_delta="-9" follows="top" height="10" left="20" name="chat_color_text">Use colors for chat:</text>
       <check_box bottom_delta="-7" control_name="ColorFriendChat" follows="top" height="20" label="" left_delta="150" name="color_friend_check" width="44" tool_tip="Color Friend Chat"/>
       <check_box bottom_delta="0" control_name="ColorEstateOwnerChat" follows="top" height="20" label="" left_delta="54" name="color_estate_owner_check" width="44" tool_tip="Color Estate Managers Chat"/>
       <check_box bottom_delta="0" control_name="ColorLindenChat" follows="top" height="20" label="" left_delta="54" name="color_linden_check" width="44" tool_tip="Color Linden Chat"/>
       <check_box bottom_delta="0" control_name="ColorMutedChat" follows="top" height="20" label="" left_delta="54" name="color_muted_check" width="44" tool_tip="Color Muted Chat"/>
+      <!--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 border="true" left="1" bottom="-190" height="180" width="500" label="Body Dynamics" name="Body Dynamics">
       <check_box bottom_delta="-25" follows="top" height="16" label="Enable enhanced physics on avatar breasts" left="10" name="EmBreastsToggle" control_name="EmeraldBreastPhysicsToggle" tool_tip="You must hit apply before these controls will activate or deactivate"/>

indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml

@@ -24,7 +24,7 @@
 	<text bottom_delta="6" follows="left|top" height="10" left="405" name="text_box5">(# lines)</text>
 	<slider bottom_delta="-25" control_name="ConsoleBackgroundOpacity" follows="top" height="12" increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1" min_val="0" name="console_opacity" value="0.4" width="200"/>
 	<check_box bottom_delta="-25" control_name="ChatFullWidth" follows="top" height="16" initial_value="false" label="Use full screen width (Requires restart)" name="chat_full_width_check"/>
-	<text bottom_delta="-22" height="10" left="12"	     mouse_opaque="false" name="text_box6" v_pad="0" width="135">Chat Options:</text>
+	<text bottom_delta="-12" height="10" left="12"	     mouse_opaque="false" name="text_box6" v_pad="0" width="135">Chat Options:</text>
 	<check_box bottom_delta="-8"  follows="top" height="16" initial_value="false" label="Close chat bar after hitting return" left="148" name="close_chat_on_return_check"/>
 	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Arrow keys always move avatar when chatting" name="arrow_keys_move_avatar_check"/>
 	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Show timestamps in Local Chat" name="show_timestamps_check"/>

indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml

@@ -9,7 +9,7 @@
 			</combo_box>
 		</layout_panel>
 		<layout_panel auto_resize="true" bottom="0" can_resize="false" height="120" min_height="100" name="moderate_chat_panel" top_delta="0" user_resize="false" visible="true" width="140">
-			<scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" draw_stripes="false" follows="left|top|bottom|right" left="0" multi_select="false" name="speakers_list" right="140" search_column="1" sort_column="2" top="120">
+			<scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" draw_stripes="false" follows="left|top|bottom|right" left="0" multi_select="false" name="speakers_list" right="140" search_column="1" sort_column="2" top="113">
 				<column name="icon_speaking_status" sort="speaking_status" width="20"/>
 				<column dynamicwidth="true" label="Name" name="speaker_name"/>
 				<column label="" name="speaking_status" width="0"/>

indra/newview/skins/default/xui/en-us/strings.xml

@@ -290,6 +290,7 @@
 	<string name="RemapControlInputs">Remap your control inputs</string>
 	<string name="AnimateYourAvatar">Animate your avatar</string>
 	<string name="AttachToYourAvatar">Attach to your avatar</string>
+	<string name="AGroupMemberNamed">A group member named</string>
 	<string name="ReleaseOwnership">Release ownership and become public</string>
 	<string name="LinkAndDelink">Link and delink from other objects</string>
 	<string name="AddAndRemoveJoints">Add and remove joints with other objects</string>

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>

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>

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>

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>

indra/newview/skins/default/xui/es/floater_inventory.xml

@@ -3,8 +3,9 @@
 	<search_editor label="Escribe aquí para buscar" name="inventory search editor"/>
 	<button label="" name="collapse_btn" tool_tip="Cerrar Todo" />
 	<button label="" name="Inventory.ExpandAll" tool_tip="Expandir Todo"/>	  
+   <button name="Inventory.ResetAll" tool_tip="Cerrar Todo y Limpiar Filtros"/>
 	<text name="group_titles_textbox">
-		Filtro Rápido:
+		Tipos:
 	</text>
 	<!-- Inventory Type Filter Labels -->
 	<string name="filter_type_all">
@@ -46,7 +47,7 @@
 	<string name="filter_type_custom">
 		Personalizado...
 	</string>
-	<combo_box name="Quick Filter" label="Filtro Rápido">
+	<combo_box name="Quick Filter" tool_tip="Filtro Rápido">
 		<combo_item name="filter_type_all">
 			Todos los Tipos
 		</combo_item>

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>

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">
+<floater name="settings_debug" title="Configurar Depurador">
-	<combo_box name="settings_combo" />
+    <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."/>
-	<combo_box name="boolean_combo">
+
-		<combo_item name="TRUE">
+	<radio_group name="boolean_combo">
-			VERDADERO
+		<radio_item name="TRUE">
-		</combo_item>
+			Verdadero
-		<combo_item name="FALSE">
+		</radio_item>
-			FALSO
+		<radio_item name="FALSE">
-		</combo_item>
+			Falso
-	</combo_box>
+		</radio_item>
-	<color_swatch label="Color" name="color_swatch"/>
+	</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>

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>

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>

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>

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.

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>

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"/>
+			<check_box label="Permitir Método MU pose." tool_tip="Permite el uso de  /me y :  para enviar emotes." name="allow_mu_pose_check"/>
-			<text name="objects_link_text_box2">
+			<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="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"/>
-			<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_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"/>		

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"/>

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.

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>

indra/newview/skins/default/xui/fr/floater_chat_history.xml

@@ -71,7 +71,7 @@
 				</combo_item>
 			</combo_box>
 			<check_box label="Afficher le texte ignoré" name="show mutes"/>
-			<button label="Historique" name="chat_history_open" tool_tip="Cliquer ici pour ouvrir l'historique de la conversation."/>
+			<button left_delta="150" width="90" label="Historique" name="chat_history_open" tool_tip="Cliquer ici pour ouvrir l'historique de la conversation."/>
 
 			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Cliquez ici pour voir la liste des participants actifs dans cette session IM."/>
 			<panel name="chat_panel">

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>

indra/newview/skins/default/xui/fr/floater_inventory.xml

@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory" title="Inventaire">
 	<search_editor label="Saisir votre recherche ici" name="inventory search editor"/>
-  <button left="6" bottom_delta="-26" height="22" width="22" follows="left|top" halign="center"
+  <button name="collapse_btn" tool_tip="Collapse All" />
-    label="" image_overlay="inv_collapse_all.tga" name="collapse_btn" mouse_opaque="true" font="SansSerif"
+   <button name="Inventory.ExpandAll" tool_tip="Expand All"/>
-    tool_tip="Collapse All" />
+   <button name="Inventory.ResetAll" tool_tip="Réinitialisation de l'inventaire : Nettoye les filtres et réduit l'inventaire"/>
-   <button left="28" bottom_delta="0" height="22" width="22" follows="left|top" halign="center"
-    label="" image_overlay="inv_expand_all.tga" name="Inventory.ExpandAll" mouse_opaque="true" font="SansSerif"
-    tool_tip="Expand All"/>
- <text name="group_titles_textbox" halign="right" font="SansSerifSmall" follows="left|top"
-		height="16" left="43" bottom_delta="2" right="108">Filtre rapide</text>
 	<!-- Inventory Type Filter Labels -->
 	<string name="filter_type_all">TOUT</string>
 	<string name="filter_type_animation">Animations</string>
@@ -23,7 +18,7 @@
 	<string name="filter_type_texture">Textures</string>
 	<string name="filter_type_snapshot">Photos</string>
 	<string name="filter_type_custom">Personnalis&#xE9;</string>
-	<combo_box name="Quick Filter" label="Filtre Rapide" follows="left|top|right" height="20" left="110" right="-6" bottom_delta="0">
+	<combo_box name="Quick Filter" tool_tip="filtrer par genre">
 		<combo_item name="filter_type_all">TOUT</combo_item>
 		<separator />
 		<combo_item name="filter_type_animation">Animations</combo_item>
@@ -47,7 +42,6 @@
 	</tab_container>
 	<menu_bar name="Inventory Menu">
 		<menu label="Fichier" name="File">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
 			<menu_item_call label="Ouvrir" name="Open"/>
 			<menu_item_call label="Nouvelle fenêtre" name="New Window"/>
 			<menu_item_call label="Afficher les filtres" name="Show Filters"/>
@@ -57,7 +51,6 @@
 			<menu_item_call label="Rafraichir l'inventaire" name="Refresh Inventory"/>
 		</menu>
 		<menu label="Créer" name="Create">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
 			<menu_item_call label="Nouveau dossier" name="New Folder"/>
 			<menu_item_call label="Nouveau script" name="New Script"/>
 			<menu_item_call label="Nouvelle note" name="New Note"/>
@@ -79,9 +72,9 @@
 				<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
 				<menu_item_call label="Nouveaux yeux" name="New Eyes"/>
 			</menu>
+			<menu_item_call label="Nouvel ensemble" name="New Outfit"/>
 		</menu>
 		<menu label="Trier" name="Sort">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
 			<menu_item_check label="Par nom" name="By Name"/>
 			<menu_item_check label="Par date" name="By Date"/>
 			<menu_item_check label="Trier les dossiers par nom" name="Folders Always By Name"/>
@@ -93,7 +86,6 @@
 			<menu_item_check label="par créateur" name="Item creatorr"/>
 		</menu>
 		<menu label="Filters" name="Filters">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
 			<menu_item_check label="Modifier actuel" name="Modify Current"/>
 			<menu_item_call label="Réinitialiser actuel" name="Reset Current"/>
 		</menu>

indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml

@@ -1,23 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" width="585">
+<floater name="modal container" width="600">
-	<button label="Enregistrer" label_selected="Enregistrer" left="171" name="Save" width="100"/>
+	<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="Chaussettes" name="checkbox_socks"/>
 	<check_box label="Veste" name="checkbox_Jacket"/>
-	<check_box label="Gants" name="checkbox_Gloves"/>
+  <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<EFBFBD>ne" left="225" name="checkbox_Skull"/>
+	<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"/>
@@ -46,14 +48,16 @@
 	<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 <EFBFBD> droite" left="460" name="checkbox_Top Right"/>
+	<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 <EFBFBD> gauche" left="460" name="checkbox_Top Left"/>
+	<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 <EFBFBD> gauche" left="460" name="checkbox_Bottom Left"/>
+	<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 <EFBFBD> droite" left="460" name="checkbox_Bottom Right"/>
+	<check_box label="En bas à droite" left="460" name="checkbox_Bottom Right"/>
 	<text name="Make New Outfit">
 		Cr&#xE9;er un ensemble
 	</text>
@@ -65,22 +69,24 @@ Le bouton Cr&#xE9;er un ensemble vous permet de cr&#xE9;er un dossier et d'y sau
 des articles que vous portez maintenant.
 	</text>
 	<text name="Folder name:">
-		Nom du dossier:
+		Nom du dossier :
 	</text>
 	<text name="Items to include in outfit:">
-		Articles &#xE0; inclure &#xE0; l'ensemble:
+		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:
+		Parties du corps :
 	</text>
-	<text left="115" name="Clothes:">
+	<text name="Clothes:">
-		Habits:
+		Habits :
 	</text>
-	<text left="227" name="Attachments:">
+	<text name="Attachments:">
-		Attachements:
+		Attachements  :
 	</text>
 	<text name="Options:">
-		Options:
+		Options :
 	</text>
 	<line_editor name="name ed">
 		Nouvelle tenue

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:">
+			<text name="Permissions :">
-				Droits:
+				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²

indra/newview/skins/default/xui/fr/menu_viewer.xml

@@ -1,46 +1,25 @@
 <?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"/>
-    <menu_item_call label="Import  d'image ([UPLOADFEE])" name="Upload Image">
+    <menu_item_call label="Import de son ([UPLOADFEE])" name="Upload Sound"/>
-		<on_click function="File.UploadImage" userdata="" />
+    <menu_item_call label="Import d'animation ([UPLOADFEE])" name="Upload Animation"/>
-		<on_enable function="File.EnableUpload" />
+    <menu_item_call label="Import  multiples ([UPLOADFEE] par fichier)" name="Bulk Upload"/>
-    </menu_item_call>
+	<menu_item_call label="Import XML" name="Import"/>
-    <menu_item_call label="Import de son ([UPLOADFEE])" name="Upload Sound">
+	<menu_item_call label="Import avec textures" name="Import2"/>
-        <on_click function="File.UploadSound" userdata="" />
+    <menu_item_separator/>
-        <on_enable function="File.EnableUpload" />
+    <menu_item_call label="Définir les droits par défaut " name="perm prefs"/>
-    </menu_item_call>
+		<menu_item_separator/>
-    <menu_item_call label="Import d'animation ([UPLOADFEE])" name="Upload Animation">
+		<menu_item_call label="Enregistrer la texture sur le disque dur en TGA" name="Save Preview As..."/>
-        <on_click function="File.UploadAnim" userdata="" />
+		<menu_item_call label="Enregistrer la texture sur le disque dur en PNG" name="Save Preview AsPNG..."/>
-        <on_enable function="File.EnableUpload" />
+
-    </menu_item_call>
+		<menu_item_separator/>
-    <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="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_separator/>
 		<menu_item_call label="Quitter" name="Quit"/>
 	</menu>
 	<menu label="Édition" name="Edit">
@@ -77,6 +56,7 @@
 		<menu_item_call label="Gestures" name="Gestures..."/>
 		<menu_item_call label="Profil" name="Profile..."/>
 		<menu_item_call label="Apparence" name="Appearance..."/>
+		<menu_item_call label="Créer un ensemble" name="Make Outfit..."/>
 		<menu_item_call label="Display Name - Nom en 'Rab'" name="Display Name..."/>
 		<menu_item_separator label="-----------" name="separator7"/>
 		<menu_item_check label="Amis" name="Friends..."/>
@@ -90,7 +70,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 +113,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_call label="S'asseoir au sol" name="Sit on Ground"/>
-		<menu_item_check label="Voler" name="Fly" shortcut="F"/>
+		<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 label="Faux Absent (on/off)" name="Fake Away Status"/>
-    	<menu_item_call bottom="-186" enabled="true" height="19" label="Faux Absent (on/off)" left="0"
+		<menu_item_call label="Absent(e)-Away" name="Set Away"/>
-     		mouse_opaque="true" name="Fake Away Status" width="185">
+		<menu_item_call label="OQP-Busy" name="Set Busy"/>
-      		<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="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 +165,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 +176,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 Suivante" name="Select Next Part"/>
-		<menu_item_call label="Sélection Precedente" name="Select Previous 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 Suivante" name="Include Next Part"/>
-		<menu_item_call label="Inclure Precedente" name="Include Previous Part"/>
+			<menu_item_call label="Inclure Precedente" name="Include Previous Part"/>
-            </menu>
+		</menu>
 		<menu_item_call label="Lier" name="Link"/>
 		<menu_item_call label="Délier" name="Unlink"/>
 		<menu_item_separator label="-----------" name="separator4"/>
@@ -227,7 +192,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">

indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml

@@ -1,112 +1,107 @@
 <?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">
+<panel 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">
+  <tab_container label="Advanced Chat" name="Ascent Chat">
-     <panel border="true" left="1" bottom="-408" height="408" width="500" label="Chat/IM" name="Chat/IM">
+     <panel label="Chat/IM" name="Chat/IM">
 
-      <check_box bottom_delta="-25" left="10" follows="top" initial_value="false" control_name="WoLfVerticalIMTabs" 
+      <check_box label="Annonce les IMs entrants" name="quickstart_im_check"/>
-        label="IMs verticaux (n&#xE9;cessite une d&#xE9;co/reco)" name="use_vertical_ims_check"/>
+      <check_box label="Ne pas envoyer &#x22;[Machin Truc] is typing..." name="hide_typing_check"/>
-      <check_box bottom_delta="-20" follows="left|top" initial_value="false" control_name="AscentInstantMessageAnnounceIncoming"
+      <check_box label="Montrer le nom du groupe dans le chat" name="append_group_name_check"/>
-        label="Annonce les IMs entrants" tool_tip="" name="quickstart_im_check"/>
+      <check_box label="Jouer le son typique pour le chat local" name="play_typing_sound_check"/>
-      <check_box bottom_delta="-20" follows="left|top" control_name="AscentHideTypingNotification" initial_value="false"
+      <check_box label="Ne pas afficher les notifs. de log dans le chat" name="hide_notifications_in_chat_check"/>
-        label="Ne pas envoyer &#x22;[Machin Truc] is typing...&#x22; dans les IMs" tool_tip="" name="hide_typing_check"/>
+      <check_box label="Permet d'utiliser &#x22;/me&#x22; aussi bien que &#x22;:&#x22;" name="allow_mu_pose_check"/>
-      <check_box bottom_delta="-20" follows="left|top" control_name="OptionShowGroupNameInChatIM" initial_value="false"
+      <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"/>
-        label="Montrer le nom du groupe dans le chat" tool_tip="" name="append_group_name_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>
-      <check_box bottom_delta="-25" left_delta="-5" follows="left|top" control_name="PlayTypingSound" initial_value="true"
+       <radio_group tool_tip="Enables a link to show you the owner of the speaking object." name="objects_link">
-        label="Jouer le son typique pour le chat local" tool_tip="" name="play_typing_sound_check"/>
+        <radio_item name="no_object">Aucun objet</radio_item>
-      <check_box bottom_delta="-20" follows="left|top" control_name="HideNotificationsInChat" initial_value="false"
+        <radio_item name="others_objects">Les objets des autres</radio_item>
-        label="Ne pas afficher les notifs. de log dans le chat" name="hide_notifications_in_chat_check"/>
+        <radio_item left_delta="65" name="anyones_objects">Tous les objets</radio_item>
-      <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>
       </radio_group>
 
-      <text bottom_delta="-18" left="10" follows="top" name="time_format_text_box">Type d'heure :</text>
+      <text 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_box name="time_format_combobox">
-        <combo_item name="24hours" value="default">Horloge 24/H</combo_item>
+        <combo_item name="24hours">Horloge 24/H</combo_item>
-        <combo_item name="12hours" value="default">Horloge 12/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"/>
+      <check_box 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>
+      <text 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_box name="date_format_combobox">
-        <combo_item name="year_first" value="default">AAAA-MM-JJ</combo_item>
+        <combo_item name="year_first">AAAA-MM-JJ</combo_item>
-        <combo_item name="day_first" value="default">JJ/MM/AAAA</combo_item>
+        <combo_item name="day_first">JJ/MM/AAAA</combo_item>
-        <combo_item name="month_first" value="default">MM/JJ/AAA</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"/>
       <!-- Auto-responder -->
-      <view_border bottom="-420" left="5" height="190" bevel_style="none" border_thickness="1" name="GraphicsBorder" width="485"/>
+      <check_box label="Activer le R&#xE9;pondeur Automatique" name="AscentInstantMessageResponseAnyone"/>
-      <check_box bottom_delta="168" left="10" follows="top" initial_value="false" label="Activer le R&#xE9;pondeur Automatique"
+	  <check_box label="Auto-r&#xE9;ponse aux 'non-friends'" name="AscentInstantMessageResponseFriends"/>
-        name="AscentInstantMessageResponseAnyone" tool_tip=""/>
+	  <check_box label="Auto-r&#xE9;ponse aux personnes 'muted'" name="AscentInstantMessageResponseMuted"/>
-	  <check_box bottom_delta="-20" follows="left|top" initial_value="false"
+      <check_box label="Envoyer d&#xE8;s que l'on commence &#xE0; vous &#xE9;crire" name="AscentInstantMessageShowOnTyping"/>
-		label="Auto-r&#xE9;ponse aux 'non-friends'" name="AscentInstantMessageResponseFriends" tool_tip=""/>
+      <check_box 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" 
+      <check_box label="Auto-r&#xE9;ponse &#xE0; chaque message" name="AscentInstantMessageResponseRepeat"/>
-		label="Auto-r&#xE9;ponse aux personnes 'muted'" name="AscentInstantMessageResponseMuted" tool_tip=""/>
+      <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."/>
-      <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"/>
+	  <text left_delta="280" name="text_box1">Texte de la r&#xE9;ponse :</text>
-      <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"/>
+      <text_editor bottom_delta="-130" height="130" name="im_response" width="190"/>
-      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Auto-r&#xE9;ponse &#xE0; chaque message" name="AscentInstantMessageResponseRepeat"/>
+      <text name="text_box2">
-      <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."/>
+#f Pr&#xE9;nom,#l Nom,#t Dur&#xE9;e,#r SLURL,
-	  <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,
 #i Dur&#xE9;e de 'l'IDLE'. (ex. "5 mins")
       </text>
     </panel>
-
+    <panel label="Chat UI" name="ChatUI">
-    <panel border="true" left="1" bottom="-408" height="408" width="500" label="Spam" name="Spam">
+      <check_box label="IMs Verticaux (Déco Reco)" name="use_vertical_ims_check"/>
-      <check_box left="10" bottom_delta="-25" follows="top" font="SansSerifSmall"
+      <check_box label="Ouvre les nouveaux IMs séparements" name="chats_torn_off"/>
-        label="Activer le blocage de spam du chat" tool_tip="" name="AscChatSpamBlock" control_name="SGBlockChatSpam"/>
+      <check_box label="Montre la barre du chat local séparée (Déco Reco)" tool_tip="" name="show_local_chat_floater_bar"/>
-      <spinner left_delta="20" height="18" width="120" follows="top" decimal_digits="0" increment="1" initial_val="10" min_val="2" max_val="100"
+      <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"/>
-        label="Nombre" label_width="70" tool_tip="(Default: 10)" name="AscChatSpamCount" control_name="SGChatSpamCount"/>
+      <check_box label="Boutons sur la même ligne que les noms pour les IMs" name="im_concise_butt"/>
-      <spinner height="18" width="120" follows="left|top" decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
+      <check_box label="Boutons sur la ligne des noms des chats de groupe" name="group_concise_butt"/>
-        label="Dur&#xE9;e" label_width="70" name="AscChatSpamTime" control_name="SGChatSpamTime" tool_tip="(Default: 1.0)"/>
+      <check_box label="Boutons sur la ligne de titre des conférences" name="conf_concise_butt"/>
-      <text bottom_delta="0" left_delta="130" height="16" follows="top" name="" width="100">secondes</text>
+      <check_box label="Désactive le raccourci ouvrant détacher la liste d'amis" name="only_comm"/>
-      <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>
 
-    <panel border="true" bottom="-580" height="525" label="Options de Texte" left="1" name="TextOptions" width="418">
+    <panel label="Spam" name="Spam">
-      <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"/>
+      <check_box label="Activer l'antispam" name="enable_as"/>
-      <text bottom_delta="-24" follows="left|top" height="16" name="EmSpell_txt1">Langage courant (dictionnaire) :</text>
+      <check_box label="Aucun message spécifique dans la file d'attente de spam" name="spammsg_checkbox"/>
-      <combo_box bottom_delta="-20" follows="left|top" height="20" name="SpellBase" width="250" control_name="SpellBase"/>
+      <button label="Réinitialiser la file d'attente" label_selected="d&#xE9;bloquer les sources de spam" name="reset_antispam"/>
-      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt3">T&#xE9;l&#xE9;charger les langues (dictionnaires) :</text>
+      <spinner label="Antispam (Dur&#xE9;e/secondes):" tool_tip="Le plus bas sera le moins sensible - O d&#xE9;sactive" name="antispamtime"/>
-      <combo_box bottom_delta="-20" follows="left|top" height="20" name="EmSpell_Avail" width="250" control_name="EmSpell_Avail"/>
+      <spinner label="Nombre min. de messages par spam:" name="antispamamount"/>
-      <button bottom_delta="0" left_delta="255" follows="left|top" height="20" label="Installer" name="EmSpell_Add" tool_tip="" width="80"/>
+      <spinner label="Multiplicateur du nombre de messages pour les sons:" name="antispamsoundmulti"/>
-      <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"/>
+      <spinner label="Multiplicateur du nombre de sons &#xE0; pr&#xE9;charger par spam:" name="antispamsoundpreloadmulti"/>
-      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt2">Langues additionnelles (dictionnaires) :</text>
+      <spinner label="Nombre de lignes max. d'un message:" name="antispamnewlines"/>
-      <combo_box bottom_delta="-20" follows="left|top" height="20" name="EmSpell_Installed" width="250" control_name="EmSpell_Installed" tool_tip=""/>
+      <check_box label="D&#xE9;sactive toutes les fen&#xEA;tres de dialogue (D&#xE9;co/Reco)" name="antispam_checkbox"/>
-      <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 name="Block All Dialogs From">Bloquer tous les dialogues provenants de :</text>
-      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt4">
+      <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="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 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>
-      <check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
+      <text name="EmKeyw">Est trouv&#xE9; dans :</text>
-        label="Mettre en valeur les messages si l'un deux contient les termes suivants :" name="KeywordsOn" width="270"/>
+      <check_box label="Chat local" name="KeywordsInChat"/>
-      <text bottom_delta="-20" follows="top" height="20" left="12" name="keyword_txt1">(s&#xE9;par&#xE9;s par des virgules)</text>
+      <check_box label="IMs" name="KeywordsInIM"/>
-      <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"/>
+      <check_box label="Mettre en valeur le message avec cette couleur :" name="KeywordsChangeColor"/>
-      <text bottom_delta="-24" follows="top" height="20" left_delta="15" name="EmKeyw">Est trouv&#xE9; dans :</text>
+      <color_swatch name="KeywordsColor" tool_tip="Click to open Color Picker"/>
-      <check_box bottom_delta="3" follows="top" height="16" left_delta="100" label="Chat local" name="KeywordsInChat"/>
+      <check_box label="Jouer cette alerte sonore : (UUID)" name="KeywordsPlaySound"/>
-      <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"/>
     </panel>
 
   </tab_container>
-</panel>
+</panel>

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">
+  label="Syst&#xE8;me" name="ascsys">
-  <tab_container label="Singularity System" bottom="0" height="440" width="497" left="0"
+  <tab_container label="Singularity System" name="Ascent System">
-    name="Ascent System" tab_min_width="70" tab_position="top">
 
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
+    <panel label="G&#xE9;n&#xE9;ral" name="User Interface">
-      follows="left|top|right|bottom" label="G&#xE9;n&#xE9;ral" name="User Interface">
+      <check_box
-      <check_box bottom_delta="-25" control_name="DoubleClickTeleport" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         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"
+      <check_box left_delta="-10"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         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"
+      <spinner
-        follows="left|top" font="SansSerifSmall" height="16" left="30" width="230"
+        width="230"
         label="Intervalle distance/affichage:" label_width="180"
-        max_val="60" min_val="5" initial_val="20" increment="5"
+        name="speed_rez_interval" />
-        mouse_opaque="true" name="speed_rez_interval" />
+      <text name="speed_rez_seconds" width="100">
-      <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">
 secondes
       </text>
     </panel>
 
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Commandes Texte"
+    <panel label="Commandes Texte" name="Command Line">
-      left="1" mouse_opaque="true" name="Command Line" width="418">
+      <check_box label="Activer l'usage de la barre de chat comme ligne de commande" left="10"
-      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        name="chat_cmd_toggle" width="270"/>
-        initial_value="false" label="Activer l'usage de la barre de chat comme ligne de commande" left="10"
+      <text name="cmd_line_text_2" width="512">
-        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">
 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"
+      <line_editor name="AscentCmdLinePos" width="200"/>
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+      <text name="cmd_line_text_3" width="512">
-        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">
 Tp au sol (usage: cmd)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+      <line_editor name="AscentCmdLineGround" width="200"/>
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+      <text name="cmd_line_text_4" width="512">
-        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">
 Tp en altitude (usage: cmd z)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+      <line_editor name="AscentCmdLineHeight" width="200"/>
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+      <text name="cmd_line_text_5" width="512">
-        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">
 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"
+      <line_editor name="AscentCmdLineTeleportHome" width="200"/>
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+      <text name="cmd_line_text_6" width="512">
-        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">
 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"
+      <line_editor name="AscentCmdLineRezPlatform" width="200"/>
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+      <slider name="AscentPlatformSize" label="Dimensions:" label_width="75"
-        tool_tip="" name="AscentCmdLineRezPlatform" width="200"/>
+        tool_tip="Quelle taille voulez-vous ?"/>
-      <slider bottom_delta="-22" left_delta="0" name="AscentPlatformSize" control_name="AscentPlatformSize"
+      <text name="cmd_line_text_8" width="512">
-        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">
 Calculette (usage: cmd 2 + 2)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+      <line_editor name="AscentCmdLineCalc" width="200"/>
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+      <text name="cmd_line_text_15" width="512">
-        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">
 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"
+      <line_editor name="AscentCmdLineClearChat" width="200"/>
-        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"/>
       <!-- Column Split -->
-      <view_border bevel_style="none" border_thickness="1" bottom_delta="-5" follows="top|left" height="295"
+      <text name="cmd_line_text_9" width="512">
-        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">
 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"
+      <line_editor name="AscentCmdLineDrawDistance" width="200"/>
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+      <text bname="cmd_line_text_10" width="512">
-        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">
 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"
+      <line_editor name="AscentCmdTeleportToCam" width="200"/>
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+      <text name="cmd_line_text_11" width="512">
-        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">
 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"
+      <line_editor name="AscentCmdLineKeyToName" width="200"/>
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+      <text name="cmd_line_text_12" width="512">
-        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">
 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"
+      <line_editor name="AscentCmdLineOfferTp" width="200"/>
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+      <text name="cmd_line_text_7" width="512">
-        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">
 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"
+      <line_editor name="AscentCmdLineMapTo" width="200"/>
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+      <check_box
-        tool_tip="" name="AscentCmdLineMapTo" width="200"/>
+        label="Utiliser la meme position entre les sims" left_delta="0"
-      <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        name="map_to_keep_pos" width="270"/>
-        initial_value="false" label="Utiliser la meme position entre les sims" left_delta="0" mouse_opaque="true"
+      <text name="cmd_line_text_13" width="512">
-        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">
 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"
+      <line_editor
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
         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>
+      <text 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"/>
+      <line_editor name="SinguCmdLineAway" width="200"/>
-
     </panel>
 
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
+    <panel label="S&#xE9;curit&#xE9;" name="Security">
-      follows="left|top|right|bottom" label="S&#xE9;curit&#xE9;" name="Security">
+      <check_box
-      <check_box bottom_delta="-25" control_name="BroadcastViewerEffects" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         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" 
+       <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"/>
-       follows="top" initial_value="false" 
+       <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"
+       <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         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"
+      <check_box
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         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"
+      <check_box
-        initial_value="false" label="Affiche les changements de d&#xE9;comptes de scripts de la r&#xE9;gion." left_delta="0"
+        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"
+        name="totalscriptjumps" width="270"
-        control_name="AscentDisplayTotalScriptJumps"
         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"
+      <spinner left_delta="350" name="ScriptJumpCount" tool_tip="Threshold for the script jump message [Default: 100]"/>
-        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]"/>
     </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">
+    <panel label="Build/Cr&#xE9;ation" name="Building">
-
+      <text name="text_box6">Point de Pivot</text>
-
+      <check_box label="Valeurs en %" name="EmPivotPercToggle"/>
-      <text bottom_delta="-19" follows="top" height="10" left_delta="30" name="text_box6">Point de Pivot</text>
+      <check_box label="Active les &#x22;Highlights&#x22; sur les prims s&#xE9;lectionn&#xE9;s" name="EmBuildPrefsRenderHighlight_toggle"/>
-      <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"/>
+	  <check_box label="Axe sur le Root Prim" name="EmBuildPrefsActualRoot_toggle"/>
-      <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"/>
+      <text name="text_box7">Permissions :</text>
-      <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 label="Phantom" name="EmPhantomToggle"/>
-      <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 label="Physical" name="EmPhysicalToggle"/>
-      <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 label="Temporaire" name="EmTemporaryToggle"/>
-	  <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"/>
+      <color_swatch label="    Couleur" name="colorswatch"/>
-      <view_border bevel_style="none" border_thickness="1" bottom="-180" follows="top" height="70" left="5" name="NextOwnerBorder" width="130"/>
+      <check_box label="Lumineux" name="EmFBToggle"/>
-      <text bottom_delta="60" follows="top" height="10" left_delta="10" name="text_box7">Permissions:</text>
+      <check_box name="EmeraldBuildPrefsEmbedItem" label="Mettre un &#xE9;l&#xE9;ment dans l'object"/>
-        <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"/>
+        <text name="Give inventory">Glissez l'&#xE9;l&#xE9;ment ICI</text>
-        <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>
 
   </tab_container>

indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml

@@ -1,55 +1,62 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel top="20" left="10" height="400" width="512" border="true" label="Vanity" name="ascvan">
+<panel label="Vanity" name="ascvan">
-  <tab_container label="Singularity Vanity" bottom="0" height="440" width="497" name="Ascent Vanity" tab_min_width="90">
+  <tab_container label="Singularity Vanity" name="Ascent Vanity">
-    <panel border="true" left="1" bottom="-190" height="180" width="500" label="Principal" name="General">
+    <panel 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 label="Lorsque c'est possible, sauver le setting personnalisé par compte." 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 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 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 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"/>
+      <check_box label="D&#xE9;sactiver les animations pour le chat local: dire, chuchoter, crier" tool_tip="" name="disable_chat_animation"/>
+      <check_box label="Rajouter les attachements et habits au lieu de les remplacer" tool_tip="" name="add_not_replace"/>
+      <check_box label="Pivote l'avatar quand on marche en arriere" tool_tip="Certains AO peuvent empecher la fontion." name="turn_around"/>
+      <check_box 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 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 label="Activer les Fonctions des TAGs." 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_box tool_tip="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" name="tag_spoofing_combobox"/>
-        <combo_item name="Singularity" value="f25263b7-6167-4f34-a4ef-af65213b2e39">Singularity</combo_item>
+      <check_box label="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" 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"/>
-      </combo_box>
+      <check_box label="Afficher sa propre couleur custom " tool_tip="Vous seul la voyez." name="show_self_tag_color_check"/>
-      <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 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="-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"/>
       <!-- 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"/>
+      <check_box 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>
+      <text 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"/>
+      <line_editor name="custom_tag_label_box"/>
-      <text bottom_delta="6" left_delta="110" follows="top" height="10" name="custom_tag_color_text">Couleur :</text>
+      <text 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" />
+      <color_swatch name="custom_tag_color_swatch"/>
-      <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 label="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" 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 label="Afficher la couleur pour les autres avatars" 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 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"/>
+      <check_box label="Chercher automatiquement les Mises &#xE0; Jour des Tags" left_delta="-205" 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"/>
+      <button name="update_clientdefs" label="MAJ Manuelle"/>
       <!-- End of Client Tag settings -->
-      <text bottom_delta="-25" follows="top" height="10" left="20" name="effects_color_textbox">Couleurs de mes effets :</text>
+      <text 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"/>
+      <color_swatch label="Effets" name="effect_color_swatch"/>
-      <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"/>
+      <check_box label="Activer les couleurs pour: Amis, Linden, etc..." name="use_status_check"/>
-      <text bottom_delta="-20" follows="top" height="10" left_delta="10" name="friends_color_textbox">Choix des couleurs :
+      <text 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 label="Amis" name="friend_color_swatch"/>
-      <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 label="Estate" name="estate_owner_color_swatch"/>
-      <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 label="Lindens" name="linden_color_swatch"/>
-      <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 label="Mut&#xE9;" name="muted_color_swatch"/>
+      <text name="chat_color_text">couleurs du chat:</text>
+      <check_box name="color_friend_check" tool_tip="Color Friend Chat"/>
+      <check_box name="color_estate_owner_check" tool_tip="Color Estate Managers Chat"/>
+      <check_box name="color_linden_check" tool_tip="Color Linden Chat"/>
+      <check_box name="color_muted_check" tool_tip="Color Muted Chat"/>
     </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">
+    <panel 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=""/>
+      <check_box label="Activer les &#x22;physics&#x22; des n&#xE9;n&#xE9;s voire du popotin des avatars ^^" name="EmBreastsToggle"/>
-      <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 name="EmeraldBoobMass" label="Masse :" />
-      <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 name="EmeraldBoobHardness" label="Rebond :"/>
-      <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 name="EmeraldBoobVelMax" label="V&#xE9;locit&#xE9; max :"/>
-      <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 name="EmeraldBoobFriction" label="Friction :"/>
-      <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"/>
+      <slider name="EmeraldBoobVelMin" label="V&#xE9;locit&#xE9; min :"/>
-      <text bottom_delta="-20" height="15" left="10" name="av_mod_textbox" follows="top">Modifier l'offset de l'avatar</text>
+      <text 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 label="X Modif." name="X Modifier"/>
-      <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 label="Y Modif." name="Y Modifier"/>
-      <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 label="Z Modif." name="Z Modifier"/>
     </panel>
   </tab_container>
 </panel>

indra/newview/skins/default/xui/fr/panel_preferences_audio.xml

@@ -1,32 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Audio et vidéo" name="Media panel">
-	<text length="1" name="muting_text" type="string">
+	<text name="muting_text">Volume:</text>
-		Volume :
+	<text name="audio_prefs_text"></text>
-	</text>
+	<text bottom="-187" name="streaming_prefs_text">
-	<panel name="Volume Panel" width="249"/>
-	<check_box label="Couper le son" name="disable audio"/>
-	<text bottom="-187" name="streaming_prefs_text" width="150">
 		Médias et Audio :&#10;&#10;&#10;&#10;&#10;&#10;&#10;( Filtre de Sécurité des Médias )
 	</text>
-	<text name="audio_prefs_text">
+	<panel name="Volume Panel"/>
-		 
-	</text>
-	<panel label="Volume" name="Volume Panel"/>
-	<check_box label="Couper le son lorsque la fenêtre est minimisée" name="mute_when_minimized"/>
 	<check_box bottom="-200" height="32" label="Jouer la musique disponible &#10;
 (Gourmand en bande passante)" name="streaming_music"/>
 	<check_box bottom_delta="-32" height="32" label="Jouer le média disponible &#10;
 (Gourmand en bande passante)" name="streaming_video"/>
+	<check_box label="Demande la permission d'activer le média" name="streaming_video"/>
 	<check_box bottom_delta="-32" label="Lire automatiquement le média" name="auto_streaming_video"/>
-	<check_box bottom_delta="-20" control_name="MediaEnableFilter" follows="top" height="16" initial_value="true" label="Demande la permission d'activer le média" name="streaming_video2"/>
+	<check_box label="Couper le son lorsque la fenêtre est minimisée" name="mute_when_minimized"/>
-
 	<slider label="Effet Doppler" label_width="115" name="Doppler Effect"/>
-	<slider label="Facteur d&apos;éloignement" label_width="115" name="Distance Factor"/>
+	<slider label="Facteur d'atténuation" label_width="115" name="Rolloff Factor"/>
-	<slider label="Facteur d&apos;atténuation" label_width="115" name="Rolloff Factor"/>
+  <slider label="Facteur d'atténuation (sous marin)" label_width="170" name="Underwater Rolloff Factor"/>
-	<spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
+  <spinner label="Alerte [CURRENCY]:" left="148" name="currency_change_threshold"/>
-	     enabled="true" follows="left|top" height="16" increment="10"
-	     initial_val="10" label="Alerte [CURRENCY]:" label_width="128" left="148"
-	     max_val="10000" min_val="0" mouse_opaque="true" name="currency_change_threshold"
-	     width="192" />
 	<spinner label="Alerte santé" name="Health Change Threshold"/>
 </panel>

indra/newview/skins/default/xui/fr/panel_preferences_general.xml

@@ -1,148 +1,75 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" height="408" label="Général" left="102" name="general_panel" width="517">
+<panel label="Général" name="general_panel">
-  <radio_group bottom="-44" height="40" left="109" name="default_start_location" width="280">
+  <radio_group name="default_start_location" width="280">
-    <radio_item bottom="-20" height="20" name="MyHome" tool_tip="Par défaut, choisit le domicile comme lieu de départ.">Domicile</radio_item>
+    <radio_item name="MyHome" tool_tip="Par défaut, choisit le domicile comme lieu de départ.">Domicile</radio_item>
-    <radio_item bottom="-20" height="20" left="93" name="MyLastLocation" tool_tip="Par défaut, choisit le dernier emplacement comme lieu de départ.">Dernier emplacement</radio_item>
+    <radio_item name="MyLastLocation" tool_tip="Par défaut, choisit le dernier emplacement comme lieu de départ.">Dernier emplacement</radio_item>
   </radio_group>
-  <check_box bottom="-42" height="16" initial_value="true" label="Afficher le lieu de départ sur l&apos;écran de connexion" name="show_location_checkbox"/>
+  <check_box abel="Afficher le lieu de départ sur l'écran de connexion" name="show_location_checkbox"/>
-	<combo_box bottom_delta="-27" follows="top" height="18" left="103" name="fade_out_combobox" width="111">
+	<combo_box name="fade_out_combobox">
-		<combo_item name="Never" value="Never">Jamais</combo_item>
+		<combo_item name="Never">Jamais</combo_item>
-		<combo_item name="Show Temporarily" value="Show Temporarily">Afficher temporairement</combo_item>
+		<combo_item name="Show Temporarily">Afficher temporairement</combo_item>
-		<combo_item name="Always" value="Always">Toujours</combo_item>
+		<combo_item name="Always">Toujours</combo_item>
 	</combo_box>
-
+	<combo_box name="namesystem_combobox">
-	<combo_box bottom_delta="0" follows="top" height="18" left="220" name="namesystem_combobox" width="166">
+		<combo_item name="Old Names">Anciens Names</combo_item>
-		<combo_item name="Old Names" value="Anciens Noms">Anciens Names</combo_item>
+		<combo_item name="Display Names (with Username)">Display Names(w/Username)</combo_item>
-		<combo_item name="Display Names (with Username)" value="Display Names (with Username)">Display Names(w/Username)</combo_item>
+		<combo_item name="Display Names only">Display Names only</combo_item>
-		<combo_item name="Display Names only" value="Display Names only">Display Names only</combo_item>
 	</combo_box>
-
-
-
 	<check_box label="Nom des avatars en petit" name="small_avatar_names_checkbox"/>
 	<check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox"/>
-	<text name="group_titles_textbox">
+	<text name="group_titles_textbox">Titres de groupe :</text>
-		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:">
+	<text name="UI Size:">Taille de l'interface :</text>
-		Taille de l&apos;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="M&apos;avertir lorsque je dépense ou reçois des L$" name="notify_money_change_checkbox"/>
+	<check_box label="Avertir lorsque je dépense ou reçois des L$" name="notify_money_change_checkbox"/>
-	<text name="maturity_desired_label">
+	<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"/>
-		Catégories :
+	<text name="maturity_desired_label">Catégories :</text>
-	</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">
+		<combo_item name="Desired_Adult">PG, Mature, Adulte</combo_item>
-			PG, Mature, Adulte
+		<combo_item name="Desired_Mature">PG et Mature</combo_item>
-		</combo_item>
+		<combo_item name="Desired_PG">PG uniquement</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">
+	<text name="maturity_desired_textbox" left="340">PG uniquement</text>
-		PG uniquement
+	<text name="start_location_textbox">Lieu de départ :</text>
-	</text>
+	<text name="show_names_textbox">Afficher les noms :</text>
-	<text length="1" name="start_location_textbox" type="string">
+	<text bottom="-174" name="effects_color_textbox">
-		Lieu de départ :
+Couleur du faisceau
-	</text>
-	<text length="1" name="show_names_textbox" type="string">
-		Afficher les noms :
-	</text>
-	<text bottom="-174" length="1" name="effects_color_textbox" type="string">
-		Couleur du faisceau 
 de sélection :
 	</text>
-	<text length="1" name="seconds_textbox" type="string">
+	<text name="seconds_textbox">secondes</text>
-		secondes
+	<text name="crash_report_textbox">Rapports de crash :</text>
-	</text>
+	<text name="language_textbox">Langue :</text>
-	<text length="1" name="crash_report_textbox" type="string">
+	<text left_delta="313" name="language_textbox2">(redémarrage requis)</text>
-		Rapports de crash :
-	</text>
-	<text length="1" name="language_textbox" type="string">
-		Langue :
-	</text>
-	<text left_delta="313" length="1" name="language_textbox2" type="string">
-		(redémarrage requis)
-	</text>
-	<string name="region_name_prompt">
-		&lt;Saisir le nom de la région&gt;
-	</string>
-	<combo_box name="crash_behavior_combobox" width="166">
-		<combo_item length="1" name="Askbeforesending" type="string">
-			Demander avant d&apos;envoyer
-		</combo_item>
-		<combo_item length="1" name="Alwayssend" type="string">
-			Toujours envoyer
-		</combo_item>
-		<combo_item length="1" name="Neversend" type="string">
-			Ne jamais envoyer
-		</combo_item>
-	</combo_box>
 	<combo_box name="language_combobox" width="166">
-		<combo_item name="System Default Language">
+		<combo_item name="System Default Language">Choix par défaut</combo_item>
-			Choix par défaut
+		<combo_item name="English">English (Anglais)</combo_item>
-		</combo_item>
+		<combo_item name="Danish">Dansk (Danois) - Bêta</combo_item>
-		<combo_item length="1" name="English" type="string">
+		<combo_item name="Deutsch(German)">Deutsch (Allemand) - Bêta</combo_item>
-			English (Anglais)
+		<combo_item name="Spanish">Español (Espagnol)</combo_item>
-		</combo_item>
+		<combo_item name="French">Français</combo_item>
-		<combo_item length="1" name="Danish" type="string">
+		<combo_item name="Italian">Italiano (Italien) - Bêta</combo_item>
-			Dansk (Danois) - Bêta
+		<combo_item name="Hungarian">Magyar (Hongrois) - Bêta</combo_item>
-		</combo_item>
+		<combo_item name="Dutch">Nederlands (Néerlandais) - Bêta</combo_item>
-		<combo_item length="1" name="Deutsch(German)" type="string">
+		<combo_item name="Polish">Polski (Polonais) - Bêta</combo_item>
-			Deutsch (Allemand) - Bêta
+		<combo_item name="Portugese">Portugués (Portugais) - Bêta</combo_item>
-		</combo_item>
+		<combo_item name="Russian">Русский (Russe) - Bêta</combo_item>
-		<combo_item name="Spanish">
+		<combo_item name="Turkish">Türkçe (Turc) - Bêta</combo_item>
-			Español (Espagnol) - Bêta
+		<combo_item name="Ukrainian">Українська (Ukrainien) - Bêta</combo_item>
-		</combo_item>
+		<combo_item name="Chinese">中文 (简体) (Chinois) - Bêta</combo_item>
-		<combo_item name="French">
+		<combo_item name="(Japanese)">日本語 (Japonais) - Bêta</combo_item>
-			Français - Bêta
+		<combo_item name="(Korean)">한국어 (Coréen) - Bêta</combo_item>
-		</combo_item>
-		<combo_item name="Italian">
-			Italiano (Italien) - Bêta
-		</combo_item>
-		<combo_item name="Hungarian">
-			Magyar (Hongrois) - Bêta
-		</combo_item>
-		<combo_item name="Dutch">
-			Nederlands (Néerlandais) - Bêta
-		</combo_item>
-		<combo_item name="Polish">
-			Polski (Polonais) - Bêta
-		</combo_item>
-		<combo_item name="Portugese">
-			Portugués (Portugais) - Bêta
-		</combo_item>
-		<combo_item name="Russian">
-			Русский (Russe) - Bêta
-		</combo_item>
-		<combo_item name="Turkish">
-			Türkçe (Turc) - Bêta
-		</combo_item>
-		<combo_item name="Ukrainian">
-			Українська (Ukrainien) - Bêta
-		</combo_item>
-		<combo_item length="1" name="Chinese" type="string">
-			中文 (简体) (Chinois) - Bêta
-		</combo_item>
-		<combo_item length="1" name="(Japanese)" type="string">
-			日本語 (Japonais) - Bêta
-		</combo_item>
-		<combo_item length="1" name="(Korean)" type="string">
-			한국어 (Coréen) - Bêta
-		</combo_item>
 	</combo_box>
-  <check_box bottom="-385" height="16" initial_value="false" label="Partager la langue avec les objets" left="101" name="language_is_public" tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite."/>
+	<string name="region_name_prompt">&lt;Saisir le nom de la région&gt;</string>
-  <button bottom="-425" height="25" label="Re initialiser tous les Settings (réglages)" name="clear_settings" width="250" />
+	<combo_box name="crash_behavior_combobox" width="166">
+		<combo_item name="Askbeforesending">Demander avant d'envoyer</combo_item>
+		<combo_item name="Alwayssend">Toujours envoyer</combo_item>
+		<combo_item name="Neversend">Ne jamais envoyer</combo_item>
+	</combo_box>
+  <check_box label="Partager la langue avec les objets" name="language_is_public" tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite."/>
+  <button label="Re initialiser tous les Settings (réglages)" name="clear_settings" width="250" />
 </panel>

indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml

@@ -1,216 +1,128 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Graphiques" name="Display panel">
-	<button label="?" name="GraphicsPreferencesHelpButton"/>
+	<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"/>
 	<text_editor bottom="-56" height="40" left="25" name="FullScreenInfo" width="460">
 		D&#xE9;cocher cette option pour passer en mode plein &#xE9;cran.
 	</text_editor>
-	<text name="WindowSizeLabel">
+	<text name="WindowSizeLabel">Taille de la fen&#xEA;tre :</text>
-		Taille de la fen&#xEA;tre:
-	</text>
 	<combo_box name="windowsize combo">
-		<combo_item name="640x480">
+		<combo_item name="640x480">640 x 480</combo_item>
-			640 x 480
+		<combo_item name="800x600">800 x 600</combo_item>
-		</combo_item>
+		<combo_item name="720x480">720 x 480 (NTSC)</combo_item>
-		<combo_item name="800x600">
+		<combo_item name="768x576">68 x 576 (PAL)</combo_item>
-			800 x 600
+		<combo_item name="1024x768">1024 x 768</combo_item>
-		</combo_item>
-		<combo_item name="720x480">
-			720 x 480 (NTSC)
-		</combo_item>
-		<combo_item name="768x576">
-			768 x 576 (PAL)
-		</combo_item>
-		<combo_item name="1024x768">
-			1024 x 768
-		</combo_item>
 	</combo_box>
-	<text name="DisplayResLabel" width="165">
+	<text name="DisplayResLabel" width="165">R&#xE9;solution de l'affichage :</text>
-		R&#xE9;solution de l'affichage:
+	<text name="AspectRatioLabel1" tool_tip="largeur/hauteur">Rapport hauteur/largeur :</text>
-	</text>
-	<text name="AspectRatioLabel1" tool_tip="largeur/hauteur">
-		Rapport hauteur/largeur:
-	</text>
 	<combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
-		<combo_item name="4:3(StandardCRT)">
+		<combo_item name="4:3(StandardCRT)">4:3 (Standard CRT)</combo_item>
-			4:3 (Standard CRT)
+		<combo_item name="5:4(1280x1024LCD)">5:4 (1280 x 1024 LCD)</combo_item>
-		</combo_item>
+		<combo_item name="8:5(Widescreen)">8:5 (&#xE9;cran large)</combo_item>
-		<combo_item name="5:4(1280x1024LCD)">
+		<combo_item name="16:9(Widescreen)">16:9 (plein &#xE9;cran)</combo_item>
-			5:4 (1280 x 1024 LCD)
-		</combo_item>
-		<combo_item name="8:5(Widescreen)">
-			8:5 (&#xE9;cran large)
-		</combo_item>
-		<combo_item name="16:9(Widescreen)">
-			16:9 (plein &#xE9;cran)
-		</combo_item>
 	</combo_box>
-	<text name="text">
-		R&#xE9;solution d'affichage:
-	</text>
-	<text name="Fullscreen Aspect Ratio:">
-		Format de plein &#xE9;cran:
-	</text>
-	<text name="(width / height)">
-		(largeur / hauteur)
-	</text>
-	<text name="UI Size:">
-		Taille de l'IU:
-	</text>
-	<text name="(meters, lower is faster)">
-		(mètres, moins = plus rapide)
-	</text>
-	<text name="text2">
-		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="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"/>
+ <tab_container name="graphics_tab">
-	<check_box label="Montrer l'avatar en vue subjective" name="avfp"/>
+	<panel label="Menu" name="Main">
-	<spinner label="Distance d'affichage:" name="draw_distance"/>
+	<text name="QualityText">Qualité / Perfs:</text>
-	<text name="HigherText">
+	<text left="125" name="FasterText">Rapidité</text>
-		Qualit&#xE9; et
+	<text left_delta="45" name="ShadersPrefText">Bas</text>
-	</text>
+	<text left_delta="30" name="ShadersPrefText2">Medium</text>
-	<text name="QualityText">
+	<text left_delta="52" name="ShadersPrefText3">Haut</text>
-		Performance :
+	<text left_delta="35" name="ShadersPrefText4">Ultra</text>
-	</text>
+	<text name="QualityText2">Qualité</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>
 	<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">
+  <text name="TerrainScaleText">Echelle du terrain:</text>
-		Reflets:
+  <combo_box label="Echelle du terrain" name="TerrainScaleCombo">
-	</text>
+    <combo_item name="Low">Faible</combo_item>
-	<combo_box bottom_delta="-20" label="Reflection Detail" name="ReflectionDetailCombo">
+    <combo_item name="Medium">Medium</combo_item>
-		<combo_item name="0">
+    <combo_item name="High">Haute</combo_item>
-           Aucun
+    <combo_item name="Ultra">Ultra</combo_item>
-		</combo_item>
-		<combo_item name="1">
-			Terrain et arbres
-		</combo_item>
-		<combo_item name="2">
-			Objets Statiques
-		</combo_item>
-		<combo_item name="3">
-			Avatars et objets
-		</combo_item>
-		<combo_item name="4">
-			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;
-    </combo_item>
-    <combo_item name="1">
-        Ombres solaires
-    </combo_item>
-    <combo_item name="2">
-        Ombres des projecteurs
-    </combo_item>
   </combo_box>
-	<text name="AvatarRenderingText">
+  <text name="ShadowDetailText" width="128">Ombres att&#xE9;nu&#xE9;es :</text>
-		Rendu de l'avatar:
+  <combo_box bottom_delta="-20" label="Shadow Detail" name="ShadowDetailCombo">
-	</text>
+    <combo_item name="0">D&#xE9;sactiv&#xE9;</combo_item>
+    <combo_item name="1">Ombres solaires</combo_item>
+    <combo_item name="2">Ombres des projecteurs</combo_item>
+  </combo_box>
+	<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 name="1">Terrain et arbres</combo_item>
+		<combo_item name="2">Objets Statiques</combo_item>
+		<combo_item name="3">Avatars et objets</combo_item>
+		<combo_item name="4">Tout</combo_item>
+	</combo_box>
+
 	<check_box label="Avatars &#xE9;loign&#xE9;s en 2D" name="AvatarImpostors"/>
 	<check_box label="Acc&#xE9;l&#xE9;ration du rendu" name="AvatarVertexProgram"/>
 	<check_box label="Mouvement des habits" name="AvatarCloth"/>
-	<text name="DrawDistanceMeterText1">
+	<text name="DrawDistanceMeterText1">m</text>
-		m
+	<text name="DrawDistanceMeterText2">m</text>
-	</text>
+	<slider label="Limite d'affichage :" name="DrawDistance"/>
-	<text name="DrawDistanceMeterText2">
+	<slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/>
-		m
+    <slider label="Avatars Max:" name="AvatarMaxVisible"/>
-	</text>
+	<slider label="Qualit&#xE9; post-traitement :" label_width="125" name="RenderPostProcess"/>
-	<slider label="Limite d'affichage:" name="DrawDistance"/>
+	<text name="PostProcessText">Faible</text>
-	<slider label="Nombre de particules max.:" label_width="143" name="MaxParticleCount"/>
+	<text name="MeshDetailText">D&#xE9;tails des rendus :</text>
-	<slider label="Qualit&#xE9; post-traitement:" label_width="125" name="RenderPostProcess"/>
+	<slider label="  Objets :" name="ObjectMeshDetail"/>
-	<text name="MeshDetailText">
+	<slider label="  Flexiprims :" name="FlexibleMeshDetail"/>
-		D&#xE9;tails des rendus:
+	<slider label="  Arbres :" name="TreeMeshDetail"/>
-	</text>
+	<slider label="  Avatars :" name="AvatarMeshDetail"/>
-	<slider label="  Objets:" name="ObjectMeshDetail"/>
+	<slider label="  Relief :" name="TerrainMeshDetail"/>
-	<slider label="  Flexiprims:" name="FlexibleMeshDetail"/>
+	<slider label="  Ciel :" name="SkyMeshDetail"/>
-	<slider label="  Arbres:" name="TreeMeshDetail"/>
+	<text name="ObjectMeshDetailText">Faible</text>
-	<slider label="  Avatars:" name="AvatarMeshDetail"/>
+	<text name="FlexibleMeshDetailText">Faible</text>
-	<slider label="  Relief:" name="TerrainMeshDetail"/>
+	<text name="TreeMeshDetailText">Faible</text>
-	<slider label="  Ciel:" name="SkyMeshDetail"/>
+	<text name="AvatarMeshDetailText">Faible</text>
-	<text name="PostProcessText">
+	<text name="TerrainMeshDetailText">Faible</text>
-		Faible
+	<text name="SkyMeshDetailText">Faible</text>
-	</text>
+	<text left="380" name="TerrainDetailText">Rendu du terrain :</text>
-	<text name="ObjectMeshDetailText">
-		Faible
-	</text>
-	<text name="FlexibleMeshDetailText">
-		Faible
-	</text>
-	<text name="TreeMeshDetailText">
-		Faible
-	</text>
-	<text name="AvatarMeshDetailText">
-		Faible
-	</text>
-	<text name="TerrainMeshDetailText">
-		Faible
-	</text>
-	<text name="SkyMeshDetailText">
-		Faible
-	</text>
-	<text name="LightingDetailText">
-		Sources lumineuses:
-	</text>
-	<radio_group name="LightingDetailRadio">
-		<radio_item name="SunMoon">
-			Soleil et lune uniquement
-		</radio_item>
-		<radio_item name="LocalLights">
-			Lumi&#xE8;res de proximit&#xE9;
-		</radio_item>
-	</radio_group>
-	<text left="380" name="TerrainDetailText">
-		Rendu du terrain:
-	</text>
 	<radio_group name="TerrainDetailRadio">
-		<radio_item name="0">
+	  <radio_item name="0">Faible</radio_item>
-			Faible
+	  <radio_item name="2">Elev&#xE9;</radio_item>
-		</radio_item>
-		<radio_item name="2">
-			Elev&#xE9;
-		</radio_item>
 	</radio_group>
-	<button label="Param&#xE8;tres recommand&#xE9;s" left="20" name="Defaults" width="200"/>
+  </panel>
-	<!--button label="Advanced" left="130" name="CustomSettingsButton"/-->
+
-	<button label="Configuration du mat&#xE9;riel" left="240" name="GraphicsHardwareButton" width="220"/>
+  <panel name="Hardware" label="Configuration du mat&#xE9;riel">
-	<text name="resolution_format">
+	<check_box label="Filtre anisotrope (plus lent si activ&#xE9;)" name="ani"/>
-		[RES_X] x [RES_Y]
+    <text name="Antialiasing:">Antialiasing:</text>
-	</text>
+    <combo_box label="Antialiasing" name="fsaa">
-	<text name="aspect_ratio_text">
+      <combo_item name="FSAADisabled">Disabled</combo_item>
-		[NUM]:[DEN]
+      <combo_item name="2x">2x</combo_item>
-	</text>
+      <combo_item name="4x">4x</combo_item>
+      <combo_item name="8x">8x</combo_item>
+      <combo_item name="16x">16x</combo_item>
+    </combo_box>
+    <spinner label="M&#xE9;moire graphique (MB):" 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."/>
+    <check_box label="Activer OpenGL Vertex Buffer Objects" 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 label="Activer Streamed VBOs" 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 label="Activer la m&#xE9;moire tampon de la trame" 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 label="Gamma:" name="gamma" tool_tip="(0 = défaut, valeur faible = plus lumineux)"/>
+    <spinner label="Coefficient de Brouillard :" name="fog"/>
+    <text name="note">
+Note: Le Gamma et le brouillard, sont inactifs
+quand les effets atmosphériques
+le sont également.
+    </text>
+  </panel>
+ </tab_container>
+	<string name="resolution_format">[RES_X] x [RES_Y]</string>
+	<string name="aspect_ratio_text">[NUM]:[DEN]</string>
 </panel>

indra/newview/skins/default/xui/fr/panel_preferences_input.xml

@@ -1,31 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Contrôle caméra" name="Input panel">
-	<text name=" Mouselook Options:">
+	<text name=" Mouselook Options:">Vue subjective:</text>
-		Vue subjective:
+	<text name=" Mouse Sensitivity:">Sensibilité de la souris:</text>
-	</text>
-	<text name=" Mouse Sensitivity:">
-		Sensibilité de la souris:
-	</text>
 	<check_box label="Inverser la souris" name="invert_mouse"/>
-	<text name=" Auto Fly Options:">
+	<text name=" Auto Fly Options:">Vol automatique:</text>
-		Vol automatique:
-	</text>
 	<check_box label="Voler/atterrir en appuyant sur les fl&#xEA;ches haut/bas" name="automatic_fly"/>
-	<text name=" Camera Options:">
+	<check_box label="Permet de s'accroupir en bloquant la touche shift" name="crouch_toggle"/>
-		Options de la caméra:
+	<text name=" Camera Options:">Options de la caméra:</text>
-	</text>
+	<text name="camera_fov_label">Angle de vision:</text>
-	<text name="camera_fov_label">
+	<text name="Camera Follow Distance:">Distance:</text>
-		Angle de vision:
-	</text>
-	<text name="Camera Follow Distance:">
-		Distance:
-	</text>
 	<check_box label="Ajustement automatique en mode Edition" name="edit_camera_movement" tool_tip="Positionne automatiquement la caméra lors de l'entrée ou de la sortie du mode Edition."/>
 	<check_box label="Ajustement automatique en mode Edition d'apparence" name="appearance_camera_movement" tool_tip="Positionne automatiquement la caméra en mode Apparence de l'avatar."/>
-	<check_box bottom_delta="-18" label="Lever l&apos;avatar au reset de la caméra" left="148" name="unsit_on_camera_reset" tool_tip="L&#xE8;ve automatiquement l'avatar quand vous pressez ESC, ainsi la caméra permute en mode troisième personne" width="242"/>
+	<check_box label="Lever l'avatar au reset de la caméra" name="unsit_on_camera_reset" tool_tip="L&#xE8;ve automatiquement l'avatar quand vous pressez ESC, ainsi la caméra permute en mode troisième personne"/>
-	<text name="text2">
+	<check_box label="Désactiver les contraintes de la caméra" name="DisableCameraConstraints" tool_tip=""/>
-		Affichage de l'avatar:
-	</text>
 	<check_box label="Montrer l'avatar en vue subjective" name="first_person_avatar_visible"/>
 	<button label="Configuration du joystick" name="joystick_setup_button" width="175"/>
 </panel>