diff options
| author | Richard Linden <none@none> | 2011-03-14 17:49:38 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-14 17:49:38 -0700 |
| commit | 9b9d11583035bb2a5bbb213d9d96eaa563552637 (patch) | |
| tree | a4fba6527b955bbd33bf00068e533afdb85190d1 /indra/newview/app_settings | |
| parent | 01599c384b0e3edde37598c4d252edab4208432c (diff) | |
| parent | 6336022ada7811e9f36844d5f7ff660cb712fdfe (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 058ececc6b..6a89f5681d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12575,5 +12575,16 @@ <key>Value</key> <integer>0</integer> </map> + <key>ShowOfferedInventory</key> + <map> + <key>Comment</key> + <string>Show inventory window with last inventory offer selected when receiving inventory from other users.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 7c578664e3..03656f2a53 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -391,5 +391,16 @@ <key>Value</key> <integer>1</integer> </map> + <key>ShowOfferedInventory</key> + <map> + <key>Comment</key> + <string>Show inventory window with last inventory offer selected when receiving inventory from other users.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> </map> </llsd> |