diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-06-29 22:26:47 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-06-29 22:26:47 -0400 |
commit | 2701cfeb62dffeb4bc841ec76d6d4da760810fd3 (patch) | |
tree | a6de87d34b505e389ef3197d08f240d4413b62d1 /indra/newview/app_settings/settings.xml | |
parent | 80d17b2dd9cdd7a9445480fdb0e12774396751eb (diff) | |
parent | f779c164a2da0eec3454d1d26ccd333751afcf4f (diff) |
Automated merge with ssh://bitbucket.org/rider_linden/MAINT-4952-v-t-u
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-x | 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 845cb5ae96..fca3fd8cf3 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2370,6 +2370,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>DebugSlshareLogTag</key> + <map> + <key>Comment</key> + <string>Request slshare-service debug logging</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string/> + </map> <key>DebugStatModeFPS</key> <map> <key>Comment</key> |