summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-08-21 15:23:08 +0800
committerErik Kundiman <erik@megapahit.org>2024-08-21 15:23:08 +0800
commit074b35a7c87c58db22637f504a24611f67c9a603 (patch)
tree4a9a10cba9223ee37431b911df3003241991b50c /indra/newview
parent387bb8d4436f0262c1c9d319e9c1e87d6ecda82f (diff)
parent561afee750f2c47005c67733547f47ae8bdb3012 (diff)
Merge branch 'main' into 2024.06-atlasaurus
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/floater_about.xml13
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 5de09a736e..ffc163dcb0 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="295"
+ height="320"
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="90"
+ height="160"
bg_readonly_color="Transparent"
left="5"
text_color="LtGray"
@@ -95,11 +95,16 @@ Megapahit is brought to you by (in order of appearance):
width="545"
word_wrap="true">
Erik Kundiman
-observeur
+milo (observeur)
Fritigern Gothly
Hadet Sonnenkern
-Secret Foxtail
+Remmy (Secret Foxtail)
Eris Ravenwood
+EmilyAmiee
+Bavid Dailey
+Aria (Tashia Redrose)
+Cate (32a)
+Melodey
</text_editor>
<text
follows="top|left"