diff options
| author | Richard Linden <none@none> | 2011-11-14 15:39:41 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-14 15:39:41 -0800 |
| commit | 3c5cdd2948d4c215d70a86a1cab12ae55d3958b9 (patch) | |
| tree | de94b58ecd23ef5d8e4304602dc8b55a1cc96bd6 /indra/newview/app_settings | |
| parent | 7766ccb7731a596d6716e9d0def90b3d7da5fcf3 (diff) | |
| parent | 98755a62bb414f23919e003101153c20d3ab3f72 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 9c055bdc5a..bc6c63985f 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12927,6 +12927,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>MinWindowHeight</key> + <map> + <key>Comment</key> + <string>SL viewer minimum window height in pixels</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>768</integer> + </map> <key>WindowHeight</key> <map> <key>Comment</key> @@ -12934,7 +12945,7 @@ <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>S32</string> + <string>U32</string> <key>Value</key> <integer>738</integer> </map> @@ -12949,6 +12960,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>MinWindowWidth</key> + <map> + <key>Comment</key> + <string>SL viewer minimum window width in pixels</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>1024</integer> + </map> <key>WindowWidth</key> <map> <key>Comment</key> @@ -12956,7 +12978,7 @@ <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>S32</string> + <string>U32</string> <key>Value</key> <integer>1024</integer> </map> |