diff options
author | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
commit | 7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd (patch) | |
tree | 0243666021de3ae6ac61a6c6f4e57d42771fe964 /linden/indra/newview/app_settings | |
parent | Applied BlockClickSit debug setting from Emerald to block sit click action (diff) | |
download | meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.zip meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.gz meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.bz2 meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.xz |
Merged in jacek/next
Diffstat (limited to 'linden/indra/newview/app_settings')
-rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 117 | ||||
-rw-r--r-- | linden/indra/newview/app_settings/settings_per_account.xml | 13 |
2 files changed, 128 insertions, 2 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 149eefa..6d2f0c5 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
@@ -1,7 +1,106 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <llsd> | 2 | <llsd> |
3 | <map> | 3 | <map> |
4 | <key>AFKTimeout</key> | 4 | <key>RestrainedLife</key> |
5 | <map> | ||
6 | <key>Comment</key> | ||
7 | <string>Toggles the RestrainedLife features (BDSM lockable toys support). Needs a restart of the viewer.</string> | ||
8 | <key>Persist</key> | ||
9 | <integer>1</integer> | ||
10 | <key>Type</key> | ||
11 | <string>Boolean</string> | ||
12 | <key>Value</key> | ||
13 | <integer>0</integer> | ||
14 | </map> | ||
15 | <key>RestrainedLifeDebug</key> | ||
16 | <map> | ||
17 | <key>Comment</key> | ||
18 | <string>Toggles the RestrainedLife debug mode (displays the commands when in debug mode).</string> | ||
19 | <key>Persist</key> | ||
20 | <integer>1</integer> | ||
21 | <key>Type</key> | ||
22 | <string>Boolean</string> | ||
23 | <key>Value</key> | ||
24 | <integer>0</integer> | ||
25 | </map> | ||
26 | <key>RestrainedLifeNoSetEnv</key> | ||
27 | <map> | ||
28 | <key>Comment</key> | ||
29 | <string>When TRUE, forbids to set the environment (time of day and Windlight settings) via RestrainedLife. Needs a restart of the viewer.</string> | ||
30 | <key>Persist</key> | ||
31 | <integer>1</integer> | ||
32 | <key>Type</key> | ||
33 | <string>Boolean</string> | ||
34 | <key>Value</key> | ||
35 | <integer>0</integer> | ||
36 | </map> | ||
37 | <key>RestrainedLifeForbidGiveToRLV</key> | ||
38 | <map> | ||
39 | <key>Comment</key> | ||
40 | <string>When FALSE, allows to give sub-folders to the #RLV RestrainedLife folder.</string> | ||
41 | <key>Persist</key> | ||
42 | <integer>1</integer> | ||
43 | <key>Type</key> | ||
44 | <string>Boolean</string> | ||
45 | <key>Value</key> | ||
46 | <integer>1</integer> | ||
47 | </map> | ||
48 | <key>RLVaEnableLegacyNaming</key> | ||
49 | <map> | ||
50 | <key>Comment</key> | ||
51 | <string>Enables legacy naming convention for folders</string> | ||
52 | <key>Persist</key> | ||
53 | <integer>1</integer> | ||
54 | <key>Type</key> | ||
55 | <string>Boolean</string> | ||
56 | <key>Value</key> | ||
57 | <integer>1</integer> | ||
58 | </map> | ||
59 | <key>RLVaEnableWear</key> | ||
60 | <map> | ||
61 | <key>Comment</key> | ||
62 | <string>When TRUE, enables the "Wear" option on the inventory item context menu for attachments.</string> | ||
63 | <key>Persist</key> | ||
64 | <integer>1</integer> | ||
65 | <key>Type</key> | ||
66 | <string>Boolean</string> | ||
67 | <key>Value</key> | ||
68 | <integer>0</integer> | ||
69 | </map> | ||
70 | <key>RLVaHideLockedLayers</key> | ||
71 | <map> | ||
72 | <key>Comment</key> | ||
73 | <string>When TRUE, hides worn but "remove outfit" restricted clothing layers from @getoufit</string> | ||
74 | <key>Persist</key> | ||
75 | <integer>1</integer> | ||
76 | <key>Type</key> | ||
77 | <string>Boolean</string> | ||
78 | <key>Value</key> | ||
79 | <integer>0</integer> | ||
80 | </map> | ||
81 | <key>RLVaHideLockedAttachments</key> | ||
82 | <map> | ||
83 | <key>Comment</key> | ||
84 | <string>When TRUE, hides worn but "no detach" restricted attachments from @getattach</string> | ||
85 | <key>Persist</key> | ||
86 | <integer>1</integer> | ||
87 | <key>Type</key> | ||
88 | <string>Boolean</string> | ||
89 | <key>Value</key> | ||
90 | <integer>0</integer> | ||
91 | </map> | ||
92 | <key>RLVaShowNameTags</key> | ||
93 | <map> | ||
94 | <key>Comment</key> | ||
95 | <string>Display of names above avatars is subject to the general "Show Names" setting when @shownames=n restricted</string> | ||
96 | <key>Persist</key> | ||
97 | <integer>1</integer> | ||
98 | <key>Type</key> | ||
99 | <string>Boolean</string> | ||
100 | <key>Value</key> | ||
101 | <integer>0</integer> | ||
102 | </map> | ||
103 | <key>AFKTimeout</key> | ||
5 | <map> | 104 | <map> |
6 | <key>Comment</key> | 105 | <key>Comment</key> |
7 | <string>Time before automatically setting AFK (away from keyboard) mode (seconds)</string> | 106 | <string>Time before automatically setting AFK (away from keyboard) mode (seconds)</string> |
@@ -3177,6 +3276,22 @@ | |||
3177 | <integer>0</integer> | 3276 | <integer>0</integer> |
3178 | </array> | 3277 | </array> |
3179 | </map> | 3278 | </map> |
3279 | <key>FloaterPrimImport</key> | ||
3280 | <map> | ||
3281 | <key>Comment</key> | ||
3282 | <string>Rectangle for import/export</string> | ||
3283 | <key>Persist</key> | ||
3284 | <integer>1</integer> | ||
3285 | <key>Type</key> | ||
3286 | <string>Rect</string> | ||
3287 | <key>Value</key> | ||
3288 | <array> | ||
3289 | <integer>0</integer> | ||
3290 | <integer>25</integer> | ||
3291 | <integer>400</integer> | ||
3292 | <integer>0</integer> | ||
3293 | </array> | ||
3294 | </map> | ||
3180 | <key>FloaterRegionInfo</key> | 3295 | <key>FloaterRegionInfo</key> |
3181 | <map> | 3296 | <map> |
3182 | <key>Comment</key> | 3297 | <key>Comment</key> |
diff --git a/linden/indra/newview/app_settings/settings_per_account.xml b/linden/indra/newview/app_settings/settings_per_account.xml index 90c7b11..59caac4 100644 --- a/linden/indra/newview/app_settings/settings_per_account.xml +++ b/linden/indra/newview/app_settings/settings_per_account.xml | |||
@@ -1,6 +1,17 @@ | |||
1 | <llsd> | 1 | <llsd> |
2 | <map> | 2 | <map> |
3 | <key>BusyModeResponse</key> | 3 | <key>RLVaLoginLastLocation</key> |
4 | <map> | ||
5 | <key>Comment</key> | ||
6 | <string>Determines whether the next login will be forced to the last logoff location (set by the viewer)</string> | ||
7 | <key>Persist</key> | ||
8 | <integer>1</integer> | ||
9 | <key>Type</key> | ||
10 | <string>Boolean</string> | ||
11 | <key>Value</key> | ||
12 | <integer>1</integer> | ||
13 | </map> | ||
14 | <key>BusyModeResponse</key> | ||
4 | <map> | 15 | <map> |
5 | <key>Comment</key> | 16 | <key>Comment</key> |
6 | <string>Auto response to instant messages while in busy mode.</string> | 17 | <string>Auto response to instant messages while in busy mode.</string> |