Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 RC5 secu-fix to 1.21.6 release.

15 files changed, 42 insertions, 26 deletions

diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index ab182b8b5d..092eadd303 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -34,7 +34,7 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 21;
-const S32 LL_VERSION_PATCH = 5;
+const S32 LL_VERSION_PATCH = 6;
 const S32 LL_VERSION_BUILD = 100000;
 
 const char * const LL_CHANNEL = "Second Life Release";
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 275cc65976..ebfdda3027 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -88,8 +88,7 @@ struct SortScrollListItem
 			}
 		}
 
-		// make sure to keep order when sort_result == 0 
-		return sort_result <= 0;
+		return sort_result < 0;
 	}
 
 	typedef std::vector<std::pair<S32, BOOL> > sort_order_t;
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp
index 49862e8112..d263569752 100644
--- a/indra/newview/lleventpoll.cpp
+++ b/indra/newview/lleventpoll.cpp
@@ -224,7 +224,12 @@ namespace
 			// IMs, teleports, about land, selecing land, region crossing and more will all fail.
 			// They are essentially disconnected from the region even though some things may still work.
 			// Since things won't get better until they relog we force a disconnect now.
-			LLAppViewer::instance()->forceDisconnect("You have been disconnected from the region you were in.");
+
+			// *NOTE:Mani - This force disconnect was causing logouts even when disconnected
+			// from neighboring regions.
+			// *FIX:Mani We may want to re enable forceDisconnect for the agents main region.  
+			// *FIX:Mani If reimplemting Translate!!!!
+			// LLAppViewer::instance()->forceDisconnect("You have been disconnected from the region you were in.");
 		}
 	}
 
diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp
index 1a8c35b837..af42a92ed8 100644
--- a/indra/newview/llfloaterdaycycle.cpp
+++ b/indra/newview/llfloaterdaycycle.cpp
@@ -109,7 +109,6 @@ void LLFloaterDayCycle::onClickHelp(void* data)
 			root_floater->addDependentFloater(dialogp);
 		}
 	}
-	delete xml_alert;
 }
 
 void LLFloaterDayCycle::initHelpBtn(const std::string& name, const std::string& xml_alert)
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index e5193b8314..737a2afbb7 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -542,7 +542,6 @@ void LLPanelRegionInfo::onClickHelp(void* data)
 {
 	const std::string* xml_alert = (std::string*)data;
 	gViewerWindow->alertXml(*xml_alert);
-	delete xml_alert;
 }
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index aac453b13e..da435c9452 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -389,21 +389,36 @@ void LLFloaterReporter::onClickSend(void *userdata)
 		// only show copyright alert for abuse reports
 		if ( self->mReportType != BUG_REPORT )
 		{
+			const int IP_CONTENT_REMOVAL = 66;
+			const int IP_PERMISSONS_EXPLOIT = 37;
+			LLComboBox* combo = self->getChild<LLComboBox>( "category_combo");
+			int category_value = combo->getSelectedValue().asInteger(); 
+
 			if ( ! self->mCopyrightWarningSeen )
 			{
+
 				std::string details_lc = self->childGetText("details_edit");
 				LLStringUtil::toLower( details_lc );
 				std::string summary_lc = self->childGetText("summary_edit");
 				LLStringUtil::toLower( summary_lc );
 				if ( details_lc.find( "copyright" ) != std::string::npos ||
-					summary_lc.find( "copyright" ) != std::string::npos )
+					summary_lc.find( "copyright" ) != std::string::npos  ||
+					category_value == IP_CONTENT_REMOVAL ||
+					category_value == IP_PERMISSONS_EXPLOIT)
 				{
 					gViewerWindow->alertXml("HelpReportAbuseContainsCopyright");
 					self->mCopyrightWarningSeen = TRUE;
 					return;
-				};
-			};
-		};
+				}
+			}
+			else if (category_value == IP_CONTENT_REMOVAL)
+			{
+				// IP_CONTENT_REMOVAL *always* shows the dialog - 
+				// ergo you can never send that abuse report type.
+				gViewerWindow->alertXml("HelpReportAbuseContainsCopyright");
+				return;
+			}
+		}
 
 		LLUploadDialog::modalUploadDialog("Uploading...\n\nReport");
 		// *TODO don't upload image if checkbox isn't checked
diff --git a/indra/newview/llfloaterwater.cpp b/indra/newview/llfloaterwater.cpp
index c540a0b37c..4705b2f5ba 100644
--- a/indra/newview/llfloaterwater.cpp
+++ b/indra/newview/llfloaterwater.cpp
@@ -185,7 +185,6 @@ void LLFloaterWater::onClickHelp(void* data)
 			root_floater->addDependentFloater(dialogp);
 		}
 	}
-	delete xml_alert;
 }
 
 void LLFloaterWater::initHelpBtn(const std::string& name, const std::string& xml_alert)
diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp
index f03579a97b..4e27774029 100644
--- a/indra/newview/llfloaterwindlight.cpp
+++ b/indra/newview/llfloaterwindlight.cpp
@@ -243,7 +243,6 @@ void LLFloaterWindLight::onClickHelp(void* data)
 			root_floater->addDependentFloater(dialogp);
 		}
 	}		
-	delete xml_alert;
 }
 
 void LLFloaterWindLight::initHelpBtn(const std::string& name, const std::string& xml_alert)
diff --git a/indra/newview/skins/default/xui/fr/floater_gesture.xml b/indra/newview/skins/default/xui/fr/floater_gesture.xml
index 9c55f505d2..d45d3e76f2 100644
--- a/indra/newview/skins/default/xui/fr/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_gesture.xml
@@ -5,10 +5,10 @@
 et les sons.

 	</text>

 	<scroll_list bottom_delta="-385" height="360" name="gesture_list">

-		<column label="Raccourci" name="trigger" width="75" />

+		<column label="Déclencheur" name="trigger" width="85" />

 		<column label="Touche" name="shortcut" />

 		<column label="" name="key" />

-		<column label="Nom" name="name" />

+		<column label="Nom" name="name" width="145"/>

 	</scroll_list>

 	<button label="Nouveau" name="new_gesture_btn" />

 	<button label="Inventaire" name="inventory_btn" />

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 ee2fd186dc..e8441ea6b9 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
@@ -13,7 +13,7 @@
 		Description :

 	</text>

 	<text name="trigger_label">

-		Raccourci :

+		Déclencheur :

 	</text>

 	<text name="replace_text"

 	     tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste.">

diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml
index 61eb9edc60..16e9890a80 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml
@@ -46,8 +46,8 @@ Pour obtenir de l&apos;aide, survolez les options avec votre souris.
 	</text>

 	<name_list name="visible_members">

 		<column label="Nom du membre" name="name" relwidth="0.40"/>

-		<column label="Titre" name="title" relwidth="0.30"/>

-		<column label="Dernière connexion" name="online" relwidth="0.30"/>

+		<column label="Titre" name="title" relwidth="0.25"/>

+		<column label="Dernière connexion" name="online" relwidth="0.35"/>

 	</name_list>

 	<text name="text_group_preferences">

 		Préférences du groupe

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 fa93f7a09b..a0658399de 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
@@ -50,9 +50,10 @@ dossiers.
 		<text name="lbl5">

 			Attacher :

 		</text>

+		<line_editor name="create_inventory_name" width="206" />

 		<button label="Supprimer pièce-jointe" label_selected="Supprimer pièce-jointe"

-		     name="remove_attachment" />

-		<button label="Envoyer note" label_selected="Envoyer note" name="send_notice" />

+		     name="remove_attachment" left="274" width="140"/>

+		<button label="Envoyer note" label_selected="Envoyer note" name="send_notice" left="274" width="140"/>

 		<panel name="drop_target2"

 		     tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." />

 		<panel name="drop_target"

diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
index 1bcdd2fd1d..ab32917054 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
@@ -55,8 +55,8 @@ quels membres ces pouvoirs sont assignés.
 			<button label="Afficher tout" name="show_all_button" left_delta="80" />

 			<name_list name="member_list" height="104" bottom_delta="-105">

 				<column label="Nom du membre" name="name" />

-				<column label="Terrain donné" name="donated" />

-				<column label="Dernière connexion" name="online" />

+				<column label="Terrain donné" name="donated" width="116"/>

+				<column label="Dernière connexion" name="online" width="136"/>

 			</name_list>

 			<button label="Inviter nouvelle personne..." name="member_invite" width="165"/>

 			<button label="Expulser du groupe" name="member_eject" />

diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index e6e77265fa..34d3bda81c 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -23,11 +23,11 @@
 	</combo_box>

 	<check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox" />

 	<text name="group_titles_textbox">

-		Titres au sein du groupe :

+		Titres de groupe :

 	</text>

-	<check_box label="Masquer tous les titres au sein du groupe"

+	<check_box label="Masquer tous les titres de groupe"

 	     name="show_all_title_checkbox" />

-	<check_box label="Masquer mon titre au sein du groupe" name="show_my_title_checkbox" />

+	<check_box label="Masquer mon titre de groupe" name="show_my_title_checkbox" />

 	<check_box label="Nom de l&apos;avatar en petit" name="small_avatar_names_checkbox" />

 	<check_box label="M&apos;avertir lorsque mes amis se connectent"

 	     name="friends_online_notify_checkbox" />

diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index dc92be87af..0c4b625cbf 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -259,7 +259,7 @@
 		Mépris

 	</string>

 	<string name="anim_drink">

-		Verre

+		Boire

 	</string>

 	<string name="anim_express_embarrased">

 		Gêne

@@ -379,7 +379,7 @@
 		Tirer la langue

 	</string>

 	<string name="anim_hello">

-		Vague

+		Faire signe

 	</string>

 	<string name="anim_whisper">

 		Chuchoter