diff options
Diffstat (limited to 'indra')
27 files changed, 243 insertions, 110 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f87cdbc43e..e5d72310cd 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4334,7 +4334,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>home</string> + <string>last</string> </map> <key>LoginPage</key> <map> diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 780393a9c0..224514dd48 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -985,7 +985,8 @@ void LLFloaterPreference::cleanupBadSetting() if (gSavedPerAccountSettings.getString("BusyModeResponse2") == "|TOKEN COPY BusyModeResponse|") { llwarns << "cleaning old BusyModeResponse" << llendl; - gSavedPerAccountSettings.setString("BusyModeResponse2", gSavedPerAccountSettings.getText("BusyModeResponse")); + //LLTrans::getString("BusyModeResponseDefault") is used here for localization (EXT-5885) + gSavedPerAccountSettings.setString("BusyModeResponse2", LLTrans::getString("BusyModeResponseDefault")); } } diff --git a/indra/newview/llfriendcard.cpp b/indra/newview/llfriendcard.cpp index ac060cef15..18f81fe506 100644 --- a/indra/newview/llfriendcard.cpp +++ b/indra/newview/llfriendcard.cpp @@ -44,24 +44,28 @@ // Constants; -static const std::string INVENTORY_STRING_FRIENDS_SUBFOLDER = "InvFolder Friends"; -static const std::string INVENTORY_STRING_FRIENDS_ALL_SUBFOLDER = "InvFolder All"; +static const std::string INVENTORY_STRING_FRIENDS_SUBFOLDER = "Friends"; +static const std::string INVENTORY_STRING_FRIENDS_ALL_SUBFOLDER = "All"; // helper functions -// NOTE: Usage of LLTrans::getString(); in next two functions to set localized -// folders' names is caused by a hack in the LLFolderViewItem::refreshFromListener() -// method for protected asset types. -// So, localized names will be got from the strings with "InvFolder LABEL_NAME" -// in the strings.xml +// NOTE: For now Friends & All folders are created as protected folders of the LLFolderType::FT_CALLINGCARD type. +// So, their names will be processed in the LLFolderViewItem::refreshFromListener() to be localized +// using "InvFolder LABEL_NAME" as LLTrans::findString argument. + +// We must use in this file their hard-coded names to ensure found them on different locales. EXT-5829. +// These hard-coded names will be stored in InventoryItems but shown localized in FolderViewItems + +// If hack in the LLFolderViewItem::refreshFromListener() to localize protected folder is removed +// or these folders are not protected these names should be localized in another place/way. inline const std::string get_friend_folder_name() { - return LLTrans::getString(INVENTORY_STRING_FRIENDS_SUBFOLDER); + return INVENTORY_STRING_FRIENDS_SUBFOLDER; } inline const std::string get_friend_all_subfolder_name() { - return LLTrans::getString(INVENTORY_STRING_FRIENDS_ALL_SUBFOLDER); + return INVENTORY_STRING_FRIENDS_ALL_SUBFOLDER; } void move_from_to_arrays(LLInventoryModel::cat_array_t& from, LLInventoryModel::cat_array_t& to) @@ -350,9 +354,9 @@ const LLUUID& LLFriendCardsManager::findFriendAllSubfolderUUIDImpl() const return findChildFolderUUID(friendFolderUUID, friendAllSubfolderName); } -const LLUUID& LLFriendCardsManager::findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& localizedName) const +const LLUUID& LLFriendCardsManager::findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& nonLocalizedName) const { - LLNameCategoryCollector matchFolderFunctor(localizedName); + LLNameCategoryCollector matchFolderFunctor(nonLocalizedName); return get_folder_uuid(parentFolderUUID, matchFolderFunctor); } diff --git a/indra/newview/llfriendcard.h b/indra/newview/llfriendcard.h index b94d5ec2c0..1cda52c1d7 100644 --- a/indra/newview/llfriendcard.h +++ b/indra/newview/llfriendcard.h @@ -120,7 +120,7 @@ private: return (mBuddyIDSet.end() != mBuddyIDSet.find(avatarID)); } - const LLUUID& findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& localizedName) const; + const LLUUID& findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& nonLocalizedName) const; const LLUUID& findFriendFolderUUIDImpl() const; const LLUUID& findFriendAllSubfolderUUIDImpl() const; const LLUUID& findFriendCardInventoryUUIDImpl(const LLUUID& avatarID); diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index 68691a1408..7cf27d9141 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -1294,7 +1294,7 @@ void LLPanelClassifiedInfo::resetControls() childSetEnabled("edit_btn", is_self); childSetVisible("edit_btn", is_self); - childSetVisible("auto_renew", is_self); + childSetVisible("price_layout_panel", is_self); } void LLPanelClassifiedInfo::setClassifiedName(const std::string& name) diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index c02f154dc8..a73c25a979 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -549,11 +549,10 @@ void LLPanelNearByMedia::refreshParcelItems() MediaClass choice = (MediaClass)choice_llsd.asInteger(); // Only show "special parcel items" if "All" or "Within" filter // (and if media is "enabled") - bool should_include = gSavedSettings.getBOOL("AudioStreamingMedia") && - (choice == MEDIA_CLASS_ALL || choice == MEDIA_CLASS_WITHIN_PARCEL); + bool should_include = (choice == MEDIA_CLASS_ALL || choice == MEDIA_CLASS_WITHIN_PARCEL); // First Parcel Media: add or remove it as necessary - if (should_include && LLViewerMedia::hasParcelMedia()) + if (gSavedSettings.getBOOL("AudioStreamingMedia") &&should_include && LLViewerMedia::hasParcelMedia()) { // Yes, there is parcel media. if (NULL == mParcelMediaItem) @@ -716,11 +715,14 @@ void LLPanelNearByMedia::refreshList() } } } - mDisableAllCtrl->setEnabled(gSavedSettings.getBOOL("AudioStreamingMedia") && + mDisableAllCtrl->setEnabled((gSavedSettings.getBOOL("AudioStreamingMusic") || + gSavedSettings.getBOOL("AudioStreamingMedia")) && (LLViewerMedia::isAnyMediaShowing() || LLViewerMedia::isParcelMediaPlaying() || LLViewerMedia::isParcelAudioPlaying())); - mEnableAllCtrl->setEnabled(gSavedSettings.getBOOL("AudioStreamingMedia") && + + mEnableAllCtrl->setEnabled( (gSavedSettings.getBOOL("AudioStreamingMusic") || + gSavedSettings.getBOOL("AudioStreamingMedia")) && (disabled_count > 0 || // parcel media (if we have it, and it isn't playing, enable "start") (LLViewerMedia::hasParcelMedia() && ! LLViewerMedia::isParcelMediaPlaying()) || @@ -979,20 +981,13 @@ void LLPanelNearByMedia::onMoreLess() void LLPanelNearByMedia::updateControls() { - if (! gSavedSettings.getBOOL("AudioStreamingMedia")) - { - // Just show disabled controls - showDisabledControls(); - return; - } - LLUUID selected_media_id = mMediaList->getValue().asUUID(); if (selected_media_id == PARCEL_AUDIO_LIST_ITEM_UUID) { if (!LLViewerMedia::hasParcelAudio() || !gSavedSettings.getBOOL("AudioStreamingMusic")) { - // Shouldn't happen, but do this anyway + // disable controls if audio streaming music is disabled from preference showDisabledControls(); } else { @@ -1005,9 +1000,9 @@ void LLPanelNearByMedia::updateControls() } else if (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID) { - if (!LLViewerMedia::hasParcelMedia()) + if (!LLViewerMedia::hasParcelMedia() || !gSavedSettings.getBOOL("AudioStreamingMedia")) { - // Shouldn't happen, but do this anyway + // disable controls if audio streaming media is disabled from preference showDisabledControls(); } else { @@ -1034,7 +1029,7 @@ void LLPanelNearByMedia::updateControls() else { LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(selected_media_id); - if (NULL == impl) + if (NULL == impl || !gSavedSettings.getBOOL("AudioStreamingMedia")) { showDisabledControls(); } diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 732c23982b..9fb496c214 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -360,12 +360,14 @@ void LLStatusBar::refresh() // Disable media toggle if there's no media, parcel media, and no parcel audio // (or if media is disabled) - mMediaToggle->setEnabled(gSavedSettings.getBOOL("AudioStreamingMedia") && - (LLViewerMedia::hasInWorldMedia() || LLViewerMedia::hasParcelMedia() || LLViewerMedia::hasParcelAudio())); + bool button_enabled = (gSavedSettings.getBOOL("AudioStreamingMusic")||gSavedSettings.getBOOL("AudioStreamingMedia")) && + (LLViewerMedia::hasInWorldMedia() || LLViewerMedia::hasParcelMedia() || LLViewerMedia::hasParcelAudio()); + mMediaToggle->setEnabled(button_enabled); // Note the "sense" of the toggle is opposite whether media is playing or not - mMediaToggle->setValue(! (LLViewerMedia::isAnyMediaShowing() || + bool any_media_playing = (LLViewerMedia::isAnyMediaShowing() || LLViewerMedia::isParcelMediaPlaying() || - LLViewerMedia::isParcelAudioPlaying())); + LLViewerMedia::isParcelAudioPlaying()); + mMediaToggle->setValue(!any_media_playing); } void LLStatusBar::setVisibleForMouselook(bool visible) 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/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 86336e353c..344c4c469b 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -851,7 +851,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg) } } // update the audio stream here as well - if(!inworld_media_enabled || !inworld_audio_enabled) + if( !inworld_audio_enabled) { if(LLViewerMedia::isParcelAudioPlaying() && gAudiop && LLViewerMedia::hasParcelAudio()) { 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_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml index 0dca272633..abf8011d9d 100644 --- a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml @@ -14,7 +14,7 @@ <layout_panel name="share_btn_panel"> <button label="Teilen" name="share_btn"/> </layout_panel> - <layout_panel name="share_btn_panel"> + <layout_panel name="pay_btn_panel"> <button label="Bezahlen" name="pay_btn"/> </layout_panel> <layout_panel name="call_btn_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 efa23f22e1..28b259896d 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 903a9689f1..13333b88b1 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -93,6 +93,17 @@ v_pad="0" value="[name]" use_ellipses="true" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="classified_location_label" + text_color="white" + top_pad="10" + value="Location:" + width="250" /> <text_editor allow_scroll="false" bg_visible="false" @@ -103,10 +114,22 @@ left="10" name="classified_location" read_only="true" + top_pad="5" width="290" word_wrap="true" v_pad="0" value="[loading...]" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="content_type_label" + text_color="white" + top_pad="10" + value="Content Type:" + width="250" /> <text_editor allow_scroll="false" bg_visible="false" @@ -121,6 +144,17 @@ top_pad="5" v_pad="0" value="[content type]" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="category_label" + text_color="white" + top_pad="10" + value="Category:" + width="250" /> <text_editor allow_html="true" allow_scroll="false" @@ -136,6 +170,17 @@ top_pad="5" v_pad="0" value="[category]" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="price_for_listing_label" + text_color="white" + top_pad="10" + value="Price for listing:" + width="250" /> <text_editor allow_scroll="false" bg_visible="false" @@ -150,17 +195,61 @@ top_pad="5" tool_tip="Price for listing." v_pad="0" + value="[price]" width="105" /> + <layout_stack + animate="false" + name="descr_stack" + layout="topleft" + follows="top|left" + orientation="vertical" + left="10" + top_pad="5" + width="290" + height="250"> + <layout_panel + auto_resize="false" + name="price_layout_panel" + layout="topleft" + follows="top|left" + left="0" + top="0" + width="290" + height="26" + user_resize="false"> <check_box enabled="false" height="16" label="Auto renew each week" layout="topleft" - left="10" + follows="top|left" + left="0" name="auto_renew" - top_pad="5" + top="0" v_pad="0" width="290" /> + </layout_panel> + <layout_panel + name="descr_layout_panel" + layout="topleft" + follows="top|left" + left="0" + top="0" + width="290" + height="215" + user_resize="false"> + <text + auto_resize="false" + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="0" + name="classified_desc_label" + text_color="white" + top="0" + value="Description:" + width="250" /> <text_editor allow_html="true" allow_scroll="false" @@ -169,14 +258,17 @@ h_pad="0" height="200" layout="topleft" - left="10" + left="0" max_length="1023" name="classified_desc" read_only="true" + top_pad="5" width="290" v_pad="0" value="[description]" word_wrap="true" /> + </layout_panel> + </layout_stack> </panel> </scroll_container> <panel diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index 66d5389d9b..6cc6c51fe0 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -42,16 +42,16 @@ Edit Classified </text> <scroll_container - color="DkGray2" - follows="all" - height="502" - layout="topleft" - left="8" - top_pad="10" - name="profile_scroll" - reserve_scroll_corner="false" - opaque="true" - width="312"> + color="DkGray2" + follows="all" + height="502" + layout="topleft" + left="8" + top_pad="10" + name="profile_scroll" + reserve_scroll_corner="false" + opaque="true" + width="312"> <panel name="scroll_content_panel" follows="left|top" @@ -59,17 +59,17 @@ layout="topleft" top="0" background_visible="false" - height="610" + height="690" left="0" width="285"> - <texture_picker - follows="left|top|right" - height="197" - width="272" - layout="topleft" - top="10" - left="11" - name="classified_snapshot" /> + <texture_picker + follows="left|top|right" + height="197" + width="272" + layout="topleft" + top="10" + left="11" + name="classified_snapshot" /> <icon height="197" image_name="spacer24.tga" @@ -153,7 +153,7 @@ type="string" length="1" follows="left|top" - height="50" + height="30" layout="topleft" left="10" name="classified_location" @@ -172,6 +172,17 @@ top_pad="5" name="set_to_curr_location_btn" width="156" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="category_label" + text_color="white" + top_pad="15" + value="Category:" + width="250" /> <combo_box follows="left|top" height="23" @@ -180,6 +191,17 @@ name="category" top_pad="5" width="156" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="content_type_label" + text_color="white" + top_pad="15" + value="Content type:" + width="250" /> <combo_box allow_text_entry="false" follows="left|top" @@ -199,6 +221,17 @@ General Content </combo_item> </combo_box> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="price_for_listing_label" + text_color="white" + top_pad="15" + value="Price for listing:" + width="250" /> <spinner decimal_digits="0" follows="left|top" @@ -223,9 +256,9 @@ layout="topleft" left="10" name="auto_renew" - top_pad="5" + top_pad="15" width="250" /> - </panel> + </panel> </scroll_container> <panel follows="left|right|bottom" diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml index 28c4adf67c..88566ea037 100644 --- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -111,7 +111,7 @@ layout="topleft" min_height="25" width="100" - name="share_btn_panel" + name="pay_btn_panel" user_resize="false"> <button auto_resize="true" 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/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 455b4be264..2510d8b49f 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2104,6 +2104,9 @@ Clears (deletes) the media and all params from the given face. <!-- panel contents --> <string name="PanelContentsNewScript">New Script</string> + <!-- panel preferences general --> + <string name="BusyModeResponseDefault">The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string> + <!-- Mute --> <string name="MuteByName">(by name)</string> <string name="MuteAgent">(Resident)</string> diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml index 09969a796c..f218324d50 100644 --- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml @@ -13,7 +13,7 @@ <layout_panel name="share_btn_panel"> <button label="Compartir" name="share_btn"/> </layout_panel> - <layout_panel name="share_btn_panel"> + <layout_panel name="pay_btn_panel"> <button label="Pagar" name="pay_btn"/> </layout_panel> <layout_panel name="call_btn_panel"> diff --git a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml index 115e25e487..1f2169e22c 100644 --- a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml @@ -14,7 +14,7 @@ <layout_panel name="share_btn_panel"> <button label="Partager" name="share_btn"/> </layout_panel> - <layout_panel name="share_btn_panel"> + <layout_panel name="pay_btn_panel"> <button label="Payer" name="pay_btn"/> </layout_panel> <layout_panel name="call_btn_panel"> 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/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml index be15e92aa1..f2429ac12a 100644 --- a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml @@ -14,7 +14,7 @@ <layout_panel name="share_btn_panel"> <button label="共有" name="share_btn"/> </layout_panel> - <layout_panel name="share_btn_panel"> + <layout_panel name="pay_btn_panel"> <button label="支払う" name="pay_btn"/> </layout_panel> <layout_panel name="call_btn_panel"> 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"> マイ ランドマークに追加 |