livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-588-maint-W' of H:/ViewerDev/viewer-588 

# Conflicts:
#	indra/newview/llspatialpartition.cpp
#	indra/newview/skins/default/xui/en/alert_icon.xml
#	indra/newview/skins/default/xui/en/floater_associate_listing.xml
#	indra/newview/skins/default/xui/en/floater_ban_duration.xml
#	indra/newview/skins/default/xui/en/floater_experiences.xml
#	indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
#	indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
#	indra/newview/skins/default/xui/en/floater_mfa.xml
#	indra/newview/skins/default/xui/en/floater_mute_object.xml
#	indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
#	indra/newview/skins/default/xui/en/floater_preview_animation.xml
#	indra/newview/skins/default/xui/en/floater_script_search.xml
#	indra/newview/skins/default/xui/en/floater_test_inspectors.xml
#	indra/newview/skins/default/xui/en/floater_test_line_editor.xml
#	indra/newview/skins/default/xui/en/floater_test_textbox.xml
#	indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
#	indra/newview/skins/default/xui/en/floater_web_content.xml
#	indra/newview/skins/default/xui/en/menu_profile_overflow.xml
#	indra/newview/skins/default/xui/en/menu_toolbars.xml
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
#	indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
#	indra/newview/skins/default/xui/en/panel_edit_universal.xml
#	indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/en/panel_navigation_bar.xml
#	indra/newview/skins/default/xui/en/panel_performance_complexity.xml
#	indra/newview/skins/default/xui/en/panel_performance_huds.xml
#	indra/newview/skins/default/xui/en/panel_performance_preferences.xml
#	indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
#	indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
#	indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml
#	indra/newview/skins/default/xui/en/widgets/name_editor.xml
#	indra/newview/skins/default/xui/en/widgets/notification_list_view.xml
#	indra/newview/skins/default/xui/en/widgets/view_border.xml
master
Ansariel 2023-11-30 18:59:41 +01:00
parent 508eb80872 06c2c87bfa
commit f08bf0aa72
581 changed files with 662 additions and 639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -292,6 +292,7 @@ Beq Janus
SL-18637
SL-19317
SL-19660
SL-20610
Beth Walcher
Bezilon Kasei
Biancaluce Robbiani

22
indra/llprimitive/llmodel.cpp
View File

@ -1012,7 +1012,12 @@ LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos)
weight_map::iterator iterPos = mSkinWeights.begin();
weight_map::iterator iterEnd = mSkinWeights.end();
llassert(!mSkinWeights.empty());
if (mSkinWeights.empty())
{
// function calls iter->second on all return paths
// everything that calls this function should precheck that there is data.
LL_ERRS() << "called getJointInfluences with empty weights list" << LL_ENDL;
}
for ( ; iterPos!=iterEnd; ++iterPos )
{
@ -1039,11 +1044,16 @@ LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos)
const F32 epsilon = 1e-5f;
weight_map::iterator iter_up = mSkinWeights.lower_bound(pos);
weight_map::iterator iter_down = iter_up;
if (iter_up != mSkinWeights.end())
{
iter_down = ++iter_up;
}
weight_map::iterator best = iter_up;
weight_map::iterator best = iter_up;
if (iter_up != mSkinWeights.end())
{
iter_down = ++iter_up;
}
else
{
// Assumes that there is at least one element
--best;
}
// <FS:ND> FIRE-9251; There is no way iter can be valid here, otherwise we had hit the if branch and not the else branch.
// F32 min_dist = (iter->first - pos).magVec();

11
indra/newview/llappviewer.cpp
View File

@ -6344,9 +6344,18 @@ void LLAppViewer::forceErrorBadMemoryAccess()
void LLAppViewer::forceErrorInfiniteLoop()
{
LL_WARNS() << "Forcing a deliberate infinite loop" << LL_ENDL;
// Loop is intentionally complicated to fool basic loop detection
LLTimer timer_total;
LLTimer timer_expiry;
const S32 report_frequency = 10;
timer_expiry.setTimerExpirySec(report_frequency);
while(true)
{
;
if (timer_expiry.hasExpired())
{
LL_INFOS() << "Infinite loop time : " << timer_total.getElapsedSeconds() << LL_ENDL;
timer_expiry.setTimerExpirySec(report_frequency);
}
}
return;
}

4
indra/newview/llspatialpartition.cpp
View File

@ -877,10 +877,8 @@ void LLSpatialGroup::rebound()
if (controlAvatar &&
controlAvatar->mDrawable &&
controlAvatar->mControlAVBridge &&
controlAvatar->mControlAVBridge->mOctree)// <FS:Beq> FIRE-33367 toggling animesh state off causes a crash
controlAvatar->mControlAVBridge->mOctree)
{
llassert(controlAvatar->mControlAVBridge->mOctree);
LLSpatialGroup* root = (LLSpatialGroup*)controlAvatar->mControlAVBridge->mOctree->getListener(0);
if (this == root)
{

2
indra/newview/skins/default/xui/en/alert_button.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<button
name="Alert Button"

2
indra/newview/skins/default/xui/en/alert_check_box.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<check_box
label_text.text_color="LabelTextColor"
label_text.text_readonly_color="LabelDisabledColor"

2
indra/newview/skins/default/xui/en/alert_icon.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<icon color="White"
tab_stop="false"
mouse_opaque="false"

2
indra/newview/skins/default/xui/en/alert_line_editor.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<line_editor
select_on_focus="false"
revert_on_esc="true"

2
indra/newview/skins/default/xui/en/control_table_contents_camera.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<contents>
<rows
enabled="false"

2
indra/newview/skins/default/xui/en/control_table_contents_columns_basic.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<contents>
<columns
relative_width="0.34"

2
indra/newview/skins/default/xui/en/control_table_contents_editing.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<contents>
<rows
enabled="false"

2
indra/newview/skins/default/xui/en/control_table_contents_media.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<contents>
<rows
enabled="false"

2
indra/newview/skins/default/xui/en/control_table_contents_movement.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<contents>
<rows
enabled="false"

2
indra/newview/skins/default/xui/en/favorites_bar_button.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!-- *NOTE: mantipov: top & height should be synchronized with <favorites_bar> in the panel_navigation_bar.xml-->
<!-- All buttons in the Favorites bar will be created from this one -->
<button

4
indra/newview/skins/default/xui/en/floater_360capture.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater can_resize="true"
height="400"
layout="topleft"
@ -133,4 +133,4 @@
Click and drag on the image to pan
</text>
</panel>
</floater>
</floater>

2
indra/newview/skins/default/xui/en/floater_aaa.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
can_minimize="false"
can_tear_off="false"

2
indra/newview/skins/default/xui/en/floater_about.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="centered"
legacy_header_height="18"

4
indra/newview/skins/default/xui/en/floater_about_land.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="cascading"
can_tear_off="false"
@ -308,7 +308,7 @@ Loading...
image_pressed="Info_Press"
image_unselected="Info_Over"
left_pad="3"
name="info_btn"
name="info_btn1"
top_delta="-2"
width="16" />
<button

2
indra/newview/skins/default/xui/en/floater_activeim.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
name="floater_activeim"

2
indra/newview/skins/default/xui/en/floater_add_payment_method.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
height="405"
width="900"

2
indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="180"

2
indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_minimize="false"

2
indra/newview/skins/default/xui/en/floater_associate_listing.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_minimize="false"

2
indra/newview/skins/default/xui/en/floater_auction.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_resize="true"

2
indra/newview/skins/default/xui/en/floater_autoreplace.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
border="true"
can_close="true"

2
indra/newview/skins/default/xui/en/floater_avatar.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="cascading"
legacy_header_height="225"

2
indra/newview/skins/default/xui/en/floater_avatar_picker.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="cascading"
legacy_header_height="18"

2
indra/newview/skins/default/xui/en/floater_avatar_render_settings.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
can_resize="true"
positioning="cascading"

2
indra/newview/skins/default/xui/en/floater_avatar_textures.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="700"

2
indra/newview/skins/default/xui/en/floater_ban_duration.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
can_minimize="false"
can_tear_off="false"

4
indra/newview/skins/default/xui/en/floater_beacons.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="332"
@ -183,7 +183,7 @@
font="SansSerif"
left="0"
top_pad="7"
name="label_objects"
name="label_objects1"
text_color="White"
type="string">
Show direction to:

2
indra/newview/skins/default/xui/en/floater_big_preview.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="cascading"
can_close="true"

2
indra/newview/skins/default/xui/en/floater_build_options.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="205"

2
indra/newview/skins/default/xui/en/floater_bulk_perms.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_tear_off="false"

2
indra/newview/skins/default/xui/en/floater_bumps.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="180"

2
indra/newview/skins/default/xui/en/floater_buy_contents.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_resize="true"

2
indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
can_resize="false"
can_close="true"

2
indra/newview/skins/default/xui/en/floater_buy_land.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_minimize="false"

2
indra/newview/skins/default/xui/en/floater_buy_object.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_resize="true"

2
indra/newview/skins/default/xui/en/floater_camera_presets.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_resize="true"

2
indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
can_resize="false"
height="366"

2
indra/newview/skins/default/xui/en/floater_choose_group.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="258"

2
indra/newview/skins/default/xui/en/floater_color_picker.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_minimize="false"

2
indra/newview/skins/default/xui/en/floater_conversation_log.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
can_resize="true"

2
indra/newview/skins/default/xui/en/floater_conversation_preview.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_resize="true"

2
indra/newview/skins/default/xui/en/floater_create_landmark.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
can_resize="false"
show_title="true"

2
indra/newview/skins/default/xui/en/floater_critical.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_close="false"

2
indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="130"

2
indra/newview/skins/default/xui/en/floater_destinations.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="centered"
can_minimize="true"

2
indra/newview/skins/default/xui/en/floater_display_name.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_minimize="false"

2
indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
layout="topleft"
name="env_edit_extdaycycle"

2
indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="cascading"
legacy_header_height="18"

2
indra/newview/skins/default/xui/en/floater_event.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
height="400"
can_resize="true"

2
indra/newview/skins/default/xui/en/floater_experience_search.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="cascading"
legacy_header_height="18"

2
indra/newview/skins/default/xui/en/floater_experienceprofile.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
name="experience_profile"

2
indra/newview/skins/default/xui/en/floater_experiences.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
can_close="true"

2
indra/newview/skins/default/xui/en/floater_fast_timers.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_minimize="false"

2
indra/newview/skins/default/xui/en/floater_fbc_web.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_fbc_web"
help_topic="fbc_web"
width="780"

2
indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
can_tear_off="false"
can_resize="false"

2
indra/newview/skins/default/xui/en/floater_font_test.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_resize="true"

2
indra/newview/skins/default/xui/en/floater_forget_user.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="258"

2
indra/newview/skins/default/xui/en/floater_gesture.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="cascading"
save_rect="true"

2
indra/newview/skins/default/xui/en/floater_god_tools.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="384"

4
indra/newview/skins/default/xui/en/floater_goto_line.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
default_tab_group="1"
@ -41,4 +41,4 @@
tab_group="1"
top="21"
width="85" />
</floater>
</floater>

2
indra/newview/skins/default/xui/en/floater_grid_status.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="cascading"
legacy_header_height="18"

2
indra/newview/skins/default/xui/en/floater_help_browser.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="centered"
legacy_header_height="18"

4
indra/newview/skins/default/xui/en/floater_how_to.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_resize="false"
@ -14,4 +14,4 @@
width="310"
rel_x="-0.469309"
rel_y="-0.011166"
filename="floater_web_content.xml"/>
filename="floater_web_content.xml"/>

2
indra/newview/skins/default/xui/en/floater_hud.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_minimize="false"

2
indra/newview/skins/default/xui/en/floater_im_container.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<multi_floater
can_close="true"
can_minimize="true"

2
indra/newview/skins/default/xui/en/floater_im_session.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
background_visible="true"
height="355"

2
indra/newview/skins/default/xui/en/floater_image_preview.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_minimize="false"

2
indra/newview/skins/default/xui/en/floater_import_collada.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater can_close="false" can_drag_on_left="false" can_minimize="false"
can_resize="false" height="160" min_height="160" width="300" min_width="300"
name="Import Collada" title="Import Scene">

2
indra/newview/skins/default/xui/en/floater_incoming_call.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_close="false"

2
indra/newview/skins/default/xui/en/floater_inspect.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_resize="true"

2
indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="389"

2
indra/newview/skins/default/xui/en/floater_inventory_settings.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
can_close="true"
can_minimize="true"

2
indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!-- <FS:Zi> Changed height from 512 to 528 in this block -->
<floater
legacy_header_height="18"

2
indra/newview/skins/default/xui/en/floater_item_properties.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="570"

2
indra/newview/skins/default/xui/en/floater_joystick.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="500"

2
indra/newview/skins/default/xui/en/floater_lagmeter.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="170"

2
indra/newview/skins/default/xui/en/floater_land_holdings.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="centered"
legacy_header_height="18"

2
indra/newview/skins/default/xui/en/floater_linkreplace.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
name="linkreplace"
help_topic="fs_linkreplace"

2
indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
bevel_style="none"

2
indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
height="130"

2
indra/newview/skins/default/xui/en/floater_lsl_guide.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_resize="true"

2
indra/newview/skins/default/xui/en/floater_map.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="none"
bg_alpha_image_overlay="DkGray"

2
indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
title="Audit Marketplace Listings"
name="floater_marketplace_validation"

2
indra/newview/skins/default/xui/en/floater_media_browser.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_resize="true"

2
indra/newview/skins/default/xui/en/floater_media_settings.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_close="true"

2
indra/newview/skins/default/xui/en/floater_mem_leaking.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_minimize="false"

2
indra/newview/skins/default/xui/en/floater_model_preview.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
can_close="true"
can_drag_on_left="false"

2
indra/newview/skins/default/xui/en/floater_moveview.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="specified"
right="-693"

2
indra/newview/skins/default/xui/en/floater_mute_object.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_minimize="false"

2
indra/newview/skins/default/xui/en/floater_my_scripts.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_resize="true"

4
indra/newview/skins/default/xui/en/floater_my_web_profile.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_my_web_profile"
help_topic="web_profile"
width="780"
@ -6,4 +6,4 @@
save_rect="true"
single_instance="true"
reuse_instance="false"
filename="floater_web_content.xml"/>
filename="floater_web_content.xml"/>

2
indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
height="130"
width="300"

2
indra/newview/skins/default/xui/en/floater_notification.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_resize="true"

2
indra/newview/skins/default/xui/en/floater_notifications_console.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
legacy_header_height="18"
can_resize="true"

2
indra/newview/skins/default/xui/en/floater_object_weights.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
can_close="true"
can_tear_off="false"

2
indra/newview/skins/default/xui/en/floater_openobject.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
positioning="centered"
legacy_header_height="18"

Some files were not shown because too many files have changed in this diff Show More