diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-01 13:31:14 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-01 13:31:14 +0800 |
| commit | 29d68ecb229ecb19e6d0da4cf5fbd8e3bbdde2cf (patch) | |
| tree | e60f85379679aa2b07c8a17a1fcd4954572149c2 /indra/newview/skins/default/xui | |
| parent | a38b53cc5f456593e8ca21c5d5e20542c1723525 (diff) | |
| parent | 1478ec8e9c50eba8b3a64fb9c2fc54a3a328510b (diff) | |
Merge branch 'main' into maint-b
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about.xml | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_progress.xml | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index bf653a547a..71d15ebcbb 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -86,7 +86,7 @@ Megapahit is brought to you by (in order of appearance): <text_editor enabled="false" follows="top|left" - height="70" + height="90" bg_readonly_color="Transparent" left="5" text_color="LtGray" @@ -96,7 +96,10 @@ Megapahit is brought to you by (in order of appearance): word_wrap="true"> Erik Kundiman observeur +Fritigern Gothly +Hadet Sonnenkern Secret Foxtail +Eris Ravenwood </text_editor> <text follows="top|left" @@ -121,12 +124,12 @@ with special thanks to (in order of appearance): top_pad="5" width="450" word_wrap="true"> +Chorazin Allen and Nicky Perian for involving Erik Kundiman in viewer developments; LinneNoir for the moral support and initial testing; Vir Linden for making it possible for the project to have a place (in every sense of the word) in SL; nutsobvious for the early testing and video proof; -Soft Linden for the security testing; -Kyle Linden for selling TPV parcel 2 to Erik Kundiman at L$0 price; and -Fritigern Gothly for the administrative support. +Soft Linden for the security testing; and +Kyle Linden for selling TPV parcel 2 to Erik Kundiman at L$0 price. </text_editor> </panel> </accordion_tab> diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml index 242b96b695..0742cef7c7 100644 --- a/indra/newview/skins/default/xui/en/panel_progress.xml +++ b/indra/newview/skins/default/xui/en/panel_progress.xml @@ -163,7 +163,7 @@ line_spacing.pixels="2" name="logos_lbl" text_color="LoginProgressBoxTextColor"> - Second Life uses + Megapahit uses </text> </layout_panel> </layout_stack> |