aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to 'linden')
-rw-r--r--linden/doc/contributions.txt1
-rw-r--r--linden/indra/llcommon/llversionviewer.h2
-rw-r--r--linden/indra/newview/app_settings/cmd_line.xml2
-rw-r--r--linden/indra/newview/app_settings/settings.xml2
-rw-r--r--linden/indra/newview/llfloatersnapshot.cpp83
-rw-r--r--linden/indra/newview/llinventorymodel.cpp9
-rw-r--r--linden/indra/newview/releasenotes.txt15
-rw-r--r--linden/indra/newview/skins/xui/de/floater_buy_land.xml8
-rw-r--r--linden/indra/newview/skins/xui/es/floater_buy_land.xml13
-rw-r--r--linden/indra/newview/skins/xui/fr/floater_buy_land.xml8
-rw-r--r--linden/indra/newview/skins/xui/ja/floater_buy_land.xml8
-rw-r--r--linden/indra/newview/skins/xui/ko/floater_buy_land.xml8
-rw-r--r--linden/indra/newview/skins/xui/pt/floater_buy_land.xml9
-rw-r--r--linden/indra/newview/skins/xui/zh/floater_buy_land.xml9
14 files changed, 66 insertions, 111 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index d688df6..12bf2b7 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -146,6 +146,7 @@ Ginko Bayliss
146 VWR-4 146 VWR-4
147Grazer Kline 147Grazer Kline
148 VWR-1092 148 VWR-1092
149 VWR-2113
149Gudmund Shepherd 150Gudmund Shepherd
150 VWR-1594 151 VWR-1594
151Hamncheese Omlet 152Hamncheese Omlet
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 @@
34 34
35const S32 LL_VERSION_MAJOR = 1; 35const S32 LL_VERSION_MAJOR = 1;
36const S32 LL_VERSION_MINOR = 20; 36const S32 LL_VERSION_MINOR = 20;
37const S32 LL_VERSION_PATCH = 11; 37const S32 LL_VERSION_PATCH = 12;
38const S32 LL_VERSION_BUILD = 0; 38const S32 LL_VERSION_BUILD = 0;
39 39
40const char * const LL_CHANNEL = "Second Life Release"; 40const 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 @@
187 </string> 187 </string>
188 <key>count</key> 188 <key>count</key>
189 <integer>2</integer> 189 <integer>2</integer>
190 <key>compose</key>
191 <boolean>true</boolean>
190 <!-- Special case. Mapped to settings procedurally. --> 192 <!-- Special case. Mapped to settings procedurally. -->
191 </map> 193 </map>
192 194
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 @@
9921 <key>Type</key> 9921 <key>Type</key>
9922 <string>Boolean</string> 9922 <string>Boolean</string>
9923 <key>Value</key> 9923 <key>Value</key>
9924 <integer>1</integer> 9924 <integer>0</integer>
9925 </map> 9925 </map>
9926 <key>WaterEditPresets</key> 9926 <key>WaterEditPresets</key>
9927 <map> 9927 <map>
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
1475{ 1475{
1476 LLSnapshotLivePreview *previewp = getPreviewView(view) ; 1476 LLSnapshotLivePreview *previewp = getPreviewView(view) ;
1477 1477
1478 if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == getTypeIndex(view)) 1478 //if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == getTypeIndex(view))
1479 { 1479 //{
1480 previewp->mKeepAspectRatio = FALSE ; 1480 // previewp->mKeepAspectRatio = FALSE ;
1481 return ; 1481 // return ;
1482 } 1482 //}
1483 1483
1484 if(!index) //current window size 1484 if(!index) //current window size
1485 { 1485 {
@@ -1494,7 +1494,7 @@ void LLFloaterSnapshot::Impl::checkAspectRatio(LLFloaterSnapshot *view, S32 inde
1494 else if(-1 == index) //custom 1494 else if(-1 == index) //custom
1495 { 1495 {
1496 sAspectRatioCheckOff = FALSE ; 1496 sAspectRatioCheckOff = FALSE ;
1497 if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE != gSavedSettings.getS32("LastSnapshotType")) 1497 //if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE != gSavedSettings.getS32("LastSnapshotType"))
1498 { 1498 {
1499 view->childSetEnabled("keep_aspect_check", TRUE) ; 1499 view->childSetEnabled("keep_aspect_check", TRUE) ;
1500 1500
@@ -1631,22 +1631,23 @@ BOOL LLFloaterSnapshot::Impl::checkImageSize(LLSnapshotLivePreview* previewp, S3
1631 S32 h = height ; 1631 S32 h = height ;
1632 1632
1633 //if texture, ignore aspect ratio setting, round image size to power of 2. 1633 //if texture, ignore aspect ratio setting, round image size to power of 2.
1634 if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == gSavedSettings.getS32("LastSnapshotType")) 1634 //if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == gSavedSettings.getS32("LastSnapshotType"))
1635 { 1635 //{
1636 if(width > max_value) 1636 // if(width > max_value)
1637 { 1637 // {
1638 width = max_value ; 1638 // width = max_value ;
1639 } 1639 // }
1640 if(height > max_value) 1640 // if(height > max_value)
1641 { 1641 // {
1642 height = max_value ; 1642 // height = max_value ;
1643 } 1643 // }
1644 1644
1645 //round to nearest power of 2 1645 // //round to nearest power of 2
1646 width = get_nearest_power_two(width, MAX_TEXTURE_SIZE) ; 1646 // width = get_nearest_power_two(width, MAX_TEXTURE_SIZE) ;
1647 height = get_nearest_power_two(height, MAX_TEXTURE_SIZE) ; 1647 // height = get_nearest_power_two(height, MAX_TEXTURE_SIZE) ;
1648 } 1648 //}
1649 else if(previewp && previewp->mKeepAspectRatio) 1649 //else
1650 if(previewp && previewp->mKeepAspectRatio)
1650 { 1651 {
1651 if(gViewerWindow->getWindowDisplayWidth() < 1 || gViewerWindow->getWindowDisplayHeight() < 1) 1652 if(gViewerWindow->getWindowDisplayWidth() < 1 || gViewerWindow->getWindowDisplayHeight() < 1)
1652 { 1653 {
@@ -1729,25 +1730,25 @@ void LLFloaterSnapshot::Impl::onCommitCustomResolution(LLUICtrl *ctrl, void* dat
1729 { 1730 {
1730 BOOL update_ = FALSE ; 1731 BOOL update_ = FALSE ;
1731 //if to upload a snapshot, process spinner input in a special way. 1732 //if to upload a snapshot, process spinner input in a special way.
1732 if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == gSavedSettings.getS32("LastSnapshotType")) 1733 //if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == gSavedSettings.getS32("LastSnapshotType"))
1733 { 1734 //{
1734 S32 spinner_increment = (S32)((LLSpinCtrl*)ctrl)->getIncrement() ; 1735 // S32 spinner_increment = (S32)((LLSpinCtrl*)ctrl)->getIncrement() ;
1735 S32 dw = w - curw ; 1736 // S32 dw = w - curw ;
1736 S32 dh = h - curh ; 1737 // S32 dh = h - curh ;
1737 dw = (dw == spinner_increment) ? 1 : ((dw == -spinner_increment) ? -1 : 0) ; 1738 // dw = (dw == spinner_increment) ? 1 : ((dw == -spinner_increment) ? -1 : 0) ;
1738 dh = (dh == spinner_increment) ? 1 : ((dh == -spinner_increment) ? -1 : 0) ; 1739 // dh = (dh == spinner_increment) ? 1 : ((dh == -spinner_increment) ? -1 : 0) ;
1739 1740
1740 if(dw) 1741 // if(dw)
1741 { 1742 // {
1742 w = (dw > 0) ? curw << dw : curw >> -dw ; 1743 // w = (dw > 0) ? curw << dw : curw >> -dw ;
1743 update_ = TRUE ; 1744 // update_ = TRUE ;
1744 } 1745 // }
1745 if(dh) 1746 // if(dh)
1746 { 1747 // {
1747 h = (dh > 0) ? curh << dh : curh >> -dh ; 1748 // h = (dh > 0) ? curh << dh : curh >> -dh ;
1748 update_ = TRUE ; 1749 // update_ = TRUE ;
1749 } 1750 // }
1750 } 1751 //}
1751 1752
1752 previewp->setMaxImageSize((S32)((LLSpinCtrl *)ctrl)->getMaxValue()) ; 1753 previewp->setMaxImageSize((S32)((LLSpinCtrl *)ctrl)->getMaxValue()) ;
1753 if(checkImageSize(previewp, w, h, w != curw, previewp->getMaxImageSize()) || update_) 1754 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] =
111 "Uncompressed Images", // AT_IMAGE_JPEG 111 "Uncompressed Images", // AT_IMAGE_JPEG
112 "Animations", // AT_ANIMATION 112 "Animations", // AT_ANIMATION
113 "Gestures", // AT_GESTURE 113 "Gestures", // AT_GESTURE
114 "New Folder" // AT_SIMSTATE
114}; 115};
115 116
116struct InventoryIDPtrLess 117struct InventoryIDPtrLess
@@ -352,6 +353,12 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
352 return id; 353 return id;
353 } 354 }
354 355
356 if(preferred_type == LLAssetType::AT_SIMSTATE)
357 {
358 lldebugs << "Attempt to create simstate category." << llendl;
359 return id;
360 }
361
355 id.generate(); 362 id.generate();
356 LLString name = pname; 363 LLString name = pname;
357 if(!pname.empty()) 364 if(!pname.empty())
@@ -359,7 +366,7 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
359 name.assign(pname); 366 name.assign(pname);
360 } 367 }
361 else if((preferred_type >= LLAssetType::AT_TEXTURE) && 368 else if((preferred_type >= LLAssetType::AT_TEXTURE) &&
362 (preferred_type < LLAssetType::AT_COUNT)) 369 (preferred_type < LLAssetType::AT_SIMSTATE))
363 { 370 {
364 name.assign(NEW_CATEGORY_NAMES[preferred_type]); 371 name.assign(NEW_CATEGORY_NAMES[preferred_type]);
365 } 372 }
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 @@
4| http://wiki.secondlife.com/wiki/Beta_Release_Notes | 4| http://wiki.secondlife.com/wiki/Beta_Release_Notes |
5+------------------------------------------------------+ 5+------------------------------------------------------+
6 6
7Release Notes for Second Life 1.20(11) June 17th, 2008 7Release Notes for Second Life 1.20(11) June 23rd, 2008
8===================================== 8=====================================
9 9
10Fixes: 10Fixes:
11* Fixed: VWR-7730: Sound / UI Sound broken on Mac PPC RC 1.20.10 11* Fixed: VWR-7730: Sound / UI Sound broken on Mac PPC RC 1.20.10
12* Fixed: VWR-7614: Snapshots show user interface when "Show Interface In Snapshot" is un-checked/ VWR-7679: Interface also shows in screen_last.bmp 12* Fixed: VWR-7614: Snapshots show user interface when "Show Interface In Snapshot" is un-checked
13* 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 13* Fixed: VWR-7679: Interface also shows in screen_last.bmp
14* Fixed: VWR-2633: Some groups can't be accessed from Communicate window and only show in profile
15* Fixed: VWR-6889: Unable to leave group when role has no allowed abilities
14* Fixed: VWR-5895: slowly rotating llTargetOmega child prims stop rotating when you move away 16* Fixed: VWR-5895: slowly rotating llTargetOmega child prims stop rotating when you move away
15* Fixed: VWR-6828: Character > Show Look At / Show Point At don't work 17* Fixed: VWR-6828: Character > Show Look At / Show Point At don't work
16* Fixed: VWR-7682: Typo on Teleport Failure dialog 18* Fixed: VWR-7682: Typo on Teleport Failure dialog
17* Fixed: VWR-7086: floater_buy_land.xml still contains messages regarding First Land 19* Fixed: VWR-7086: floater_buy_land.xml still contains messages regarding First Land
20* Fixed: VWR-6800: Eliminate memory leaks in llcharacter/llmotioncontroller.cpp
21* Fixed: VWR-2051: Regular viewer freezes since update to Voice viewer
18* Fixed: VWR-5697: RC 1.19.1 crash on startup with Vista UAC enabled 22* Fixed: VWR-5697: RC 1.19.1 crash on startup with Vista UAC enabled
19* Fixed: VWR-7723: crash on LLImageGL::setSubImage line 780 23* Fixed: VWR-7723: crash on LLImageGL::setSubImage line 780
20* Fixed: crash on LLViewerImageList::removeImageFromList 24* Fixed: crash on LLViewerImageList::removeImageFromList
@@ -24,8 +28,11 @@ Fixes:
24* Fixed: Load the initial avatar outfit earlier in the startup process to avoid Ruth effect at Orientation Island 28* Fixed: Load the initial avatar outfit earlier in the startup process to avoid Ruth effect at Orientation Island
25* Fixed: Add the new TRANSPARENT_TEXTURE constant's target texture to the inventory Library of 1.20 29* Fixed: Add the new TRANSPARENT_TEXTURE constant's target texture to the inventory Library of 1.20
26* Fixed: Search > Places tab results are displayed in white text 30* Fixed: Search > Places tab results are displayed in white text
31* Fixed: Media URL Set > Cancel button does not cancel
27* Fixed: 1.20 viewer reports GeForce FX5200 card incorrectly 32* Fixed: 1.20 viewer reports GeForce FX5200 card incorrectly
28* Fixed: Fix the URL used by crash_logger for pre login crashes. 33* Fixed: Viewer does not remember the last grid if last grid is AGNI
34* Fixed: Cursor missing from search fields until after text has been manipulated
35* Fixed: Fix the URL used by crash_logger for pre login crashes
29* Fixed: The viewer's crash logger needs to trim very long SecondLife.log files before sending. 36* Fixed: The viewer's crash logger needs to trim very long SecondLife.log files before sending.
30 37
31Localization Fixes: 38Localization 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.
149 Sie haben Land ausgewählt, das einer anderen Person gehört. 149 Sie haben Land ausgewählt, das einer anderen Person gehört.
150Verkleinern Sie Ihre Auswahl. 150Verkleinern Sie Ihre Auswahl.
151 </text> 151 </text>
152 <text name="for_first_time_group">
153 Dieses Land ist für Erstkäufer reserviert.
154Es kann nicht für eine Gruppe gekauft werden.
155 </text>
156 <text name="for_first_time">
157 Dieses Land ist für Erstkäufer reserviert.
158Sie besitzen bereits Land.
159 </text>
160 <text name="processing"> 152 <text name="processing">
161 Kauf wird abgewickelt... 153 Kauf wird abgewickelt...
162 154
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.
148 Terreno perteneciente a otro usuario está seleccionado. 148 Terreno perteneciente a otro usuario está seleccionado.
149Intente seleccionar una área menor. 149Intente seleccionar una área menor.
150 </text> 150 </text>
151 <text name="for_first_time_group">
152 Este terreno está reservado para los compradores principiantes.
153Usted no puede comprarlo para un grupo.
154 </text>
155 <text name="for_first_time">
156 Este terreno está reservado para los compradores principiantes.
157Usted ya tiene un terreno.
158 </text>
159 <text name="processing"> 151 <text name="processing">
160 Procesando su compra... 152 Procesando su compra...
161 153
@@ -189,11 +181,6 @@ Usted ya tiene un terreno.
189 Ésta será su primer terreno comprado y 181 Ésta será su primer terreno comprado y
190apenas una vez usted puede comprar una parcela &apos;Primer terreno&apos;. 182apenas una vez usted puede comprar una parcela &apos;Primer terreno&apos;.
191 </text> 183 </text>
192 <text name="first_time_but_not_first_land">
193 Éste será su primer terreno comprado, pero no
194es&apos; una parcela reservada para compradores principiantes. Usted podrá querer
195usar la Búsqueda para localizar una parcela barata en &apos;Primer terreno&apos;.
196 </text>
197 <text name="land_holdings"> 184 <text name="land_holdings">
198 Usted mantiene [BUYER] m2 de terreno. 185 Usted mantiene [BUYER] m2 de terreno.
199 </text> 186 </text>
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.
149 Vous avez sélectionné un terrain appartenant à un autre utilisateur. 149 Vous avez sélectionné un terrain appartenant à un autre utilisateur.
150Essayez de sélectionner une zone plus petite. 150Essayez de sélectionner une zone plus petite.
151 </text> 151 </text>
152 <text name="for_first_time_group">
153 Ce terrain est réservé aux nouveaux acheteurs.
154Vous ne pouvez l&apos;acheter pour un groupe.
155 </text>
156 <text name="for_first_time">
157 Ce terrain est réservé aux nouveaux acheteurs.
158Vous possédez déjà du terrain.
159 </text>
160 <text name="processing"> 152 <text name="processing">
161 Traitement de l&apos;achat en cours... 153 Traitement de l&apos;achat en cours...
162 154
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 @@
150 他の使用者に所有された土地が選択されています。 150 他の使用者に所有された土地が選択されています。
151これより小さなエリアを選択してください。 151これより小さなエリアを選択してください。
152 </text> 152 </text>
153 <text name="for_first_time_group">
154 本土地は初めて土地購入をする人のために確保されています。
155グループのために購入することはできません。
156 </text>
157 <text name="for_first_time">
158 本土地は初めて土地購入をする人のために確保されています。
159あなたは、すでに土地を所有しています。
160 </text>
161 <text name="processing"> 153 <text name="processing">
162 購入処理中... 154 購入処理中...
163 155
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 @@
150 다른 사용자 소유의 토지가 선택되었습니다. 150 다른 사용자 소유의 토지가 선택되었습니다.
151더 작은 영역을 선택해 주십시오. 151더 작은 영역을 선택해 주십시오.
152 </text> 152 </text>
153 <text name="for_first_time_group">
154 이 토지는 최초 구매자를 위해 예약되었습니다.
155그룹용으로 구입할 수 없습니다.
156 </text>
157 <text name="for_first_time">
158 이 토지는 최초 구매자를 위해 예약되었습니다.
159귀하는 이미 토지를 소유하고 있습니다.
160 </text>
161 <text name="processing"> 153 <text name="processing">
162 구매 처리 중.. 154 구매 처리 중..
163 155
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 @@
147 <text name="not_owned_by_you"> 147 <text name="not_owned_by_you">
148 O lote possuído por outro proprietário está selecionado. Tente uma área menor. 148 O lote possuído por outro proprietário está selecionado. Tente uma área menor.
149 </text> 149 </text>
150 <text name="for_first_time_group">
151 Este lote está reservado para Residentes que nunca compraram um terreno. Você não pode comprá-lo para um grupo.
152 </text>
153 <text name="for_first_time">
154 Este lote está reservado para Residentes que nunca compraram um terreno. Você já adquiriu um lote.
155 </text>
156 <text name="processing"> 150 <text name="processing">
157 Processando sua compra... (Isso pode levar um minuto) 151 Processando sua compra... (Isso pode levar um minuto)
158 </text> 152 </text>
@@ -183,9 +177,6 @@
183 <text name="first_purchase"> 177 <text name="first_purchase">
184 Esta será sua primeira compra de lote. Será a única vez que você poderá adquirir um lote reservado para &quot;Primeira Compra&quot;. 178 Esta será sua primeira compra de lote. Será a única vez que você poderá adquirir um lote reservado para &quot;Primeira Compra&quot;.
185 </text> 179 </text>
186 <text name="first_time_but_not_first_land">
187 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 &quot;Primeira Compra&quot; mais baratos.
188 </text>
189 <text name="land_holdings"> 180 <text name="land_holdings">
190 Você possui [BUYER] metros quadrados de terra. 181 Você possui [BUYER] metros quadrados de terra.
191 </text> 182 </text>
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 @@
146 <text name="not_owned_by_you"> 146 <text name="not_owned_by_you">
147 你选择了一块由其他人占有的土地.请尝试选择一块较小的土地. 147 你选择了一块由其他人占有的土地.请尝试选择一块较小的土地.
148 </text> 148 </text>
149 <text name="for_first_time_group">
150 这块土地将为第一次购买者保留。你不能为社团购买它。
151 </text>
152 <text name="for_first_time">
153 这块土地将为第一次购买者保留。你已经拥有自己的土地了。
154 </text>
155 <text name="processing"> 149 <text name="processing">
156 Processing your purchase... 150 Processing your purchase...
157 151
@@ -184,9 +178,6 @@
184 <text name="first_purchase"> 178 <text name="first_purchase">
185 这是你第一次购买土地，并且是你唯一一次能够购买&apos;第一块土地&apos;的机会. 179 这是你第一次购买土地，并且是你唯一一次能够购买&apos;第一块土地&apos;的机会.
186 </text> 180 </text>
187 <text name="first_time_but_not_first_land">
188 这是你第一次购买土地，但你购买的不是为第一次购买土地的用户保留的土地。你可以使用查询功能，定位一块更便宜的 &apos;第一块土地&apos;的代售土地.
189 </text>
190 <text name="land_holdings"> 181 <text name="land_holdings">
191 你拥有[BUYER]平方米的土地. 182 你拥有[BUYER]平方米的土地.
192 </text> 183 </text>
generated by cgit v1.1 at 2024-11-15 19:24:10 +0000