Merge with viewer-2-0

19 files changed, 95 insertions, 74 deletions

diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 85ae13a889..30fc7babae 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -1649,7 +1649,7 @@ void LLTabContainer::reshapeTuple(LLTabTuple* tuple)
 		if(mCustomIconCtrlUsed)
 		{
 			LLCustomButtonIconCtrl* button = dynamic_cast<LLCustomButtonIconCtrl*>(tuple->mButton);
-			LLIconCtrl* icon_ctrl = button->getIconCtrl();
+			LLIconCtrl* icon_ctrl = button ? button->getIconCtrl() : NULL;
 			image_overlay_width = icon_ctrl ? icon_ctrl->getRect().getWidth() : 0;
 		}
 		else
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 71df064236..5c21be8c32 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -528,22 +528,29 @@ public:
 		LLViewerInventoryItem *item = gInventory.getItem(item_id);
 		LLViewerInventoryItem *linked_item = item ? item->getLinkedItem() : NULL;
 
-		gInventory.addChangedMask(LLInventoryObserver::LABEL, linked_item->getUUID());
-			
-		if (item && linked_item)
+		if (linked_item)
 		{
-			LLFoundData found(linked_item->getUUID(),
-							  linked_item->getAssetUUID(),
-							  linked_item->getName(),
-							  linked_item->getType(),
-							  linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID
-				);
-			found.mWearable = mWearable;
-			mHolder->mFoundList.push_front(found);
+			gInventory.addChangedMask(LLInventoryObserver::LABEL, linked_item->getUUID());
+			
+			if (item)
+			{
+				LLFoundData found(linked_item->getUUID(),
+						  linked_item->getAssetUUID(),
+						  linked_item->getName(),
+						  linked_item->getType(),
+						  linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID
+						  );
+				found.mWearable = mWearable;
+				mHolder->mFoundList.push_front(found);
+			}
+			else
+			{
+				llwarns << "inventory item not found for recovered wearable" << llendl;
+			}
 		}
 		else
 		{
-			llwarns << "inventory item or link not found for recovered wearable" << llendl;
+			llwarns << "inventory link not found for recovered wearable" << llendl;
 		}
 	}
 private:
@@ -568,12 +575,16 @@ public:
 		mWearable->setItemID(item_id);
 		LLPointer<LLInventoryCallback> cb = new RecoveredItemLinkCB(mType,mWearable,mHolder);
 		mHolder->mTypesToRecover.erase(mType);
-		link_inventory_item( gAgent.getID(),
-							 item_id,
-							 LLAppearanceManager::instance().getCOF(),
-							 itemp->getName(),
-							 LLAssetType::AT_LINK,
-							 cb);
+		llassert(itemp);
+		if (itemp)
+		{
+			link_inventory_item( gAgent.getID(),
+					     item_id,
+					     LLAppearanceManager::instance().getCOF(),
+					     itemp->getName(),
+					     LLAssetType::AT_LINK,
+					     cb);
+		}
 	}
 private:
 	LLWearableHoldingPattern* mHolder;
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index b4c13da91e..836331b44b 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -1155,6 +1155,8 @@ LLPanelClassifiedInfo::LLPanelClassifiedInfo()
  , mInfoLoaded(false)
  , mScrollingPanel(NULL)
  , mScrollContainer(NULL)
+ , mScrollingPanelMinHeight(0)
+ , mScrollingPanelWidth(0)
 {
 }
 
@@ -1292,11 +1294,13 @@ void LLPanelClassifiedInfo::resetControls()
 	{
 		childSetEnabled("edit_btn", TRUE);
 		childSetVisible("edit_btn", TRUE);
+		childSetVisible("auto_renew", TRUE);
 	}
 	else
 	{
 		childSetEnabled("edit_btn", FALSE);
 		childSetVisible("edit_btn", FALSE);
+		childSetVisible("auto_renew", FALSE);
 	}
 }
 
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index 32fd42aded..eb71cc52c8 100644
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -135,7 +135,7 @@ void LLScriptFloater::setNotificationId(const LLUUID& id)
 
 void LLScriptFloater::getAllowedRect(LLRect& rect)
 {
-	rect = gViewerWindow->getWorldViewRectRaw();
+	rect = gViewerWindow->getWorldViewRectScaled();
 }
 
 void LLScriptFloater::createForm(const LLUUID& notification_id)
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 662e6dcabe..6ed95f2cbf 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -1130,7 +1130,8 @@ LLTexLayerInterface::LLTexLayerInterface(LLTexLayerSet* const layer_set):
 }
 
 LLTexLayerInterface::LLTexLayerInterface(const LLTexLayerInterface &layer, LLWearable *wearable):
-	mTexLayerSet( layer.mTexLayerSet )
+	mTexLayerSet( layer.mTexLayerSet ),
+	mInfo(NULL)
 {
 	// don't add visual params for cloned layers
 	setInfo(layer.getInfo(), wearable);
@@ -1140,11 +1141,12 @@ LLTexLayerInterface::LLTexLayerInterface(const LLTexLayerInterface &layer, LLWea
 
 BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearable  ) // This sets mInfo and calls initialization functions
 {
-	//llassert(mInfo == NULL); // nyx says this is probably bogus but needs investigating
-        if (mInfo != NULL) // above llassert(), but softened into a warning
-        {
-                llwarns << "BAD STUFF!  mInfo != NULL" << llendl;
-        }
+	// setInfo should only be called once. Code is not robust enough to handle redefinition of a texlayer.
+	// Not a critical warning, but could be useful for debugging later issues. -Nyx
+	if (mInfo != NULL) 
+	{
+			llwarns << "mInfo != NULL" << llendl;
+	}
 	mInfo = info;
 	//mID = info->mID; // No ID
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index a8702b2c6b..a680c7494c 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -207,6 +207,7 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
 		LLNotificationsUtil::add("FriendshipDeclinedByMe",
 				notification["substitutions"], payload);
 	}
+	// fall-through
 	case 2: // Send IM - decline and start IM session
 		{
 			// decline
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
index cf1b809aa1..92c0c4a27a 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
@@ -16,7 +16,7 @@
 			<texture_picker label="Haare" name="hair_grain"/>
 			<texture_picker label="Alpha: Haare" name="hair_alpha"/>
 			<texture_picker label="Kopf" name="head-baked"/>
-			<texture_picker label="Make-Uup" name="head_bodypaint"/>
+			<texture_picker label="Make-Up" name="head_bodypaint"/>
 			<texture_picker label="Kopf: Alpha" name="head_alpha"/>
 			<texture_picker label="Kopftattoo" name="head_tattoo"/>
 			<texture_picker label="Augen" name="eyes-baked"/>
diff --git a/indra/newview/skins/default/xui/de/floater_customize.xml b/indra/newview/skins/default/xui/de/floater_customize.xml
index b1e9ef6f19..cf7b208c1a 100644
--- a/indra/newview/skins/default/xui/de/floater_customize.xml
+++ b/indra/newview/skins/default/xui/de/floater_customize.xml
@@ -40,17 +40,17 @@
 			<text name="no modify instructions">
 				Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
 			</text>
-			<text name="Item Action Label" right="100">
+			<text name="Item Action Label">
 				Form:
 			</text>
 			<button label="Neue Form/Gestalt" label_selected="Neue Form/Gestalt" name="Create New"/>
-			<button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
-			<button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/>
+			<button font="SansSerifSmall" label="Speichern" label_selected="Speichern" name="Save"/>
+			<button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
 		</panel>
 		<panel label="Haut" name="Skin">
 			<button label="Hautfarbe" label_selected="Hautfarbe" left="2" name="Skin Color" width="92"/>
 			<button label="Gesichtsdetails" label_selected="Gesichtsdetails" left="2" name="Face Detail" width="92"/>
-			<button label="Make-Uup" label_selected="Make-Uup" left="2" name="Makeup" width="92"/>
+			<button label="Make-Up" label_selected="Make-Up" left="2" name="Makeup" width="92"/>
 			<button label="Körperdetails" label_selected="Körperdetails" left="2" name="Body Detail" width="92"/>
 			<text name="title">
 				[DESC]
diff --git a/indra/newview/skins/default/xui/de/panel_edit_skin.xml b/indra/newview/skins/default/xui/de/panel_edit_skin.xml
index 46bd1d9f4d..90b06a29bc 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_skin.xml
@@ -8,7 +8,7 @@
 	<accordion name="wearable_accordion">
 		<accordion_tab name="skin_color_tab" title="Hautfarbe"/>
 		<accordion_tab name="skin_face_tab" title="Gesichtsdetails"/>
-		<accordion_tab name="skin_makeup_tab" title="Make-Uup"/>
+		<accordion_tab name="skin_makeup_tab" title="Make-Up"/>
 		<accordion_tab name="skin_body_tab" title="Körperdetails"/>
 	</accordion>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml
index b0c6dce8cf..59a4c148a8 100644
--- a/indra/newview/skins/default/xui/de/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Grundstück" name="Estate">
 	<text name="estate_help_text">
-		Änderungen auf dieser Registerkarte wirken sich auf alle Regionen auf dem Grundstück aus.
+		Änderungen wirken sich auf alle Regionen des Grundstücks aus.
 	</text>
 	<text name="estate_text">
 		Grundstück:
@@ -16,7 +16,7 @@
 		(unbekannt)
 	</text>
 	<text name="Only Allow">
-		Zugang auf Einwohner beschränken, die überprüft wurden von:
+		Zugang nur dann, wenn überprüft mit:
 	</text>
 	<check_box label="Zahlungsinformation gespeichert" name="limit_payment" tool_tip="Nicht identifizierte Einwohner verbannen"/>
 	<check_box label="Altersüberprüfung" name="limit_age_verified" tool_tip="Einwohner ohne Altersüberprüfung verbannen. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
@@ -69,6 +69,6 @@
 	<button label="?" name="ban_resident_help"/>
 	<button label="Hinzufügen..." name="add_banned_avatar_btn"/>
 	<button label="Entfernen..." name="remove_banned_avatar_btn"/>
-	<button label="Nachricht an Grundstück senden..." name="message_estate_btn"/>
-	<button label="Benutzer von Grundstück werfen..." name="kick_user_from_estate_btn"/>
+	<button label="Nachricht an Grundstück" name="message_estate_btn"/>
+	<button label="Einwohner hinauswerfen" name="kick_user_from_estate_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index c9307a5d7d..e6b841671f 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -979,7 +979,7 @@
 		Gummi
 	</string>
 	<string name="Light">
-		Licht
+		Hell
 	</string>
 	<string name="KBShift">
 		Umschalt-Taste
@@ -2056,7 +2056,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Kinn-Hals
 	</string>
 	<string name="Clear">
-		Löschen
+		Transparent
 	</string>
 	<string name="Cleft">
 		Spalte
@@ -2359,16 +2359,16 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Farbe Innenseite
 	</string>
 	<string name="In Shdw Opacity">
-		Deckkraft: innerer Lidschatten
+		Deckkraft: innen
 	</string>
 	<string name="Inner Eye Corner">
 		Ecke: Nasenseite
 	</string>
 	<string name="Inner Eye Shadow">
-		Innerer Lidschatten
+		Innenlid
 	</string>
 	<string name="Inner Shadow">
-		Innerer Lidschatten
+		Innenlid
 	</string>
 	<string name="Jacket Length">
 		Jackenlänge
@@ -2761,10 +2761,10 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Aus
 	</string>
 	<string name="Out Shdw Color">
-		Farbe: Oberer Lidschatten
+		Farbe: Oben
 	</string>
 	<string name="Out Shdw Opacity">
-		Deckkraft: Oberer Lidschatten
+		Deckkraft: Oben
 	</string>
 	<string name="Outer Eye Corner">
 		Äußerer Augenwinkel
@@ -2935,7 +2935,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Schuhart
 	</string>
 	<string name="Short">
-		Sandale
+		Klein
 	</string>
 	<string name="Short Arms">
 		Kurze Arme
@@ -3064,7 +3064,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Nach vorne
 	</string>
 	<string name="Tall">
-		Stiefel
+		Groß
 	</string>
 	<string name="Taper Back">
 		Ansatzbreite hinten
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index b048eeceb6..fd10938539 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -286,7 +286,7 @@
              height="23"
              layout="topleft"
              name="Item Action Label"
-             right="132"
+             right="90"
              width="100">
                 Shape:
             </text>
@@ -307,7 +307,7 @@
              label_selected="Save"
              layout="topleft"
              name="Save"
-             right="218"
+             right="190"
              top="477"
              width="82" />
             <button
@@ -319,7 +319,7 @@
              name="Save As"
              top="477"
              right="304"
-             width="82" />
+             width="110" />
         </panel>
         <panel
          border="false"
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 34c1923582..903a9689f1 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -136,16 +136,6 @@
          top_pad="5"
          v_pad="0"
          value="[category]" />
-        <check_box
-         enabled="false"
-         height="16"
-         label="Auto renew each week"
-         layout="topleft"
-         left="10"
-         name="auto_renew"
-         top_pad="5"
-         v_pad="0"
-         width="290" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -161,6 +151,16 @@
          tool_tip="Price for listing."
          v_pad="0"
          width="105" />
+        <check_box
+         enabled="false"
+         height="16"
+         label="Auto renew each week"
+         layout="topleft"
+         left="10"
+         name="auto_renew"
+         top_pad="5"
+         v_pad="0"
+         width="290" />
         <text_editor
          allow_html="true"
          allow_scroll="false"
diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index 1375eb87d9..996e28c575 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="description"
+     textbox.max_length="1024"
      textbox.show_context_menu="false" 
      top_pad="0"
      width="178"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 8b25fb5d2a..715dc5f23c 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="picture_descr"
+     textbox.max_length="1024"
      textbox.show_context_menu="false" 
      top_pad="0"
      width="178"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 05a3771edf..4be4d6b432 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -171,6 +171,7 @@ Automatic position for:
      height="50"
      layout="topleft"
      left_pad="10"
+     top="190"
      name="background"
      tool_tip="Choose color for bubble chat"
      width="38">
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 3980eb86d3..d336e18011 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -59,7 +59,7 @@
      left_delta="0"
      name="owner_text"
      top_pad="2"
-     width="80">
+     width="180">
         Estate owner:
     </text>
     <text
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index 3c789574a4..ecea368c54 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -17,8 +17,8 @@
 	<text name="text_box2">
 		kbps
 	</text>
-	<check_box label="Port de connexion personnalisé" name="connection_port_enabled"/>
-	<spinner label="Numéro de port :" name="connection_port"/>
+	<check_box label="Port de connexion" name="connection_port_enabled"/>
+	<spinner label="Numéro :" name="connection_port"/>
 	<text name="cache_size_label_l">
 		Taille de la mémoire
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 3e9be493ff..76b702e581 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -1900,7 +1900,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		後ろ髪の毛先
 	</string>
 	<string name="Baggy">
-		たるんでいる
+		たるんだ下まぶた
 	</string>
 	<string name="Bangs">
 		前髪
@@ -1990,7 +1990,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		広
 	</string>
 	<string name="Brow Size">
-		眉毛の大きさ
+		眉毛上の隆起
 	</string>
 	<string name="Bug Eyes">
 		Bug Eyes
@@ -2023,7 +2023,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		膨らみ大
 	</string>
 	<string name="Chaplin">
-		Chaplin
+		チャップリン
 	</string>
 	<string name="Cheek Bones">
 		ほお骨
@@ -2044,7 +2044,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		あごの長さ
 	</string>
 	<string name="Chin Heavy">
-		あごに重点
+		あごを強調
 	</string>
 	<string name="Chin In">
 		ひいたあご
@@ -2236,7 +2236,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		ひたいの角度
 	</string>
 	<string name="Forehead Heavy">
-		ひたいに重点
+		ひたいを強調
 	</string>
 	<string name="Freckles">
 		しみ・そばかす
@@ -2386,7 +2386,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		あごの形
 	</string>
 	<string name="Join">
-		寄せた
+		寄せた胸
 	</string>
 	<string name="Jowls">
 		えら
@@ -2491,7 +2491,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		口紅の色
 	</string>
 	<string name="Long">
-		長
+		ロング
 	</string>
 	<string name="Long Head">
 		前後幅が広い頭
@@ -2887,7 +2887,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		骨張った脚
 	</string>
 	<string name="Separate">
-		離れた
+		離れた胸
 	</string>
 	<string name="Shallow">
 		なだらか
@@ -2935,7 +2935,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		靴の長さ
 	</string>
 	<string name="Short">
-		短
+		ショート
 	</string>
 	<string name="Short Arms">
 		短
@@ -3049,7 +3049,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		縦長
 	</string>
 	<string name="Sunken">
-		こけた
+		こけたほお
 	</string>
 	<string name="Sunken Chest">
 		小
@@ -3064,7 +3064,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		前へ
 	</string>
 	<string name="Tall">
-		高
+		トール
 	</string>
 	<string name="Taper Back">
 		後ろに先細
@@ -3160,7 +3160,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		ウエストの高さ
 	</string>
 	<string name="Well-Fed">
-		つまった
+		つまったほお
 	</string>
 	<string name="White Hair">
 		白髪
@@ -3181,7 +3181,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		ワイルド
 	</string>
 	<string name="Wrinkles">
-		しわあり
+		しわ
 	</string>
 	<string name="LocationCtrlAddLandmarkTooltip">
 		マイ ランドマークに追加