diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-02-02 11:32:33 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-02-02 11:32:33 -0800 |
| commit | a4d81d0f6995ad52f3c0fc094d93f8652600abbd (patch) | |
| tree | 9fcc82ba3061423c971f56aa70b8447de2677237 /indra/newview/app_settings | |
| parent | 3fde73508e5b2fb5507b47d1f56d3fb47162b6fc (diff) | |
| parent | b90d1d0b6f60684ba2e97959c6a9d2df0ff8ec79 (diff) | |
Merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2a7c3b0f74..62197406b6 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5527,6 +5527,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>PrimMediaDragNDrop</key> + <map> + <key>Comment</key> + <string>Enable drag and drop of URLs onto prim faces</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>PrimMediaMaxRetries</key> <map> <key>Comment</key> @@ -10820,6 +10831,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>SLURLDragNDrop</key> + <map> + <key>Comment</key> + <string>Enable drag and drop of SLURLs onto the viewer</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>soundsbeacon</key> <map> <key>Comment</key> |