summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-03-18 20:06:32 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-03-18 20:06:32 +0200
commit1944f64107be98f344824045a19e113966591340 (patch)
treed6b199092d07abc44fdf57deeaf8a332f010610f /indra/newview/app_settings
parent1bf989705cf33fa27e404743108c6920cf33a7f2 (diff)
parentc74f87015118a6da7036623d026fc512f46af9d5 (diff)
manual merge -r 10503
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8edf766132..ab01eabf73 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10655,7 +10655,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>700</integer>
+ <integer>738</integer>
</map>
<key>WindowMaximized</key>
<map>
@@ -10677,7 +10677,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>1000</integer>
+ <integer>1024</integer>
</map>
<key>WindowX</key>
<map>