From 5fbf81d17eae532da6d9537401bd677eb04c90ff Mon Sep 17 00:00:00 2001 From: angela Date: Thu, 25 Feb 2010 01:00:50 +0800 Subject: EXT-5410 Streaming audio does ignores preference setting. --- indra/newview/llpanelnearbymedia.cpp | 27 +++++++++++---------------- indra/newview/llstatusbar.cpp | 10 ++++++---- indra/newview/llviewermedia.cpp | 2 +- 3 files changed, 18 insertions(+), 21 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index 75b25b6a40..fe77689d63 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) @@ -708,11 +707,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()) || @@ -971,20 +973,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 { @@ -997,9 +992,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 { @@ -1026,7 +1021,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/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()) { -- cgit v1.2.3 From 7b2e66b4d9200e67c8aa62e0e9dd749ee5e6e4e0 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Sat, 27 Feb 2010 23:08:35 -0700 Subject: fix for EXT-5869: some UI textures loading delayed or broken in Release mode. --- indra/newview/llviewertexturelist.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index eaef93a81d..d8918bdb73 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -502,7 +502,10 @@ void LLViewerTextureList::addImageToList(LLViewerFetchedTexture *image) { llerrs << "LLViewerTextureList::addImageToList - Image already in list" << llendl; } - llassert((mImageList.insert(image)).second == true) ; + if((mImageList.insert(image)).second != true) + { + llerrs << "Error happens when insert image to mImageList!" << llendl ; + } image->setInImageList(TRUE) ; } @@ -520,7 +523,10 @@ void LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *image) } llerrs << "LLViewerTextureList::removeImageFromList - Image not in list" << llendl; } - llassert(mImageList.erase(image) == 1) ; + if(mImageList.erase(image) != 1) + { + llerrs << "Error happens when remove image from mImageList!" << llendl ; + } image->setInImageList(FALSE) ; } -- cgit v1.2.3 From b20307a683073c415804966ed5b363fb68879ee5 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Sun, 28 Feb 2010 09:28:00 +0000 Subject: Hopefully fix this test case after the EXT-5820 fix --- indra/newview/tests/llviewerhelputil_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp index dd61ac6ae5..eecc79d36c 100644 --- a/indra/newview/tests/llviewerhelputil_test.cpp +++ b/indra/newview/tests/llviewerhelputil_test.cpp @@ -86,7 +86,7 @@ public: #ifdef __GNUC__ __attribute__ ((noinline)) #endif - BOOL isGodlike() const { return FALSE; } + bool isGodlike() const { return FALSE; } }; LLAgent gAgent; -- cgit v1.2.3 From d8604361eb01336c613fd756c98b476541f840b0 Mon Sep 17 00:00:00 2001 From: angela Date: Mon, 1 Mar 2010 12:43:46 +0800 Subject: EXT-5824 Can't scroll to see the bottom of Classifieds --- .../skins/default/xui/en/panel_classified_info.xml | 12 +++---- .../skins/default/xui/en/panel_edit_classified.xml | 38 +++++++++++----------- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'indra') 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..68af75777c 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -51,11 +51,11 @@ follows="all" height="502" layout="topleft" - left="9" + left="10" top_pad="10" name="profile_scroll" reserve_scroll_corner="false" - width="310"> + width="312"> + top="10" /> 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..90b0acef26 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 + color="DkGray2" + follows="all" + height="502" + layout="topleft" + left="8" + top_pad="10" + name="profile_scroll" + reserve_scroll_corner="false" + opaque="true" + width="312"> - + - + Date: Mon, 1 Mar 2010 16:05:52 +0800 Subject: EXT-5860 Size of description field in the Classified Info panel is much lesser than should be --- indra/newview/skins/default/xui/en/panel_classified_info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') 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 68af75777c..03eb34a081 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -163,7 +163,7 @@ width="105" /> Date: Mon, 1 Mar 2010 16:07:17 +0800 Subject: EXT-5859 Long location may overlap content type in the Classified info panel --- indra/newview/skins/default/xui/en/panel_classified_info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') 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 03eb34a081..e4d1a43050 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -118,7 +118,7 @@ name="content_type" read_only="true" width="290" - top_pad="5" + top_pad="15" v_pad="0" value="[content type]" /> Date: Mon, 1 Mar 2010 15:32:22 +0200 Subject: fix for major EXT-5694 Only first recepient from ad-hoc conference is added to recent speakers --HG-- branch : product-engine --- indra/newview/llimview.cpp | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index e87399abab..1dc601e260 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -952,7 +952,42 @@ void LLIMModel::sendMessage(const std::string& utf8_text, } // Add the recipient to the recent people list. - LLRecentPeople::instance().add(other_participant_id); + bool is_not_group_id = LLGroupMgr::getInstance()->getGroupData(other_participant_id) == NULL; + + if (is_not_group_id) + { + +#if 0 + //use this code to add only online members + LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(im_session_id); + LLSpeakerMgr::speaker_list_t speaker_list; + speaker_mgr->getSpeakerList(&speaker_list, true); + for(LLSpeakerMgr::speaker_list_t::iterator it = speaker_list.begin(); it != speaker_list.end(); it++) + { + const LLPointer& speakerp = *it; + + LLRecentPeople::instance().add(speakerp->mID); + } +#else + LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(im_session_id); + if( session == 0)//??? shouldn't really happen + { + LLRecentPeople::instance().add(other_participant_id); + } + else + { + for(std::vector::iterator it = session->mInitialTargetIDs.begin(); + it!=session->mInitialTargetIDs.end();++it) + { + const LLUUID id = *it; + + LLRecentPeople::instance().add(id); + } + } +#endif + } + + } void session_starter_helper( -- cgit v1.2.3 From 3556fd6bfa66ed483ad0de20fa1b38a9b562c4f1 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Mon, 1 Mar 2010 15:37:19 +0200 Subject: Fixed major bug (EXT-5671) Resizing viewer 2 redraws maturity icon in location bar when it shouldn't. --HG-- branch : product-engine --- indra/newview/lllocationinputctrl.cpp | 59 +++++++++++++++++++---------------- indra/newview/lllocationinputctrl.h | 1 + 2 files changed, 33 insertions(+), 27 deletions(-) (limited to 'indra') diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index 0ea4b1f6da..4100e2fc61 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -577,7 +577,7 @@ void LLLocationInputCtrl::reshape(S32 width, S32 height, BOOL called_from_parent if (isHumanReadableLocationVisible) { - positionMaturityIcon(); + refreshMaturityIcon(); } } @@ -737,32 +737,7 @@ void LLLocationInputCtrl::refreshLocation() setText(location_name); isHumanReadableLocationVisible = true; - // Updating maturity rating icon. - LLViewerRegion* region = gAgent.getRegion(); - if (!region) - return; - - U8 sim_access = region->getSimAccess(); - switch(sim_access) - { - case SIM_ACCESS_PG: - mMaturityIcon->setValue(mIconMaturityGeneral->getName()); - mMaturityIcon->setVisible(TRUE); - break; - - case SIM_ACCESS_ADULT: - mMaturityIcon->setValue(mIconMaturityAdult->getName()); - mMaturityIcon->setVisible(TRUE); - break; - - default: - mMaturityIcon->setVisible(FALSE); - } - - if (mMaturityIcon->getVisible()) - { - positionMaturityIcon(); - } + refreshMaturityIcon(); } // returns new right edge @@ -878,6 +853,36 @@ void LLLocationInputCtrl::refreshHealth() } } +void LLLocationInputCtrl::refreshMaturityIcon() +{ + // Updating maturity rating icon. + LLViewerRegion* region = gAgent.getRegion(); + if (!region) + return; + + U8 sim_access = region->getSimAccess(); + switch(sim_access) + { + case SIM_ACCESS_PG: + mMaturityIcon->setValue(mIconMaturityGeneral->getName()); + mMaturityIcon->setVisible(TRUE); + break; + + case SIM_ACCESS_ADULT: + mMaturityIcon->setValue(mIconMaturityAdult->getName()); + mMaturityIcon->setVisible(TRUE); + break; + + default: + mMaturityIcon->setVisible(FALSE); + } + + if (mMaturityIcon->getVisible()) + { + positionMaturityIcon(); + } +} + void LLLocationInputCtrl::positionMaturityIcon() { const LLFontGL* font = mTextEntry->getFont(); diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h index dac6be2a24..f790140f07 100644 --- a/indra/newview/lllocationinputctrl.h +++ b/indra/newview/lllocationinputctrl.h @@ -136,6 +136,7 @@ private: void refreshParcelIcons(); // Refresh the value in the health percentage text field void refreshHealth(); + void refreshMaturityIcon(); void positionMaturityIcon(); void rebuildLocationHistory(const std::string& filter = LLStringUtil::null); -- cgit v1.2.3 From 671118638f0419dace19288d0db559268a4e35d9 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Mon, 1 Mar 2010 14:31:06 +0200 Subject: Fixed major bug EXT-5308 (right click - Copy Asset UUID, copies null key to clipboard.) - disabled "Copy Asset UUID" menu item for Inventory items w/o known assets. --HG-- branch : product-engine --- indra/newview/llinventorybridge.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index c4cf76fde1..27a40c6ba0 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -31,6 +31,9 @@ */ #include "llviewerprecompiledheaders.h" +// external projects +#include "lltransfersourceasset.h" + #include "llinventorybridge.h" #include "llagent.h" @@ -583,7 +586,16 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, if (show_asset_id) { items.push_back(std::string("Copy Asset UUID")); - if ( (! ( isItemPermissive() || gAgent.isGodlike() ) ) + + bool is_asset_knowable = false; + + LLViewerInventoryItem* inv_item = gInventory.getItem(mUUID); + if (inv_item) + { + is_asset_knowable = is_asset_id_knowable(inv_item->getType()); + } + if ( !is_asset_knowable // disable menu item for Inventory items with unknown asset. EXT-5308 + || (! ( isItemPermissive() || gAgent.isGodlike() ) ) || (flags & FIRST_SELECTED_ITEM) == 0) { disabled_items.push_back(std::string("Copy Asset UUID")); -- cgit v1.2.3 From 604537b23557ed8f2b0fba88b5b58e21da4417ce Mon Sep 17 00:00:00 2001 From: Denis Serdjuk Date: Mon, 1 Mar 2010 17:56:40 +0200 Subject: fixed Normal Bug EXT-5616 mouse scrollwheel does not scroll world map region list Cause: Invalid check of the inside rectangle area in LLFloaterWorldMap::handleScrollWhell(). --HG-- branch : product-engine --- indra/newview/llfloaterworldmap.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index b6de409611..67c0b530eb 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -359,9 +359,7 @@ BOOL LLFloaterWorldMap::handleScrollWheel(S32 x, S32 y, S32 clicks) { if (!isMinimized() && isFrontmost()) { - LLRect area; - childGetRect("search_results", area); - if(!area.pointInRect(x, y)) + if(mPanel->pointInView(x, y)) { F32 slider_value = (F32)childGetValue("zoom slider").asReal(); slider_value += ((F32)clicks * -0.3333f); -- cgit v1.2.3 From 4802a6f572b8b6c6e61465e3c6cf6b563fd163e4 Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Mon, 1 Mar 2010 19:15:40 +0200 Subject: Implemented major sub-task EXT-5722 (hard-coded: Right click on Object > Sit Here and Take are hard-coded) --HG-- branch : product-engine --- indra/newview/llviewermenu.cpp | 62 ++++++++++++---------- indra/newview/skins/default/xui/en/menu_object.xml | 19 +++++-- 2 files changed, 50 insertions(+), 31 deletions(-) (limited to 'indra') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 15c72fdef1..bc3b8ac9d6 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -5501,6 +5501,37 @@ bool enable_pay_object() return false; } +bool visible_object_stand_up() +{ + // 'Object Stand Up' menu item is visible when agent is sitting on selection + return sitting_on_selection(); +} + +bool visible_object_sit() +{ + // 'Object Sit' menu item is visible when agent is not sitting on selection + bool is_sit_visible = !sitting_on_selection(); + if (is_sit_visible) + { + LLMenuItemGL* sit_menu_item = gMenuHolder->getChild("Object Sit"); + // Init default 'Object Sit' menu item label + static const LLStringExplicit sit_text(sit_menu_item->getLabel()); + // Update label + std::string label; + LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(); + if (node && node->mValid && !node->mSitName.empty()) + { + label.assign(node->mSitName); + } + else + { + label = sit_text; + } + sit_menu_item->setLabel(label); + } + return is_sit_visible; +} + class LLObjectEnableSitOrStand : public view_listener_t { bool handleEvent(const LLSD& userdata) @@ -5515,34 +5546,6 @@ class LLObjectEnableSitOrStand : public view_listener_t new_value = true; } } - // Update label - std::string label; - std::string sit_text; - std::string stand_text; - std::string param = userdata.asString(); - std::string::size_type offset = param.find(","); - if (offset != param.npos) - { - sit_text = param.substr(0, offset); - stand_text = param.substr(offset+1); - } - if (sitting_on_selection()) - { - label = stand_text; - } - else - { - LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(); - if (node && node->mValid && !node->mSitName.empty()) - { - label.assign(node->mSitName); - } - else - { - label = sit_text; - } - } - gMenuHolder->childSetText("Object Sit", label); return new_value; } @@ -8016,6 +8019,9 @@ void initialize_menus() enable.add("Object.EnableDelete", boost::bind(&enable_object_delete)); enable.add("Object.EnableWear", boost::bind(&object_selected_and_point_valid)); + enable.add("Object.StandUpVisible", boost::bind(&visible_object_stand_up)); + enable.add("Object.SitVisible", boost::bind(&visible_object_sit)); + view_listener_t::addMenu(new LLObjectEnableReturn(), "Object.EnableReturn"); view_listener_t::addMenu(new LLObjectEnableReportAbuse(), "Object.EnableReportAbuse"); diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index 9436b2cd73..2c97112e38 100644 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -44,11 +44,24 @@ name="Object Sit"> + - + name="EnableSitOrStand" /> + + + + + + -- cgit v1.2.3 From fbfc61f1bb0047f11469c3af548326e558a365f1 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Mon, 1 Mar 2010 10:53:00 -0800 Subject: JA linguistic fixes --- indra/newview/skins/default/xui/ja/floater_about_land.xml | 12 ++++++------ indra/newview/skins/default/xui/ja/floater_report_abuse.xml | 8 ++++---- indra/newview/skins/default/xui/ja/floater_world_map.xml | 6 +++--- indra/newview/skins/default/xui/ja/notifications.xml | 8 ++++---- indra/newview/skins/default/xui/ja/panel_classified_info.xml | 4 ++-- indra/newview/skins/default/xui/ja/panel_edit_classified.xml | 4 ++-- indra/newview/skins/default/xui/ja/panel_group_general.xml | 6 +++--- indra/newview/skins/default/xui/ja/panel_place_profile.xml | 2 +- .../skins/default/xui/ja/panel_preferences_general.xml | 6 +++--- indra/newview/skins/default/xui/ja/panel_region_general.xml | 8 ++++---- .../skins/default/xui/ja/panel_region_general_layout.xml | 8 ++++---- indra/newview/skins/default/xui/ja/strings.xml | 8 ++++---- 12 files changed, 40 insertions(+), 40 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml index 42f3211ada..a16348529b 100644 --- a/indra/newview/skins/default/xui/ja/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml @@ -284,16 +284,16 @@ あなたはこの区画の設定編集ができないため、このオプションは無効です。 - 控えめコンテンツ + 「Moderate」コンテンツ - アダルトコンテンツ + 「Adult」コンテンツ - あなたの区画情報及びコンテンツは「控えめ」とされています。 + あなたの区画情報及びコンテンツは「Moderate」とされています。 - あなたの区画情報及びコンテンツは「アダルト」とされています。 + あなたの区画情報及びコンテンツは「Adult」とされています。 （なし） @@ -333,7 +333,7 @@ - + @@ -359,7 +359,7 @@ - + スナップショット： diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml index c66f307f23..105e903840 100644 --- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml @@ -49,7 +49,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -68,11 +68,11 @@ - + - + diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml index c44c6b3fd3..42fedfc075 100644 --- a/indra/newview/skins/default/xui/ja/floater_world_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml @@ -37,15 +37,15 @@ - 一般 + General - 控えめ + Moderate - アダルト + Adult diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index f4c46f82ac..2f877a6aba 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -1631,11 +1631,11 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します - この広告に「控えめ」コンテンツは含まれていますか？ + この広告に「Moderate」コンテンツは含まれていますか？ - このグループに「控えめ」コンテンツが含まれていますか？ + このグループに「Moderate」コンテンツが含まれていますか？ @@ -1655,7 +1655,7 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します このリージョン（地域）のレーティング区分がアップデートされました。 地図に変更が反映されるまで数分かかることがあります。 -アダルト専用リージョンに入るには、住人のアカウントが年齢確認か支払方法のいずれかで「確認済み」でなければなりません。 +Adult 専用リージョンに入るには、住人のアカウントが年齢確認か支払方法のいずれかで「確認済み」でなければなりません。 [APP_NAME] のこのバージョンは、このリージョンにおけるボイスチャットの互換性がありません。 ボイスチャットを正常に行うためには、[APP_NAME] のアップデートが必要です。 @@ -2118,7 +2118,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ コミュニティスタンダードに明記されているコンテンツ制限により、あなたの検索語の一部が除外されました。 - 少なくともどれか一つコンテンツの種類を選択して検索を行ってください。（一般、控えめ、アダルト） + 少なくともどれか一つコンテンツの種類を選択して検索を行ってください。（General、Moderate、Adult） [NAME] は投票の申請をしています： diff --git a/indra/newview/skins/default/xui/ja/panel_classified_info.xml b/indra/newview/skins/default/xui/ja/panel_classified_info.xml index 14e04d5691..f3c68c9f59 100644 --- a/indra/newview/skins/default/xui/ja/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/ja/panel_classified_info.xml @@ -1,10 +1,10 @@ - 控えめ + Moderate - 一般コンテンツ + 「General」コンテンツ L$ [PRICE] diff --git a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml index 4cb5884f28..fa46e6d35a 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml @@ -24,10 +24,10 @@