From ff5503706786f0365d8c63d41a0e5a4a6ca7c81a Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 15 Aug 2008 23:45:58 -0500 Subject: Second Life viewer sources 1.20.12 --- linden/indra/llcommon/llversionviewer.h | 2 +- linden/indra/newview/app_settings/cmd_line.xml | 2 + linden/indra/newview/app_settings/settings.xml | 2 +- linden/indra/newview/llfloatersnapshot.cpp | 83 +++++++++++----------- linden/indra/newview/llinventorymodel.cpp | 9 ++- linden/indra/newview/releasenotes.txt | 15 ++-- .../newview/skins/xui/de/floater_buy_land.xml | 8 --- .../newview/skins/xui/es/floater_buy_land.xml | 13 ---- .../newview/skins/xui/fr/floater_buy_land.xml | 8 --- .../newview/skins/xui/ja/floater_buy_land.xml | 8 --- .../newview/skins/xui/ko/floater_buy_land.xml | 8 --- .../newview/skins/xui/pt/floater_buy_land.xml | 9 --- .../newview/skins/xui/zh/floater_buy_land.xml | 9 --- 13 files changed, 65 insertions(+), 111 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index 4121eb5..df9c5cb 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.h @@ -34,7 +34,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 20; -const S32 LL_VERSION_PATCH = 11; +const S32 LL_VERSION_PATCH = 12; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Release"; diff --git a/linden/indra/newview/app_settings/cmd_line.xml b/linden/indra/newview/app_settings/cmd_line.xml index 746e56d..db665b7 100644 --- a/linden/indra/newview/app_settings/cmd_line.xml +++ b/linden/indra/newview/app_settings/cmd_line.xml @@ -187,6 +187,8 @@ count 2 + compose + true diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 9d074ad..18ca143 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -9921,7 +9921,7 @@ Type Boolean Value - 1 + 0 WaterEditPresets diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp index f3ad4a7..857b3fa 100644 --- a/linden/indra/newview/llfloatersnapshot.cpp +++ b/linden/indra/newview/llfloatersnapshot.cpp @@ -1475,11 +1475,11 @@ void LLFloaterSnapshot::Impl::checkAspectRatio(LLFloaterSnapshot *view, S32 inde { LLSnapshotLivePreview *previewp = getPreviewView(view) ; - if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == getTypeIndex(view)) - { - previewp->mKeepAspectRatio = FALSE ; - return ; - } + //if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == getTypeIndex(view)) + //{ + // previewp->mKeepAspectRatio = FALSE ; + // return ; + //} if(!index) //current window size { @@ -1494,7 +1494,7 @@ void LLFloaterSnapshot::Impl::checkAspectRatio(LLFloaterSnapshot *view, S32 inde else if(-1 == index) //custom { sAspectRatioCheckOff = FALSE ; - if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE != gSavedSettings.getS32("LastSnapshotType")) + //if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE != gSavedSettings.getS32("LastSnapshotType")) { view->childSetEnabled("keep_aspect_check", TRUE) ; @@ -1631,22 +1631,23 @@ BOOL LLFloaterSnapshot::Impl::checkImageSize(LLSnapshotLivePreview* previewp, S3 S32 h = height ; //if texture, ignore aspect ratio setting, round image size to power of 2. - if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == gSavedSettings.getS32("LastSnapshotType")) - { - if(width > max_value) - { - width = max_value ; - } - if(height > max_value) - { - height = max_value ; - } - - //round to nearest power of 2 - width = get_nearest_power_two(width, MAX_TEXTURE_SIZE) ; - height = get_nearest_power_two(height, MAX_TEXTURE_SIZE) ; - } - else if(previewp && previewp->mKeepAspectRatio) + //if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == gSavedSettings.getS32("LastSnapshotType")) + //{ + // if(width > max_value) + // { + // width = max_value ; + // } + // if(height > max_value) + // { + // height = max_value ; + // } + + // //round to nearest power of 2 + // width = get_nearest_power_two(width, MAX_TEXTURE_SIZE) ; + // height = get_nearest_power_two(height, MAX_TEXTURE_SIZE) ; + //} + //else + if(previewp && previewp->mKeepAspectRatio) { if(gViewerWindow->getWindowDisplayWidth() < 1 || gViewerWindow->getWindowDisplayHeight() < 1) { @@ -1729,25 +1730,25 @@ void LLFloaterSnapshot::Impl::onCommitCustomResolution(LLUICtrl *ctrl, void* dat { BOOL update_ = FALSE ; //if to upload a snapshot, process spinner input in a special way. - if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == gSavedSettings.getS32("LastSnapshotType")) - { - S32 spinner_increment = (S32)((LLSpinCtrl*)ctrl)->getIncrement() ; - S32 dw = w - curw ; - S32 dh = h - curh ; - dw = (dw == spinner_increment) ? 1 : ((dw == -spinner_increment) ? -1 : 0) ; - dh = (dh == spinner_increment) ? 1 : ((dh == -spinner_increment) ? -1 : 0) ; - - if(dw) - { - w = (dw > 0) ? curw << dw : curw >> -dw ; - update_ = TRUE ; - } - if(dh) - { - h = (dh > 0) ? curh << dh : curh >> -dh ; - update_ = TRUE ; - } - } + //if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == gSavedSettings.getS32("LastSnapshotType")) + //{ + // S32 spinner_increment = (S32)((LLSpinCtrl*)ctrl)->getIncrement() ; + // S32 dw = w - curw ; + // S32 dh = h - curh ; + // dw = (dw == spinner_increment) ? 1 : ((dw == -spinner_increment) ? -1 : 0) ; + // dh = (dh == spinner_increment) ? 1 : ((dh == -spinner_increment) ? -1 : 0) ; + + // if(dw) + // { + // w = (dw > 0) ? curw << dw : curw >> -dw ; + // update_ = TRUE ; + // } + // if(dh) + // { + // h = (dh > 0) ? curh << dh : curh >> -dh ; + // update_ = TRUE ; + // } + //} previewp->setMaxImageSize((S32)((LLSpinCtrl *)ctrl)->getMaxValue()) ; if(checkImageSize(previewp, w, h, w != curw, previewp->getMaxImageSize()) || update_) diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp index 91bdb8d..15f5398 100644 --- a/linden/indra/newview/llinventorymodel.cpp +++ b/linden/indra/newview/llinventorymodel.cpp @@ -111,6 +111,7 @@ const char* NEW_CATEGORY_NAMES[LLAssetType::AT_COUNT] = "Uncompressed Images", // AT_IMAGE_JPEG "Animations", // AT_ANIMATION "Gestures", // AT_GESTURE + "New Folder" // AT_SIMSTATE }; struct InventoryIDPtrLess @@ -352,6 +353,12 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id, return id; } + if(preferred_type == LLAssetType::AT_SIMSTATE) + { + lldebugs << "Attempt to create simstate category." << llendl; + return id; + } + id.generate(); LLString name = pname; if(!pname.empty()) @@ -359,7 +366,7 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id, name.assign(pname); } else if((preferred_type >= LLAssetType::AT_TEXTURE) && - (preferred_type < LLAssetType::AT_COUNT)) + (preferred_type < LLAssetType::AT_SIMSTATE)) { name.assign(NEW_CATEGORY_NAMES[preferred_type]); } diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt index 5ec38fc..f4e8955 100644 --- a/linden/indra/newview/releasenotes.txt +++ b/linden/indra/newview/releasenotes.txt @@ -4,17 +4,21 @@ | http://wiki.secondlife.com/wiki/Beta_Release_Notes | +------------------------------------------------------+ -Release Notes for Second Life 1.20(11) June 17th, 2008 +Release Notes for Second Life 1.20(11) June 23rd, 2008 ===================================== Fixes: * Fixed: VWR-7730: Sound / UI Sound broken on Mac PPC RC 1.20.10 -* Fixed: VWR-7614: Snapshots show user interface when "Show Interface In Snapshot" is un-checked/ VWR-7679: Interface also shows in screen_last.bmp -* Fixed: VWR-2633: Some groups can't be accessed from Communicate window and only show in profile / VWR-6889: Unable to leave group when role has no allowed abilities +* Fixed: VWR-7614: Snapshots show user interface when "Show Interface In Snapshot" is un-checked +* Fixed: VWR-7679: Interface also shows in screen_last.bmp +* Fixed: VWR-2633: Some groups can't be accessed from Communicate window and only show in profile +* Fixed: VWR-6889: Unable to leave group when role has no allowed abilities * Fixed: VWR-5895: slowly rotating llTargetOmega child prims stop rotating when you move away * Fixed: VWR-6828: Character > Show Look At / Show Point At don't work * Fixed: VWR-7682: Typo on Teleport Failure dialog * Fixed: VWR-7086: floater_buy_land.xml still contains messages regarding First Land +* Fixed: VWR-6800: Eliminate memory leaks in llcharacter/llmotioncontroller.cpp +* Fixed: VWR-2051: Regular viewer freezes since update to Voice viewer * Fixed: VWR-5697: RC 1.19.1 crash on startup with Vista UAC enabled * Fixed: VWR-7723: crash on LLImageGL::setSubImage line 780 * Fixed: crash on LLViewerImageList::removeImageFromList @@ -24,8 +28,11 @@ Fixes: * Fixed: Load the initial avatar outfit earlier in the startup process to avoid Ruth effect at Orientation Island * Fixed: Add the new TRANSPARENT_TEXTURE constant's target texture to the inventory Library of 1.20 * Fixed: Search > Places tab results are displayed in white text +* Fixed: Media URL Set > Cancel button does not cancel * Fixed: 1.20 viewer reports GeForce FX5200 card incorrectly -* Fixed: Fix the URL used by crash_logger for pre login crashes. +* Fixed: Viewer does not remember the last grid if last grid is AGNI +* Fixed: Cursor missing from search fields until after text has been manipulated +* Fixed: Fix the URL used by crash_logger for pre login crashes * Fixed: The viewer's crash logger needs to trim very long SecondLife.log files before sending. Localization Fixes: diff --git a/linden/indra/newview/skins/xui/de/floater_buy_land.xml b/linden/indra/newview/skins/xui/de/floater_buy_land.xml index 5c77f0c..adfa766 100644 --- a/linden/indra/newview/skins/xui/de/floater_buy_land.xml +++ b/linden/indra/newview/skins/xui/de/floater_buy_land.xml @@ -149,14 +149,6 @@ Verkleinern Sie Ihre Auswahl. Sie haben Land ausgewählt, das einer anderen Person gehört. Verkleinern Sie Ihre Auswahl. - - Dieses Land ist für Erstkäufer reserviert. -Es kann nicht für eine Gruppe gekauft werden. - - - Dieses Land ist für Erstkäufer reserviert. -Sie besitzen bereits Land. - Kauf wird abgewickelt... diff --git a/linden/indra/newview/skins/xui/es/floater_buy_land.xml b/linden/indra/newview/skins/xui/es/floater_buy_land.xml index 05f81f3..7e7ea71 100644 --- a/linden/indra/newview/skins/xui/es/floater_buy_land.xml +++ b/linden/indra/newview/skins/xui/es/floater_buy_land.xml @@ -148,14 +148,6 @@ Intente seleccionar un área menor. Terreno perteneciente a otro usuario está seleccionado. Intente seleccionar una área menor. - - Este terreno está reservado para los compradores principiantes. -Usted no puede comprarlo para un grupo. - - - Este terreno está reservado para los compradores principiantes. -Usted ya tiene un terreno. - Procesando su compra... @@ -189,11 +181,6 @@ Usted ya tiene un terreno. Ésta será su primer terreno comprado y apenas una vez usted puede comprar una parcela 'Primer terreno'. - - Éste será su primer terreno comprado, pero no -es' una parcela reservada para compradores principiantes. Usted podrá querer -usar la Búsqueda para localizar una parcela barata en 'Primer terreno'. - Usted mantiene [BUYER] m2 de terreno. diff --git a/linden/indra/newview/skins/xui/fr/floater_buy_land.xml b/linden/indra/newview/skins/xui/fr/floater_buy_land.xml index 94b5371..d1ddbbe 100644 --- a/linden/indra/newview/skins/xui/fr/floater_buy_land.xml +++ b/linden/indra/newview/skins/xui/fr/floater_buy_land.xml @@ -149,14 +149,6 @@ Essayez de sélectionner une zone plus petite. Vous avez sélectionné un terrain appartenant à un autre utilisateur. Essayez de sélectionner une zone plus petite. - - Ce terrain est réservé aux nouveaux acheteurs. -Vous ne pouvez l'acheter pour un groupe. - - - Ce terrain est réservé aux nouveaux acheteurs. -Vous possédez déjà du terrain. - Traitement de l'achat en cours... diff --git a/linden/indra/newview/skins/xui/ja/floater_buy_land.xml b/linden/indra/newview/skins/xui/ja/floater_buy_land.xml index dbd3670..c67bdaf 100644 --- a/linden/indra/newview/skins/xui/ja/floater_buy_land.xml +++ b/linden/indra/newview/skins/xui/ja/floater_buy_land.xml @@ -150,14 +150,6 @@ 他の使用者に所有された土地が選択されています。 これより小さなエリアを選択してください。 - - 本土地は初めて土地購入をする人のために確保されています。 -グループのために購入することはできません。 - - - 本土地は初めて土地購入をする人のために確保されています。 -あなたは、すでに土地を所有しています。 - 購入処理中... diff --git a/linden/indra/newview/skins/xui/ko/floater_buy_land.xml b/linden/indra/newview/skins/xui/ko/floater_buy_land.xml index 22408d7..cdd38c8 100644 --- a/linden/indra/newview/skins/xui/ko/floater_buy_land.xml +++ b/linden/indra/newview/skins/xui/ko/floater_buy_land.xml @@ -150,14 +150,6 @@ 다른 사용자 소유의 토지가 선택되었습니다. 더 작은 영역을 선택해 주십시오. - - 이 토지는 최초 구매자를 위해 예약되었습니다. -그룹용으로 구입할 수 없습니다. - - - 이 토지는 최초 구매자를 위해 예약되었습니다. -귀하는 이미 토지를 소유하고 있습니다. - 구매 처리 중.. diff --git a/linden/indra/newview/skins/xui/pt/floater_buy_land.xml b/linden/indra/newview/skins/xui/pt/floater_buy_land.xml index 1811076..d724d35 100644 --- a/linden/indra/newview/skins/xui/pt/floater_buy_land.xml +++ b/linden/indra/newview/skins/xui/pt/floater_buy_land.xml @@ -147,12 +147,6 @@ O lote possuído por outro proprietário está selecionado. Tente uma área menor. - - Este lote está reservado para Residentes que nunca compraram um terreno. Você não pode comprá-lo para um grupo. - - - Este lote está reservado para Residentes que nunca compraram um terreno. Você já adquiriu um lote. - Processando sua compra... (Isso pode levar um minuto) @@ -183,9 +177,6 @@ Esta será sua primeira compra de lote. Será a única vez que você poderá adquirir um lote reservado para "Primeira Compra". - - Esta será sua primeira compra de lote, mas este terreno não está reservado para primeiros compradores. Você pode desejar utilizar a Busca para localizar lotes "Primeira Compra" mais baratos. - Você possui [BUYER] metros quadrados de terra. diff --git a/linden/indra/newview/skins/xui/zh/floater_buy_land.xml b/linden/indra/newview/skins/xui/zh/floater_buy_land.xml index d3b53c9..f7336aa 100644 --- a/linden/indra/newview/skins/xui/zh/floater_buy_land.xml +++ b/linden/indra/newview/skins/xui/zh/floater_buy_land.xml @@ -146,12 +146,6 @@ 你选择了一块由其他人占有的土地.请尝试选择一块较小的土地. - - 这块土地将为第一次购买者保留。你不能为社团购买它。 - - - 这块土地将为第一次购买者保留。你已经拥有自己的土地了。 - Processing your purchase... @@ -184,9 +178,6 @@ 这是你第一次购买土地，并且是你唯一一次能够购买'第一块土地'的机会. - - 这是你第一次购买土地，但你购买的不是为第一次购买土地的用户保留的土地。你可以使用查询功能，定位一块更便宜的 '第一块土地'的代售土地. - 你拥有[BUYER]平方米的土地. -- cgit v1.1