diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-11-29 10:40:45 -0800 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-11-29 10:40:45 -0800 |
commit | e919349054c8ae80a054f047756e6596b58a3e13 (patch) | |
tree | 4d2abc589c448fe2b54f7be09385e644fd5b87af /indra/newview/app_settings | |
parent | ec6893db5099b1e95802254277de0cc2e9bea83c (diff) | |
parent | adeb71d98279fc4e8af7859cd36114be9f95e6da (diff) |
Merge with viewer-experience
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 6 | ||||
-rw-r--r-- | indra/newview/app_settings/toolbars.xml | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e9b4d4d96d..cf14886e9f 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1902,7 +1902,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>DebugInventoryFilters</key> <map> @@ -12947,7 +12947,7 @@ <key>Type</key> <string>U32</string> <key>Value</key> - <integer>768</integer> + <integer>600</integer> </map> <key>WindowHeight</key> <map> @@ -12980,7 +12980,7 @@ <key>Type</key> <string>U32</string> <key>Value</key> - <integer>1024</integer> + <integer>960</integer> </map> <key>WindowWidth</key> <map> diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml index f2192a75ad..8862355bfd 100644 --- a/indra/newview/app_settings/toolbars.xml +++ b/indra/newview/app_settings/toolbars.xml @@ -20,5 +20,6 @@ <command name="places"/> <command name="voice"/> <command name="minimap"/> + <command name="snapshot"/> </left_toolbar> </toolbars> |