From 4bf7dd9d529a4e6a0d2132f9587182f483495e23 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Mon, 2 Aug 2010 19:04:32 +0300
Subject: EXT-6542 Localized the "none/none" in the About land floater.

This is an additional fix to the one made in rev. 6788ff579917.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/828/
---
 indra/newview/llpanellandmedia.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp
index f0f386c5d1..240139d714 100644
--- a/indra/newview/llpanellandmedia.cpp
+++ b/indra/newview/llpanellandmedia.cpp
@@ -145,7 +145,7 @@ void LLPanelLandMedia::refresh()
 		mMediaURLEdit->setText(parcel->getMediaURL());
 		mMediaURLEdit->setEnabled( FALSE );
 
-		getChild<LLUICtrl>("current_url")->setValue(parcel->getMediaCurrentURL());
+		childSetText("current_url", parcel->getMediaCurrentURL());
 
 		mMediaDescEdit->setText(parcel->getMediaDesc());
 		mMediaDescEdit->setEnabled( can_change_media );
@@ -157,7 +157,7 @@ void LLPanelLandMedia::refresh()
 		}
 		setMediaType(mime_type);
 		mMediaTypeCombo->setEnabled( can_change_media );
-		getChild<LLUICtrl>("mime_type")->setValue(mime_type);
+		childSetText("mime_type", mime_type);
 
 		mMediaUrlCheck->set( parcel->getObscureMedia() );
 		mMediaUrlCheck->setEnabled( can_change_media );
@@ -255,7 +255,7 @@ void LLPanelLandMedia::setMediaType(const std::string& mime_type)
 		// localizable - "none" for example (see EXT-6542)
 		mime_str = LLMIMETypes::getDefaultMimeTypeTranslation();
 	}
-	getChild<LLUICtrl>("mime_type")->setValue(mime_str);
+	childSetText("mime_type", mime_str);
 }
 
 void LLPanelLandMedia::setMediaURL(const std::string& media_url)
@@ -269,7 +269,7 @@ void LLPanelLandMedia::setMediaURL(const std::string& media_url)
 
 	mMediaURLEdit->onCommit();
 	// LLViewerParcelMedia::sendMediaNavigateMessage(media_url);
-	getChild<LLUICtrl>("current_url")->setValue(media_url);
+	childSetText("current_url", media_url);
 }
 std::string LLPanelLandMedia::getMediaURL()
 {
@@ -280,11 +280,11 @@ std::string LLPanelLandMedia::getMediaURL()
 void LLPanelLandMedia::onCommitType(LLUICtrl *ctrl, void *userdata)
 {
 	LLPanelLandMedia *self = (LLPanelLandMedia *)userdata;
-	std::string current_type = LLMIMETypes::widgetType(self->getChild<LLUICtrl>("mime_type")->getValue().asString());
+	std::string current_type = LLMIMETypes::widgetType(self->childGetText("mime_type"));
 	std::string new_type = self->mMediaTypeCombo->getValue();
 	if(current_type != new_type)
 	{
-		self->getChild<LLUICtrl>("mime_type")->setValue(LLMIMETypes::findDefaultMimeType(new_type));
+		self->childSetText("mime_type", LLMIMETypes::findDefaultMimeType(new_type));
 	}
 	onCommitAny(ctrl, userdata);
 
@@ -304,7 +304,7 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
 	// Extract data from UI
 	std::string media_url	= self->mMediaURLEdit->getText();
 	std::string media_desc	= self->mMediaDescEdit->getText();
-	std::string mime_type	= self->getChild<LLUICtrl>("mime_type")->getValue().asString();
+	std::string mime_type	= self->childGetText("mime_type");
 	U8 media_auto_scale		= self->mMediaAutoScaleCheck->get();
 	U8 media_loop           = self->mMediaLoopCheck->get();
 	U8 obscure_media		= self->mMediaUrlCheck->get();
@@ -313,7 +313,7 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
 	LLUUID media_id			= self->mMediaTextureCtrl->getImageAssetID();
 
 
-	self->getChild<LLUICtrl>("mime_type")->setValue(mime_type);
+	self->childSetText("mime_type", mime_type);
 
 	// Remove leading/trailing whitespace (common when copying/pasting)
 	LLStringUtil::trim(media_url);
@@ -354,7 +354,7 @@ void LLPanelLandMedia::onResetBtn(void *userdata)
 	LLParcel* parcel = self->mParcel->getParcel();
 	// LLViewerMedia::navigateHome();
 	self->refresh();
-	self->getChild<LLUICtrl>("current_url")->setValue(parcel->getMediaURL());
+	self->childSetText("current_url", parcel->getMediaURL());
 	// LLViewerParcelMedia::sendMediaNavigateMessage(parcel->getMediaURL());
 
 }
-- 
cgit v1.2.3


From 7e576a6a66ce0eabf5624c8b2d8d1fa9da1657b8 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 3 Aug 2010 14:59:14 -0700
Subject: CT-575 WIP DE JA ES translation for set16 for Viewer 2.1.1

---
 indra/newview/skins/default/xui/de/floater_preview_gesture.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
index 6d3635fa8d..c3c017ae97 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
@@ -64,7 +64,6 @@
 	</radio_group>
 	<check_box label="bis alle Animationen beendet sind" name="wait_anim_check"/>
 	<check_box label="Zeit in Sekunden:" name="wait_time_check"/>
-	<line_editor name="wait_time_editor"/>
 	<text name="help_label">
 		Alle Schritte werden gleichzeitig ausgeführt, wenn keine Pausen hinzugefügt wurden.
 	</text>
-- 
cgit v1.2.3


From d3f6135dce4b6c9a2e5fa8561718a2e6cb6cf5b1 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Tue, 3 Aug 2010 18:26:47 -0600
Subject: fix for EXT-7399: 2.0.2 with http textures loads textures slower than
 1.23.5 and     EXT-7397: decoding textures get stuck in REQ status

---
 indra/newview/lltexturefetch.cpp | 46 +++++++++++-----------------------------
 indra/newview/lltexturefetch.h   |  1 -
 2 files changed, 12 insertions(+), 35 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 846cba4a3b..63bcdcda2d 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -855,9 +855,9 @@ bool LLTextureFetchWorker::doWork(S32 param)
 			// but probably not for Textures.
 			// Set the throttle to the entire bandwidth, assuming UDP packets will get priority
 			// when they are needed
-			//F32 max_bandwidth = mFetcher->mMaxBandwidth;
-			if (mFetcher->isHTTPThrottled(mDesiredSize))// ||
-				//mFetcher->getTextureBandwidth() > max_bandwidth)
+			F32 max_bandwidth = mFetcher->mMaxBandwidth;
+			if (mFetcher->isHTTPThrottled(mDesiredSize) ||
+				mFetcher->getTextureBandwidth() > max_bandwidth)
 			{
 				// Make normal priority and return (i.e. wait until there is room in the queue)
 				setPriority(LLWorkerThread::PRIORITY_NORMAL | mWorkPriority);
@@ -872,17 +872,10 @@ bool LLTextureFetchWorker::doWork(S32 param)
 				cur_size = mFormattedImage->getDataSize(); // amount of data we already have
 				if (mFormattedImage->getDiscardLevel() == 0)
 				{
-					if(cur_size > 0)
-					{
-						// We already have all the data, just decode it
-						mLoadedDiscard = mFormattedImage->getDiscardLevel();
-						mState = DECODE_IMAGE;
-						return false;
-					}
-					else
-					{
-						return true ; //abort.
-					}
+					// We already have all the data, just decode it
+					mLoadedDiscard = mFormattedImage->getDiscardLevel();
+					mState = DECODE_IMAGE;
+					return false;
 				}
 			}
 			mRequestedSize = mDesiredSize;
@@ -899,7 +892,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
 				mGetReason.clear();
 				LL_DEBUGS("Texture") << "HTTP GET: " << mID << " Offset: " << offset
 									 << " Bytes: " << mRequestedSize
-									 << " Bandwidth(kbps): " << mFetcher->getTextureBandwidth() << "/" << mFetcher->mMaxBandwidth
+									 << " Bandwidth(kbps): " << mFetcher->getTextureBandwidth() << "/" << max_bandwidth
 									 << LL_ENDL;
 				setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
 				mState = WAIT_HTTP_REQ;	
@@ -989,17 +982,6 @@ bool LLTextureFetchWorker::doWork(S32 param)
 				}
 			}
 			
-			llassert_always(mBufferSize == cur_size + mRequestedSize);
-			if(!mBufferSize)//no data received.
-			{
-				delete[] mBuffer; 
-				mBuffer = NULL;
-
-				//abort.
-				mState = DONE;
-				return true;
-			}
-
 			if (mFormattedImage.isNull())
 			{
 				// For now, create formatted image based on extension
@@ -1010,7 +992,8 @@ bool LLTextureFetchWorker::doWork(S32 param)
 					mFormattedImage = new LLImageJ2C; // default
 				}
 			}
-						
+			
+			llassert_always(mBufferSize == cur_size + mRequestedSize);
 			if (mHaveAllData && mRequestedDiscard == 0) //the image file is fully loaded.
 			{
 				mFileSize = mBufferSize;
@@ -1069,12 +1052,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
 		
 		if (mFormattedImage->getDataSize() <= 0)
 		{
-			//llerrs << "Decode entered with invalid mFormattedImage. ID = " << mID << llendl;
-			
-			//abort, don't decode
-			mState = DONE;
-			setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
-			return true;
+			llerrs << "Decode entered with invalid mFormattedImage. ID = " << mID << llendl;
 		}
 		if (mLoadedDiscard < 0)
 		{
@@ -1729,7 +1707,7 @@ bool LLTextureFetch::isHTTPThrottled(S32 requested_size)
 
 	if(mHTTPTextureQueue.size() >= MAX_HTTP_QUEUE_SIZE)//if the http queue is full.
 	{
-		if(!mHTTPThrottleFlag[type + 1])
+		if(!mHTTPThrottleFlag[TOTAL_TEXTURE_TYPES - 1])
 		{
 			for(S32 i = type + 1 ; i < TOTAL_TEXTURE_TYPES; i++) //block all requests with fetching size larger than this request.		
 			{
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index c31c38b04a..bae2ceff72 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -141,7 +141,6 @@ private:
 		SMALL_TEXTURE = 0 , //size <= 64 * 64
 		MEDIUM_TEXTURE,     //size <= 256 * 256
 		LARGE_TEXTURE,      //size > 256 * 256
-		DUMMY,
 		TOTAL_TEXTURE_TYPES
 	};
 	BOOL mHTTPThrottleFlag[TOTAL_TEXTURE_TYPES];
-- 
cgit v1.2.3


From a97af8da85c0996911b935c36594db14ffba0d71 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Wed, 4 Aug 2010 12:51:12 -0700
Subject: CT-575 WIP PT translation for set16 for Viewer 2.1.1

---
 indra/newview/skins/default/xui/fr/strings.xml | 98 +++-----------------------
 1 file changed, 8 insertions(+), 90 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 1204d3325a..c2a0e173ed 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -415,7 +415,7 @@
 		image targa
 	</string>
 	<string name="trash">
-		Corbeille
+		Poubelle
 	</string>
 	<string name="jpeg image">
 		image jpeg
@@ -663,9 +663,6 @@
 	<string name="worldmap_offline">
 		Hors ligne
 	</string>
-	<string name="worldmap_item_tooltip_format">
-		[AREA] m² [PRICE] L$
-	</string>
 	<string name="worldmap_results_none_found">
 		Aucun résultat.
 	</string>
@@ -1064,7 +1061,6 @@
 	<string name="AnimFlagStop" value=" Arrêter l&apos;animation :"/>
 	<string name="AnimFlagStart" value=" Démarrer l&apos;animation :"/>
 	<string name="Wave" value=" Faire signe"/>
-	<string name="GestureActionNone" value="Aucune"/>
 	<string name="HelloAvatar" value=" Bonjour, avatar !"/>
 	<string name="ViewAllGestures" value="  Tout afficher &gt;&gt;"/>
 	<string name="GetMoreGestures" value="Plus &gt;&gt;"/>
@@ -1127,7 +1123,7 @@
 		Parties du corps
 	</string>
 	<string name="InvFolder Trash">
-		Corbeille
+		Poubelle
 	</string>
 	<string name="InvFolder Photo Album">
 		Albums photo
@@ -1147,12 +1143,12 @@
 	<string name="InvFolder Favorite">
 		Favoris
 	</string>
+	<string name="InvFolder favorite">
+		Favoris
+	</string>
 	<string name="InvFolder Current Outfit">
 		Tenue actuelle
 	</string>
-	<string name="InvFolder Initial Outfits">
-		Tenues initiales
-	</string>
 	<string name="InvFolder My Outfits">
 		Mes tenues
 	</string>
@@ -1472,7 +1468,6 @@
 	<string name="SummaryForTheWeek" value="Récapitulatif de la semaine, début le "/>
 	<string name="NextStipendDay" value="Prochaine prime le "/>
 	<string name="GroupIndividualShare" value="                      Groupe    Part individuelle"/>
-	<string name="GroupColumn" value="Groupe"/>
 	<string name="Balance">
 		Solde
 	</string>
@@ -1692,12 +1687,6 @@
 	<string name="BusyModeResponseDefault">
 		Le résident auquel vous avez envoyé un message est en mode Occupé, ce qui signifie qu&apos;il a demandé à ne pas être dérangé.  Votre message restera affiché dans son panneau IM afin qu&apos;il puisse le lire ultérieurement.
 	</string>
-	<string name="NoOutfits">
-		Aucune tenue n&apos;est actuellement en votre possession. Essayez [secondlife:///app/search/all Rechercher].
-	</string>
-	<string name="NoOutfitsTabsMatched">
-		Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/all/Rechercher [SEARCH_TERM]].
-	</string>
 	<string name="MuteByName">
 		(par nom)
 	</string>
@@ -3687,9 +3676,6 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="group_role_owners">
 		Propriétaires
 	</string>
-	<string name="group_member_status_online">
-		En ligne
-	</string>
 	<string name="uploading_abuse_report">
 		Chargement en cours... 
 
@@ -3743,15 +3729,9 @@ de l&apos;infraction signalée
 	<string name="Invalid Wearable">
 		Objet à porter non valide
 	</string>
-	<string name="New Gesture">
-		Nouveau geste
-	</string>
 	<string name="New Script">
 		Nouveau script
 	</string>
-	<string name="New Note">
-		Nouvelle note
-	</string>
 	<string name="New Folder">
 		Nouveau dossier
 	</string>
@@ -3780,7 +3760,7 @@ de l&apos;infraction signalée
 		Homme - Demander pardon
 	</string>
 	<string name="Male - Get lost">
-		Homme - Get lost
+		Homme - Dire d&apos;aller au diable
 	</string>
 	<string name="Male - Blow kiss">
 		Homme - Envoyer un baiser
@@ -3809,20 +3789,11 @@ de l&apos;infraction signalée
 	<string name="Male - Wow">
 		Homme - Ouah !
 	</string>
-	<string name="Female - Chuckle">
-		Femme - Glousser
-	</string>
-	<string name="Female - Cry">
-		Femme - Pleurer
-	</string>
-	<string name="Female - Embarrassed">
-		Femme - Gêne
-	</string>
 	<string name="Female - Excuse me">
 		Femme - Demander pardon
 	</string>
 	<string name="Female - Get lost">
-		Femme - Get lost
+		Femme - Dire d&apos;aller au diable
 	</string>
 	<string name="Female - Blow kiss">
 		Femme - Envoyer un baiser
@@ -3836,21 +3807,9 @@ de l&apos;infraction signalée
 	<string name="Female - Hey">
 		Femme - Hé !
 	</string>
-	<string name="Female - Hey baby">
-		Femme - Hey baby
-	</string>
 	<string name="Female - Laugh">
 		Femme - Rire
 	</string>
-	<string name="Female - Looking good">
-		Femme - Looking good
-	</string>
-	<string name="Female - Over here">
-		Femme - Over here
-	</string>
-	<string name="Female - Please">
-		Femme - Please
-	</string>
 	<string name="Female - Repulsed">
 		Femme - Dégoût
 	</string>
@@ -3900,46 +3859,5 @@ de l&apos;infraction signalée
 	<string name="dateTimePM">
 		PM
 	</string>
-	<string name="LocalEstimateUSD">
-		[AMOUNT] US$
-	</string>
-	<string name="Membership">
-		Inscription
-	</string>
-	<string name="Roles">
-		Rôles
-	</string>
-	<string name="Group Identity">
-		Identité du groupe
-	</string>
-	<string name="Parcel Management">
-		Gestion des parcelles
-	</string>
-	<string name="Parcel Identity">
-		Identité des parcelles
-	</string>
-	<string name="Parcel Settings">
-		Paramètres des parcelles
-	</string>
-	<string name="Parcel Powers">
-		Pouvoirs sur les parcelles
-	</string>
-	<string name="Parcel Access">
-		Accès aux parcelles
-	</string>
-	<string name="Parcel Content">
-		Contenu des parcelles
-	</string>
-	<string name="Object Management">
-		Gestion des objets
-	</string>
-	<string name="Accounting">
-		Comptabilité
-	</string>
-	<string name="Notices">
-		Notices
-	</string>
-	<string name="Chat">
-		Chat
-	</string>
+	<string name="LocalEstimateUSD">[AMOUNT] US$</string> 
 </strings>
-- 
cgit v1.2.3


From 96ae6ecc0a374b90e61dd4101655c900cb83d773 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Wed, 4 Aug 2010 15:35:13 -0700
Subject: CT-575 WIP FR translation for set16 for Viewer 2.1.1

---
 .../default/xui/fr/floater_preview_gesture.xml     |  4 +-
 .../newview/skins/default/xui/fr/notifications.xml |  2 +-
 .../skins/default/xui/fr/panel_group_notices.xml   |  2 +-
 .../skins/default/xui/fr/panel_nearby_media.xml    |  2 +-
 indra/newview/skins/default/xui/fr/strings.xml     | 90 +++++++++++++++++++++-
 5 files changed, 91 insertions(+), 9 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
index 82f5bac047..e7c7385fc8 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
@@ -13,13 +13,13 @@
 		Attendre :
 	</floater.string>
 	<floater.string name="stop_txt">
-		Arrêter
+		Stop
 	</floater.string>
 	<floater.string name="preview_txt">
 		Prévisualiser
 	</floater.string>
 	<floater.string name="none_text">
-		- Aucun choix -
+		-- Aucune --
 	</floater.string>
 	<floater.string name="Title">
 		Geste : [NAME]
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index c1321b71ea..6cfc2b5c66 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -1683,7 +1683,7 @@ Publier cette petite annonce maintenant pour [AMOUNT] L$ ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification label="Envoyer un message à la région" name="MessageRegion">
-		Saisissez un message qui sera envoyé à tous les résidents présents dans cette région.
+		Saisissez une message qui sera envoyé à tous les résidents présents dans cette région.
 		<form name="form">
 			<input name="message"/>
 			<button name="OK" text="OK"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
index 3364dd9dbc..bcf2cc8ec9 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
@@ -21,7 +21,7 @@ Vous pouvez désactiver la réception des notices dans l&apos;onglet Général.
 	<text name="notice_list_none_found">
 		Aucun résultat
 	</text>
-	<button label="Nouv. notice" label_selected="Créer une notice" name="create_new_notice" tool_tip="Créer une notice"/>
+	<button label="Nouvelle notice" label_selected="Créer une notice" name="create_new_notice" tool_tip="Créer une notice"/>
 	<button label="Rafraîchir" label_selected="Rafraîchir la liste" name="refresh_notices" tool_tip="Actualiser la liste des notices"/>
 	<panel label="Créer une notice" name="panel_create_new_notice">
 		<text name="lbl">
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
index 66bfd01a2a..d19a477007 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
@@ -27,7 +27,7 @@
 			Médias proches
 		</text>
 		<text name="show_text">
-			Voir :
+			Afficher :
 		</text>
 		<combo_box name="show_combo">
 			<combo_box.item label="Tout" name="All"/>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index c2a0e173ed..6cab902ab6 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -663,6 +663,9 @@
 	<string name="worldmap_offline">
 		Hors ligne
 	</string>
+	<string name="worldmap_item_tooltip_format">
+		[AREA] m² [PRICE] L$
+	</string>
 	<string name="worldmap_results_none_found">
 		Aucun résultat.
 	</string>
@@ -1061,6 +1064,7 @@
 	<string name="AnimFlagStop" value=" Arrêter l&apos;animation :"/>
 	<string name="AnimFlagStart" value=" Démarrer l&apos;animation :"/>
 	<string name="Wave" value=" Faire signe"/>
+	<string name="GestureActionNone" value="Aucune"/>
 	<string name="HelloAvatar" value=" Bonjour, avatar !"/>
 	<string name="ViewAllGestures" value="  Tout afficher &gt;&gt;"/>
 	<string name="GetMoreGestures" value="Plus &gt;&gt;"/>
@@ -1143,12 +1147,12 @@
 	<string name="InvFolder Favorite">
 		Favoris
 	</string>
-	<string name="InvFolder favorite">
-		Favoris
-	</string>
 	<string name="InvFolder Current Outfit">
 		Tenue actuelle
 	</string>
+	<string name="InvFolder Initial Outfits">
+		Tenues initiales
+	</string>
 	<string name="InvFolder My Outfits">
 		Mes tenues
 	</string>
@@ -1468,6 +1472,7 @@
 	<string name="SummaryForTheWeek" value="Récapitulatif de la semaine, début le "/>
 	<string name="NextStipendDay" value="Prochaine prime le "/>
 	<string name="GroupIndividualShare" value="                      Groupe    Part individuelle"/>
+	<string name="GroupColumn" value="Groupe"/>
 	<string name="Balance">
 		Solde
 	</string>
@@ -1687,6 +1692,12 @@
 	<string name="BusyModeResponseDefault">
 		Le résident auquel vous avez envoyé un message est en mode Occupé, ce qui signifie qu&apos;il a demandé à ne pas être dérangé.  Votre message restera affiché dans son panneau IM afin qu&apos;il puisse le lire ultérieurement.
 	</string>
+	<string name="NoOutfits">
+		Aucune tenue n&apos;est actuellement en votre possession. Essayez [secondlife:///app/search/all Rechercher].
+	</string>
+	<string name="NoOutfitsTabsMatched">
+		Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/all/Rechercher [SEARCH_TERM]].
+	</string>
 	<string name="MuteByName">
 		(par nom)
 	</string>
@@ -3676,6 +3687,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="group_role_owners">
 		Propriétaires
 	</string>
+	<string name="group_member_status_online">
+		En ligne
+	</string>
 	<string name="uploading_abuse_report">
 		Chargement en cours... 
 
@@ -3729,9 +3743,15 @@ de l&apos;infraction signalée
 	<string name="Invalid Wearable">
 		Objet à porter non valide
 	</string>
+	<string name="New Gesture">
+		Nouveau geste
+	</string>
 	<string name="New Script">
 		Nouveau script
 	</string>
+	<string name="New Note">
+		Nouvelle note
+	</string>
 	<string name="New Folder">
 		Nouveau dossier
 	</string>
@@ -3789,6 +3809,15 @@ de l&apos;infraction signalée
 	<string name="Male - Wow">
 		Homme - Ouah !
 	</string>
+	<string name="Female - Chuckle">
+		Femme - Glousser
+	</string>
+	<string name="Female - Cry">
+		Femme - Pleurer
+	</string>
+	<string name="Female - Embarrassed">
+		Femme - Gêne
+	</string>
 	<string name="Female - Excuse me">
 		Femme - Demander pardon
 	</string>
@@ -3807,9 +3836,21 @@ de l&apos;infraction signalée
 	<string name="Female - Hey">
 		Femme - Hé !
 	</string>
+	<string name="Female - Hey baby">
+		Femme - Hey baby
+	</string>
 	<string name="Female - Laugh">
 		Femme - Rire
 	</string>
+	<string name="Female - Looking good">
+		Femme - Looking good
+	</string>
+	<string name="Female - Over here">
+		Femme - Over here
+	</string>
+	<string name="Female - Please">
+		Femme - Please
+	</string>
 	<string name="Female - Repulsed">
 		Femme - Dégoût
 	</string>
@@ -3859,5 +3900,46 @@ de l&apos;infraction signalée
 	<string name="dateTimePM">
 		PM
 	</string>
-	<string name="LocalEstimateUSD">[AMOUNT] US$</string> 
+	<string name="LocalEstimateUSD">
+		[AMOUNT] US$
+	</string>
+	<string name="Membership">
+		Inscription
+	</string>
+	<string name="Roles">
+		Rôles
+	</string>
+	<string name="Group Identity">
+		Identité du groupe
+	</string>
+	<string name="Parcel Management">
+		Gestion des parcelles
+	</string>
+	<string name="Parcel Identity">
+		Identité des parcelles
+	</string>
+	<string name="Parcel Settings">
+		Paramètres des parcelles
+	</string>
+	<string name="Parcel Powers">
+		Pouvoirs sur les parcelles
+	</string>
+	<string name="Parcel Access">
+		Accès aux parcelles
+	</string>
+	<string name="Parcel Content">
+		Contenu des parcelles
+	</string>
+	<string name="Object Management">
+		Gestion des objets
+	</string>
+	<string name="Accounting">
+		Comptabilité
+	</string>
+	<string name="Notices">
+		Notices
+	</string>
+	<string name="Chat">
+		Chat
+	</string>
 </strings>
-- 
cgit v1.2.3


From bb69ec1c5681d940c5dce6c4703c89243dfb2427 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 4 Aug 2010 21:13:11 +0300
Subject: EXT-7511 FIXED Fixed item selection cropping in Edit Outfit

Restored changeset which was lost after merge 58571b4e704b.

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/780/
---
 indra/newview/llinventorylistitem.cpp | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llinventorylistitem.cpp b/indra/newview/llinventorylistitem.cpp
index b1f5b3be2f..2546390fcb 100644
--- a/indra/newview/llinventorylistitem.cpp
+++ b/indra/newview/llinventorylistitem.cpp
@@ -237,17 +237,6 @@ const std::string& LLPanelInventoryListItemBase::getDescription() const
 	return inv_item->getDescription();
 }
 
-time_t LLPanelInventoryListItemBase::getCreationDate() const
-{
-	LLViewerInventoryItem* inv_item = getItem();
-	if (NULL == inv_item)
-	{
-		return 0;
-	}
-
-	return inv_item->getCreationDate();
-}
-
 LLViewerInventoryItem* LLPanelInventoryListItemBase::getItem() const
 {
 	return gInventory.getItem(mInventoryItemUUID);
-- 
cgit v1.2.3


From 9c038eab0a03be8e8510ea4044de2df56cb5ed9e Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 5 Aug 2010 11:04:56 -0700
Subject: CT-575 WIP IT translation for set16 for Viewer 2.1.1

---
 indra/newview/skins/default/xui/it/floater_preview_gesture.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
index 7e29db6336..9c4006b4e6 100644
--- a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
@@ -30,15 +30,15 @@
 	<text name="trigger_label">
 		Parole chiave:
 	</text>
-	<text name="replace_text" tool_tip="Sostituisci le parole chiave con questi termini. Per esempio, sostituire la parola chiave &apos;salve&apos; con &apos;ciao&apos; modificherà la chat &apos;Volevo solo dire salve&apos; in &apos;Volevo solo dire ciao&apos; e avvierà la gesture!">
+	<text left="208" name="replace_text" tool_tip="Sostituisci le parole chiave con questi termini. Per esempio, sostituire la parola chiave &apos;salve&apos; con &apos;ciao&apos; modificherà la chat &apos;Volevo solo dire salve&apos; in &apos;Volevo solo dire ciao&apos; e avvierà la gesture!">
 		Sostituisci con:
 	</text>
 	<line_editor name="replace_editor" tool_tip="Sostituisci le parole chiave con questi termini. Per esempio, sostituire la parola chiave &apos;salve&apos; con &apos;ciao&apos; modificherà la chat &apos;Volevo solo dire salve&apos; in &apos;Volevo solo dire ciao&apos; e avvierà la gesture!"/>
 	<text name="key_label">
 		Scorciatoia da tastiera:
 	</text>
-	<combo_box label="Nessuno" name="modifier_combo" />
-	<combo_box label="Nessuno" name="key_combo" />
+	<combo_box label="Nessuno" left="156" name="modifier_combo" width="76"/>
+	<combo_box label="Nessuno" left_delta="80" name="key_combo" width="76"/>
 	<text name="library_label">
 		Libreria:
 	</text>
@@ -62,9 +62,9 @@
 		<radio_item label="Attiva" name="start"/>
 		<radio_item label="Ferma" name="stop"/>
 	</radio_group>
-	<check_box label="finché le animazioni sono eseguite" name="wait_anim_check"/>
+	<check_box label="finché le animazioni sono eseguite" left="226" name="wait_anim_check"/>
 	<check_box label="durata in secondi:" name="wait_time_check"/>
-	<line_editor name="wait_time_editor"/>
+	<line_editor left_delta="114" name="wait_time_editor"/>
 	<text name="help_label">
 		Tutte le fasi avvengono contemporaneamente, a meno che non aggiungi fasi di attesa.
 	</text>
-- 
cgit v1.2.3


From 5ae6fcb94340f72ad14d99cc4fb9afd2431ced45 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 6 Aug 2010 11:17:45 -0700
Subject: CT-575 WIP FR linguistic

---
 indra/newview/skins/default/xui/fr/floater_preview_gesture.xml | 4 ++--
 indra/newview/skins/default/xui/fr/panel_nearby_media.xml      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
index e7c7385fc8..82f5bac047 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
@@ -13,13 +13,13 @@
 		Attendre :
 	</floater.string>
 	<floater.string name="stop_txt">
-		Stop
+		Arrêter
 	</floater.string>
 	<floater.string name="preview_txt">
 		Prévisualiser
 	</floater.string>
 	<floater.string name="none_text">
-		-- Aucune --
+		- Aucun choix -
 	</floater.string>
 	<floater.string name="Title">
 		Geste : [NAME]
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
index d19a477007..66bfd01a2a 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
@@ -27,7 +27,7 @@
 			Médias proches
 		</text>
 		<text name="show_text">
-			Afficher :
+			Voir :
 		</text>
 		<combo_box name="show_combo">
 			<combo_box.item label="Tout" name="All"/>
-- 
cgit v1.2.3


From c815848ceed857dbc240e35693d44714004af18b Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 9 Aug 2010 15:06:26 -0700
Subject: CT-575 WIP PL global edit part 1/2; PL DA set 16 translation for
 2.1.1; FR linguistic

---
 indra/newview/skins/default/xui/fr/notifications.xml       | 2 +-
 indra/newview/skins/default/xui/fr/panel_group_notices.xml | 2 +-
 indra/newview/skins/default/xui/fr/strings.xml             | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 6cfc2b5c66..c1321b71ea 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -1683,7 +1683,7 @@ Publier cette petite annonce maintenant pour [AMOUNT] L$ ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification label="Envoyer un message à la région" name="MessageRegion">
-		Saisissez une message qui sera envoyé à tous les résidents présents dans cette région.
+		Saisissez un message qui sera envoyé à tous les résidents présents dans cette région.
 		<form name="form">
 			<input name="message"/>
 			<button name="OK" text="OK"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
index bcf2cc8ec9..3364dd9dbc 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
@@ -21,7 +21,7 @@ Vous pouvez désactiver la réception des notices dans l&apos;onglet Général.
 	<text name="notice_list_none_found">
 		Aucun résultat
 	</text>
-	<button label="Nouvelle notice" label_selected="Créer une notice" name="create_new_notice" tool_tip="Créer une notice"/>
+	<button label="Nouv. notice" label_selected="Créer une notice" name="create_new_notice" tool_tip="Créer une notice"/>
 	<button label="Rafraîchir" label_selected="Rafraîchir la liste" name="refresh_notices" tool_tip="Actualiser la liste des notices"/>
 	<panel label="Créer une notice" name="panel_create_new_notice">
 		<text name="lbl">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 6cab902ab6..1204d3325a 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -415,7 +415,7 @@
 		image targa
 	</string>
 	<string name="trash">
-		Poubelle
+		Corbeille
 	</string>
 	<string name="jpeg image">
 		image jpeg
@@ -1127,7 +1127,7 @@
 		Parties du corps
 	</string>
 	<string name="InvFolder Trash">
-		Poubelle
+		Corbeille
 	</string>
 	<string name="InvFolder Photo Album">
 		Albums photo
@@ -3780,7 +3780,7 @@ de l&apos;infraction signalée
 		Homme - Demander pardon
 	</string>
 	<string name="Male - Get lost">
-		Homme - Dire d&apos;aller au diable
+		Homme - Get lost
 	</string>
 	<string name="Male - Blow kiss">
 		Homme - Envoyer un baiser
@@ -3822,7 +3822,7 @@ de l&apos;infraction signalée
 		Femme - Demander pardon
 	</string>
 	<string name="Female - Get lost">
-		Femme - Dire d&apos;aller au diable
+		Femme - Get lost
 	</string>
 	<string name="Female - Blow kiss">
 		Femme - Envoyer un baiser
-- 
cgit v1.2.3


From 73b9d9115411cd1f3c5b1f322b8bd7d7df4749ac Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Mon, 9 Aug 2010 17:07:34 -0600
Subject: EXT-8596: FIXED: crash at LLTextureFetchWorker::doWork(int)
 [secondlife-bin lltexturefetch.cpp] line 1061

---
 indra/newview/lltexturefetch.cpp | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 63bcdcda2d..45a36dc545 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -872,10 +872,17 @@ bool LLTextureFetchWorker::doWork(S32 param)
 				cur_size = mFormattedImage->getDataSize(); // amount of data we already have
 				if (mFormattedImage->getDiscardLevel() == 0)
 				{
-					// We already have all the data, just decode it
-					mLoadedDiscard = mFormattedImage->getDiscardLevel();
-					mState = DECODE_IMAGE;
-					return false;
+					if(cur_size > 0)
+					{
+						// We already have all the data, just decode it
+						mLoadedDiscard = mFormattedImage->getDiscardLevel();
+						mState = DECODE_IMAGE;
+						return false;
+					}
+					else
+					{
+						return true ; //abort.
+					}
 				}
 			}
 			mRequestedSize = mDesiredSize;
@@ -982,6 +989,17 @@ bool LLTextureFetchWorker::doWork(S32 param)
 				}
 			}
 			
+			llassert_always(mBufferSize == cur_size + mRequestedSize);
+			if(!mBufferSize)//no data received.
+			{
+				delete[] mBuffer; 
+				mBuffer = NULL;
+
+				//abort.
+				mState = DONE;
+				return true;
+			}
+
 			if (mFormattedImage.isNull())
 			{
 				// For now, create formatted image based on extension
@@ -992,8 +1010,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
 					mFormattedImage = new LLImageJ2C; // default
 				}
 			}
-			
-			llassert_always(mBufferSize == cur_size + mRequestedSize);
+						
 			if (mHaveAllData && mRequestedDiscard == 0) //the image file is fully loaded.
 			{
 				mFileSize = mBufferSize;
@@ -1052,7 +1069,12 @@ bool LLTextureFetchWorker::doWork(S32 param)
 		
 		if (mFormattedImage->getDataSize() <= 0)
 		{
-			llerrs << "Decode entered with invalid mFormattedImage. ID = " << mID << llendl;
+			//llerrs << "Decode entered with invalid mFormattedImage. ID = " << mID << llendl;
+			
+			//abort, don't decode
+			mState = DONE;
+			setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
+			return true;
 		}
 		if (mLoadedDiscard < 0)
 		{
-- 
cgit v1.2.3


From 6867e1135127eb1f1fac19303161b9ee7039e5cd Mon Sep 17 00:00:00 2001
From: Dessie Linden <dessie@lindenlab.com>
Date: Wed, 11 Aug 2010 11:14:59 -0700
Subject: Updated viewer patch number & channel

---
 indra/newview/English.lproj/InfoPlist.strings | 4 ++--
 indra/newview/Info-SecondLife.plist           | 2 +-
 indra/newview/res/viewerRes.rc                | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index fc531f93d4..5c7cacedec 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -2,6 +2,6 @@
 
 CFBundleName = "Second Life";
 
-CFBundleShortVersionString = "Second Life version 2.1.0.0";
-CFBundleGetInfoString = "Second Life version 2.1.0.0, Copyright 2004-2009 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 2.1.0.13828";
+CFBundleGetInfoString = "Second Life version 2.1.0.13828, Copyright 2004-2009 Linden Research, Inc.";
 
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 9bc95f9b95..f7b11b217c 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -60,7 +60,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.1.0.0</string>
+	<string>2.1.0.13828</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index df2fb2a6ea..9bafc28705 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -129,8 +129,8 @@ TOOLSIT                 CURSOR                  "toolsit.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,0,0
- PRODUCTVERSION 2,1,0,0
+ FILEVERSION 2,1,0,13828
+ PRODUCTVERSION 2,1,0,13828
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -147,12 +147,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "2.1.0.0"
+            VALUE "FileVersion", "2.1.0.13828"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "2.1.0.0"
+            VALUE "ProductVersion", "2.1.0.13828"
         END
     END
     BLOCK "VarFileInfo"
-- 
cgit v1.2.3