diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-28 12:14:27 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-28 12:14:27 -0700 |
| commit | 026b528b86a853a923ec87dd3897fe2079cbd539 (patch) | |
| tree | b31ec200f751a5c0817a6e628ae6e6c4f394bf77 /indra/newview/app_settings | |
| parent | ee74eb1a9ee8e2aba49613cf434f1272a4526417 (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 458ec591dc..41aac583d7 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4941,6 +4941,16 @@ <key>Value</key> <array /> </map> + <key>LeapPlaybackEventsCommand</key> + <map> + <key>Comment</key> + <string>Command line to use leap to launch playback of event recordings</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>LLSD</string> + <key>Value</key> + </map> <key>LSLFindCaseInsensitivity</key> <map> <key>Comment</key> @@ -10444,6 +10454,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>ShowEventRecorderMenuItems</key> + <map> + <key>Comment</key> + <string>Whether or not Event Recorder menu choices - Start / Stop event recording should appear in the (currently) Develop menu</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>ShowGestureButton</key> <map> <key>Comment</key> |