summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-09-17 16:08:23 +0800
committerErik Kundiman <erik@megapahit.org>2024-09-17 16:08:23 +0800
commit8307f1f967f7da9c32fba3a004574ee32b8d3565 (patch)
treea50e823648ffa40d98be003c0d4b1d6e4fabbbe1 /indra/newview/skins/default
parenta025969eb1c25a97ec196e1600fb950beee4280a (diff)
parent3a36cdf6ebd9d2795bdcd14162f38df568d51796 (diff)
Merge branch 'main' into 2024.08-DeltaFPS
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_about.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index a1df13a8ee..c664ab09cd 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -70,7 +70,7 @@
follows="all"
left="10"
name="megapahit_credits_panel"
- height="320"
+ height="340"
top="10">
<text
follows="top|left|right"
@@ -86,7 +86,7 @@ Megapahit is brought to you by (in order of appearance):
<text_editor
enabled="false"
follows="top|left"
- height="160"
+ height="180"
bg_readonly_color="Transparent"
left="5"
text_color="LtGray"
@@ -105,6 +105,8 @@ Bavid Dailey
Aria (Tashia Redrose)
Cate (32a)
Melodey
+Hiroo Ono
+Keysin (scoutkeysin)
</text_editor>
<text
follows="top|left"