FIX EXT-5680: Get rid of unnecessary code that formats the media item count
Review #139 The crash was happening because the German (locale "de") version of the format string had an %ls in it, which was causing the crash. Getting rid of the widget and the string since it is no longer desired in the design.master
parent
37291bea8d
commit
8cf7dad209
|
|
@ -135,7 +135,6 @@ BOOL LLPanelNearByMedia::postBuild()
|
|||
mMediaList = getChild<LLScrollListCtrl>("media_list");
|
||||
mEnableAllCtrl = getChild<LLUICtrl>("all_nearby_media_enable_btn");
|
||||
mDisableAllCtrl = getChild<LLUICtrl>("all_nearby_media_disable_btn");
|
||||
mItemCountText = getChild<LLTextBox>("media_item_count");
|
||||
mShowCtrl = getChild<LLComboBox>("show_combo");
|
||||
|
||||
// Dynamic (selection-dependent) controls
|
||||
|
|
@ -250,8 +249,6 @@ void LLPanelNearByMedia::draw()
|
|||
setShape(new_rect);
|
||||
}
|
||||
|
||||
mItemCountText->setValue(llformat(getString("media_item_count_format").c_str(), mMediaList->getItemCount()));
|
||||
|
||||
refreshList();
|
||||
updateControls();
|
||||
|
||||
|
|
|
|||
|
|
@ -149,7 +149,6 @@ private:
|
|||
void onClickSelectedMediaUnzoom();
|
||||
|
||||
LLUICtrl* mNearbyMediaPanel;
|
||||
LLTextBox* mItemCountText;
|
||||
LLScrollListCtrl* mMediaList;
|
||||
LLUICtrl* mEnableAllCtrl;
|
||||
LLUICtrl* mDisableAllCtrl;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel name="nearby_media">
|
||||
<string name="media_item_count_format">
|
||||
(%ls Medien-Objekte)
|
||||
</string>
|
||||
<string name="empty_item_text">
|
||||
<leer>
|
||||
</string>
|
||||
|
|
|
|||
|
|
@ -2,23 +2,22 @@
|
|||
<panel
|
||||
can_resize="true"
|
||||
can_close="false"
|
||||
bg_opaque_image="Volume_Background"
|
||||
bg_alpha_image="Volume_Background"
|
||||
background_opaque="true"
|
||||
bg_opaque_image="Volume_Background"
|
||||
bg_alpha_image="Volume_Background"
|
||||
background_opaque="true"
|
||||
background_visible="true"
|
||||
layout="topleft"
|
||||
width="270"
|
||||
height="235"
|
||||
name="nearby_media"
|
||||
help_topic="nearby_media">
|
||||
<string name="media_item_count_format">(%ld media items)</string>
|
||||
<string name="empty_item_text"><empty></string>
|
||||
<string name="parcel_media_name">Parcel Streaming Media</string>
|
||||
<string name="parcel_audio_name">Parcel Streaming Audio</string>
|
||||
<string name="playing_suffix">(playing)</string>
|
||||
<panel
|
||||
bevel_style="in"
|
||||
background_visible="false"
|
||||
background_visible="false"
|
||||
follows="left|right|top"
|
||||
top="0"
|
||||
height="30"
|
||||
|
|
@ -98,20 +97,6 @@
|
|||
width="100">
|
||||
Nearby Media
|
||||
</text>
|
||||
<!-- nix for now
|
||||
<text
|
||||
bottom_delta="1"
|
||||
type="string"
|
||||
follows="top|left|right"
|
||||
font="SansSerif"
|
||||
font.style="ITALIC"
|
||||
font.size="Small"
|
||||
name="media_item_count"
|
||||
left="115"
|
||||
right="-10">
|
||||
(?? media items)
|
||||
</text>
|
||||
-->
|
||||
<text
|
||||
type="string"
|
||||
length="1"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel name="nearby_media">
|
||||
<string name="media_item_count_format">
|
||||
(%ld articles de média)
|
||||
</string>
|
||||
<string name="empty_item_text">
|
||||
<vide>
|
||||
</string>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel name="nearby_media">
|
||||
<string name="media_item_count_format">
|
||||
(メディアアイテム %ld )
|
||||
</string>
|
||||
<string name="empty_item_text">
|
||||
<空>
|
||||
</string>
|
||||
|
|
|
|||
Loading…
Reference in New Issue