diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-01 07:21:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-01 07:21:09 -0400 |
| commit | e9501b855b32189f1bf627853487a443e6d9daf8 (patch) | |
| tree | 3fead613d37b33f51f99a09c8a1fd8ab4f6b3353 /indra/newview/app_settings | |
| parent | 6c9b45f4d6776e87cb1d70df0c456d29c3eb0ed7 (diff) | |
| parent | d6f7526abf223b671b4e17be48dcc1e46e8f2fd8 (diff) | |
merge changes for storm-1299
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c3c8a0b7b0..eb6c77971b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12743,6 +12743,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>SLURLPassToOtherInstance</key> + <map> + <key>Comment</key> + <string>Pass execution to prevoius viewer instances if there is a given slurl</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> |