summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/llimage/llimage.cpp3
-rw-r--r--indra/newview/llappearancemgr.cpp2
-rw-r--r--indra/newview/lltexlayer.cpp5
-rw-r--r--indra/newview/lltexturecache.cpp8
-rw-r--r--indra/newview/lltoolpie.cpp27
-rw-r--r--indra/newview/skins/default/xui/de/floater_tools.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_event.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_place_profile.xml14
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_task_info.xml2
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml4
-rw-r--r--indra/newview/skins/default/xui/fr/panel_nearby_media.xml4
-rw-r--r--indra/newview/skins/default/xui/fr/panel_region_texture.xml8
-rw-r--r--indra/newview/skins/default/xui/ja/panel_nearby_media.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/panel_place_profile.xml10
14 files changed, 61 insertions, 32 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 5649b4cab7..7d0de18c7c 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -157,8 +157,9 @@ U8* LLImageBase::allocateData(S32 size)
llerrs << llformat("LLImageBase::allocateData called with bad dimensions: %dx%dx%d",mWidth,mHeight,mComponents) << llendl;
}
}
- else if (size <= 0 || (size > 4096*4096*16 && sSizeOverride == FALSE))
+ if (size < 1 || (size > 4096*4096*16 && sSizeOverride == FALSE))
{
+ llinfos << "width: " << mWidth << " height: " << mHeight << " components: " << mComponents << llendl ;
llerrs << "LLImageBase::allocateData: bad size: " << size << llendl;
}
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index f686eccf37..82110f3ab7 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -436,9 +436,9 @@ void LLWearableHoldingPattern::checkMissingWearables()
}
}
+ mWaitTime.reset();
if (!pollMissingWearables())
{
- mWaitTime.reset();
doOnIdleRepeating(boost::bind(&LLWearableHoldingPattern::pollMissingWearables,this));
}
}
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 6ed95f2cbf..386b636367 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -1883,6 +1883,11 @@ LLTexLayer* LLTexLayerTemplate::getLayer(U32 i)
/*virtual*/ BOOL LLTexLayerTemplate::render(S32 x, S32 y, S32 width, S32 height)
{
+ if(!mInfo)
+ {
+ return FALSE ;
+ }
+
BOOL success = TRUE;
updateWearableCache();
for (wearable_cache_t::const_iterator iter = mWearableCache.begin(); iter!= mWearableCache.end(); iter++)
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index 4649b9cbef..49770030c6 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -1140,6 +1140,10 @@ void LLTextureCache::writeEntryAndClose(S32 idx, Entry& entry)
{
mTexturesSizeMap[entry.mID] = entry.mBodySize;
}
+ else if(mTexturesSizeMap.find(entry.mID) != mTexturesSizeMap.end() && mTexturesSizeMap[entry.mID] > 0)
+ {
+ llerrs << "mTexturesSizeMap / mHeaderIDMap corrupted." << llendl ;
+ }
// llinfos << "Updating TE: " << idx << ": " << id << " Size: " << entry.mBodySize << " Time: " << entry.mTime << llendl;
mHeaderEntriesMaxWriteIdx = llmax(mHeaderEntriesMaxWriteIdx, idx);
mUpdatedEntryMap[idx] = entry ;
@@ -1450,6 +1454,10 @@ void LLTextureCache::purgeTextures(bool validate)
time_idx_set.insert(std::make_pair(entries[idx].mTime, idx));
// llinfos << "TIME: " << entries[idx].mTime << " TEX: " << entries[idx].mID << " IDX: " << idx << " Size: " << entries[idx].mImageSize << llendl;
}
+ else
+ {
+ llerrs << "mTexturesSizeMap / mHeaderIDMap corrupted." << llendl ;
+ }
}
}
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index fb78b6a415..2f4a69a53c 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -901,6 +901,16 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
|| !existing_inspector->getVisible()
|| existing_inspector->getKey()["object_id"].asUUID() != hover_object->getID()))
{
+
+ // Add price to tooltip for items on sale
+ bool for_sale = for_sale_selection(nodep);
+ if(for_sale)
+ {
+ LLStringUtil::format_map_t args;
+ args["[PRICE]"] = llformat ("%d", nodep->mSaleInfo.getSalePrice());
+ tooltip_msg.append(LLTrans::getString("TooltipPrice", args) );
+ }
+
if (nodep->mName.empty())
{
tooltip_msg.append(LLTrans::getString("TooltipNoName"));
@@ -931,7 +941,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
if (media_impl.notNull() && (media_impl->hasMedia()))
{
is_media_displaying = true;
- LLStringUtil::format_map_t args;
+ //LLStringUtil::format_map_t args;
media_plugin = media_impl->getMediaPlugin();
if(media_plugin)
@@ -954,14 +964,17 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
}
}
}
-
- // Avoid showing tip over media that's displaying
+
+
+ // Avoid showing tip over media that's displaying unless it's for sale
// also check the primary node since sometimes it can have an action even though
// the root node doesn't
- bool needs_tip = !is_media_displaying &&
- (has_media ||
- needs_tooltip(nodep) ||
- needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode()));
+
+ bool needs_tip = (!is_media_displaying ||
+ for_sale) &&
+ (has_media ||
+ needs_tooltip(nodep) ||
+ needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode()));
if (show_all_object_tips || needs_tip)
{
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index 7091e35a6e..46023bcf19 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -477,7 +477,7 @@
<text name="label_area">
Gebiet: [AREA] m².
</text>
- <button label="Über Land" label_selected="Über Land" name="button about land"/>
+ <button label="Land-Info" label_selected="Land-Info" name="button about land"/>
<check_box label="Eigentümer anzeigen" name="checkbox show owners" tool_tip="Die Parzellen farblich nach Eigentümtertyp anzeigen Grün = Ihr Land Blau = Das Land Ihrer Gruppe Rot = Im Eigentum anderer Geld = Zum Verkauf Lila = Zur Auktion Grau = Öffentlich"/>
<text name="label_parcel_modify">
Parzelle ändern
diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
index bcf15d7193..0255e202fb 100644
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
@@ -228,7 +228,7 @@
name="rating_label"
top_delta="3"
value="Rating:"
- width="58" />
+ width="90" />
<text
follows="left|right|top"
height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 1e7c51259c..9e5ef10d42 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -353,7 +353,7 @@
left_pad="12"
name="rating_label"
value="Rating:"
- width="60" />
+ width="90" />
<text
follows="left|right|top"
height="16"
@@ -380,7 +380,7 @@
name="voice_label"
top_delta="0"
value="Voice:"
- width="60" />
+ width="90" />
<text
follows="left|right|top"
height="18"
@@ -406,7 +406,7 @@
left_pad="8"
name="fly_label"
value="Fly:"
- width="60" />
+ width="90" />
<text
follows="left|right|top"
height="16"
@@ -432,7 +432,7 @@
left_pad="8"
name="push_label"
value="Push:"
- width="60" />
+ width="90" />
<text
follows="left|right|top"
height="14"
@@ -458,7 +458,7 @@
left_pad="8"
name="build_label"
value="Build:"
- width="60" />
+ width="90" />
<text
follows="left|right|top"
height="15"
@@ -484,7 +484,7 @@
left_pad="8"
name="scripts_label"
value="Scripts:"
- width="60" />
+ width="90" />
<text
follows="left|right|top"
height="14"
@@ -510,7 +510,7 @@
left_pad="8"
name="damage_label"
value="Damage:"
- width="60" />
+ width="90" />
<text
follows="left|right|top"
height="14"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 433b7691fa..d46783e058 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -303,7 +303,7 @@
follows="left|top|right"
layout="topleft"
name="perm_modify"
- width="200">
+ width="310">
You can modify this object
</text>
<text
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 59c54f0cad..1eaf77c328 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -76,7 +76,9 @@
<string name="TooltipObjectIMUrl">Click to view this object's description</string>
<string name="TooltipMapUrl">Click to view this location on a map</string>
<string name="TooltipSLAPP">Click to run the secondlife:// command</string>
- <string name="CurrentURL" value=" CurrentURL: [CurrentURL]" />
+ <string name="CurrentURL" value=" CurrentURL: [CurrentURL]" />
+ <string name="TooltipPrice" value=" L$[PRICE]-" />
+
<!-- text for SLURL labels -->
<string name="SLurlLabelTeleport">Teleport to</string>
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
index 71e65232aa..a1c4c92618 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
@@ -13,8 +13,8 @@
(lecture en cours)
</string>
<panel name="minimized_controls">
- <button label="Tout arrêter" name="all_nearby_media_disable_btn" tool_tip="Désactiver tous les médias près de vous"/>
- <button label="Tout lancer" name="all_nearby_media_enable_btn" tool_tip="Activer tous les médias près de vous"/>
+ <button label="Arrêter" name="all_nearby_media_disable_btn" tool_tip="Désactiver tous les médias près de vous"/>
+ <button label="Jouer" name="all_nearby_media_enable_btn" tool_tip="Activer tous les médias près de vous"/>
<button name="open_prefs_btn" tool_tip="Ouvrir les préférences de média"/>
<button label="Plus &gt;&gt;" label_selected="Moins &lt;&lt;" name="more_less_btn" tool_tip="Options avancées"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_texture.xml b/indra/newview/skins/default/xui/fr/panel_region_texture.xml
index be7ca456f1..c0b667137a 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_texture.xml
@@ -43,10 +43,10 @@
Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
</text>
<text name="height_text_lbl11">
- En mètres, la valeur Bas correspond à la hauteur maximum de la texture n°1 et la valeur Haut correspond à la hauteur minimum de la texture n°4.
+ En mètres, la valeur Bas correspond à la hauteur max. de la texture n°1
</text>
<text name="height_text_lbl12">
- et la valeur Haut correspond à la hauteur minimum de la texture n°4.
+ et la valeur Haut correspond à la hauteur min. de la texture n°4.
</text>
<text name="height_text_lbl13">
Nord-est
@@ -63,10 +63,10 @@
Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
</text>
<text name="height_text_lbl15">
- En mètres, la valeur BASSE correspond à la hauteur MAXIMUM de la Texture #1,
+ La valeur Bas correspond à la hauteur max. de la Texture 1,
</text>
<text name="height_text_lbl16">
- et la valeur HAUTE correspond à la hauteur MINIMUM de la Texture #4.
+ et la valeur Haut correspond à la hauteur min. de la Texture 4.
</text>
<button label="Appliquer" name="apply_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
index a670975dda..eae9ac03c3 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
@@ -49,7 +49,7 @@
<button name="mute_btn" tool_tip="選択したメディアの音をミュート"/>
</layout_panel>
<layout_panel name="zoom">
- <button name="zoom_btn" tool_tip="選択したメディアに近づく"/>
+ <button name="zoom_btn" tool_tip="選択したメディアにズーム"/>
</layout_panel>
<layout_panel name="unzoom">
<button name="unzoom_btn" tool_tip="選択したメディアから遠ざかる"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
index 433ed0ad93..9de04f0d6a 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -69,7 +69,7 @@
<accordion name="advanced_info_accordion">
<accordion_tab name="parcel_characteristics_tab" title="区画">
<panel name="parcel_characteristics_panel">
- <text name="rating_label" value="レーティング区分："/>
+ <text name="rating_label" value="レーティング："/>
<text name="rating_value" value="不明"/>
<text name="voice_label" value="ボイス："/>
<text name="voice_value" value="オン"/>
@@ -88,11 +88,11 @@
</accordion_tab>
<accordion_tab name="region_information_tab" title="リージョン（地域） ">
<panel name="region_information_panel">
- <text name="region_name_label" value="リージョン（地域）:"/>
+ <text name="region_name_label" value="リージョン:"/>
<text name="region_name" value="Mooseland"/>
<text name="region_type_label" value="種類："/>
<text name="region_type" value="Moose"/>
- <text name="region_rating_label" value="レーティング区分："/>
+ <text name="region_rating_label" value="レーティング："/>
<text name="region_rating" value="Adult"/>
<text name="region_owner_label" value="所有者："/>
<text name="region_owner" value="moose Van Moose"/>
@@ -105,8 +105,8 @@
</accordion_tab>
<accordion_tab name="estate_information_tab" title="エステート（不動産）">
<panel name="estate_information_panel">
- <text name="estate_name_label" value="エステート（不動産）："/>
- <text name="estate_rating_label" value="レーティング区分："/>
+ <text name="estate_name_label" value="エステート："/>
+ <text name="estate_rating_label" value="レーティング："/>
<text name="estate_owner_label" value="所有者："/>
<text name="covenant_label" value="約款："/>
</panel>
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-02 18:02:38 +0000