diff options
| -rw-r--r-- | indra/llui/llflatlistview.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llpanelpicks.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/slider_bar.xml | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp index 2481249f91..2e5aeec41d 100644 --- a/indra/llui/llflatlistview.cpp +++ b/indra/llui/llflatlistview.cpp @@ -492,6 +492,12 @@ void LLFlatListView::onItemMouseClick(item_pair_t* item_pair, MASK mask) { if (!item_pair) return; + if (!item_pair->first) + { + llwarning("Attempt to selet an item pair containing null panel item", 0); + return; + } + setFocus(TRUE); bool select_item = !isSelected(item_pair); diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index f0860e7027..ada770f78b 100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -945,7 +945,7 @@ void LLPanelPicks::onPanelClassifiedEdit() LLSD params; params["classified_id"] = c_item->getClassifiedId(); - params["avatar_id"] = c_item->getAvatarId(); + params["classified_creator_id"] = c_item->getAvatarId(); params["snapshot_id"] = c_item->getSnapshotId(); params["name"] = c_item->getClassifiedName(); params["desc"] = c_item->getDescription(); diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml index 89d5950e98..ea63cac790 100644 --- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!--All horizontal sliders are configured to have no highlighted track. See EXT-5939. --> <slider_bar track_color="SliderTrackColor" thumb_outline_color="SliderThumbOutlineColor" thumb_center_color="SliderThumbCenterColor" @@ -7,6 +8,6 @@ thumb_image_disabled="SliderThumb_Disabled" track_image_horizontal="SliderTrack_Horiz" track_image_vertical="SliderTrack_Vert" - track_highlight_horizontal_image="SliderTrack_Horiz" + track_highlight_horizontal_image="transparent.j2c" track_highlight_vertical_image="SliderTrack_Vert" font="SansSerif" /> |