diff options
Diffstat (limited to 'linden/indra/newview/app_settings')
-rw-r--r-- | linden/indra/newview/app_settings/keywords.ini | 7 | ||||
-rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 216 |
2 files changed, 167 insertions, 56 deletions
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini index b6892dc..3679c38 100644 --- a/linden/indra/newview/app_settings/keywords.ini +++ b/linden/indra/newview/app_settings/keywords.ini | |||
@@ -404,6 +404,9 @@ PRIM_SCULPT_TYPE_SPHERE Stitch edges in a sphere-like way | |||
404 | PRIM_SCULPT_TYPE_TORUS Stitch edges in a torus-like way | 404 | PRIM_SCULPT_TYPE_TORUS Stitch edges in a torus-like way |
405 | PRIM_SCULPT_TYPE_PLANE Do not stitch edges | 405 | PRIM_SCULPT_TYPE_PLANE Do not stitch edges |
406 | PRIM_SCULPT_TYPE_CYLINDER Stitch edges in a cylinder-like way | 406 | PRIM_SCULPT_TYPE_CYLINDER Stitch edges in a cylinder-like way |
407 | PRIM_SCULPT_TYPE_MASK Mask used to determine stitching type | ||
408 | PRIM_SCULPT_FLAG_INVERT Flag to specify that the surface normals should be inverted | ||
409 | PRIM_SCULPT_FLAG_MIRROR Flag to specify that the prim should be reflected along X axis | ||
407 | 410 | ||
408 | MASK_BASE Base permissions | 411 | MASK_BASE Base permissions |
409 | MASK_OWNER Owner permissions | 412 | MASK_OWNER Owner permissions |
@@ -503,6 +506,10 @@ CLICK_ACTION_OPEN Used with llSetClickAction to set open as the default ac | |||
503 | CLICK_ACTION_PLAY Used with llSetClickAction to set play as the default action when object is clicked | 506 | CLICK_ACTION_PLAY Used with llSetClickAction to set play as the default action when object is clicked |
504 | CLICK_ACTION_OPEN_MEDIA Used with llSetClickAction to set open-media as the default action when object is clicked | 507 | CLICK_ACTION_OPEN_MEDIA Used with llSetClickAction to set open-media as the default action when object is clicked |
505 | 508 | ||
509 | TOUCH_INVALID_TEXCOORD Value returned by llDetectedTouchUV() and llDetectedTouchST() when the touch position is not valid. | ||
510 | TOUCH_INVALID_VECTOR Value returned by llDetectedTouchPos(), llDetectedTouchNormal(), and llDetectedTouchBinormal() when the touch position is not valid. | ||
511 | TOUCH_INVALID_FACE Value returned by llDetectedTouchFace() when the touch position is not valid. | ||
512 | |||
506 | # string constants | 513 | # string constants |
507 | [word .1, .3, .5] | 514 | [word .1, .3, .5] |
508 | NULL_KEY Indicates an empty key | 515 | NULL_KEY Indicates an empty key |
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index cdf9fb4..17698d7 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
@@ -23,6 +23,22 @@ | |||
23 | <key>Value</key> | 23 | <key>Value</key> |
24 | <integer>0</integer> | 24 | <integer>0</integer> |
25 | </map> | 25 | </map> |
26 | <key>UserChatColor</key> | ||
27 | <map> | ||
28 | <key>Comment</key> | ||
29 | <string>Color of your chat messages</string> | ||
30 | <key>Persist</key> | ||
31 | <integer>1</integer> | ||
32 | <key>Type</key> | ||
33 | <string>Color4</string> | ||
34 | <key>Value</key> | ||
35 | <array> | ||
36 | <real>0.0196078431372</real> | ||
37 | <real>0.6862745098039</real> | ||
38 | <real>0.9803921568627</real> | ||
39 | <real>1</real> | ||
40 | </array> | ||
41 | </map> | ||
26 | <key>AgentChatColor</key> | 42 | <key>AgentChatColor</key> |
27 | <map> | 43 | <map> |
28 | <key>Comment</key> | 44 | <key>Comment</key> |
@@ -670,6 +686,17 @@ | |||
670 | <key>Value</key> | 686 | <key>Value</key> |
671 | <string>http://www.secondlife.com</string> | 687 | <string>http://www.secondlife.com</string> |
672 | </map> | 688 | </map> |
689 | <key>BlockAvatarAppearanceMessages</key> | ||
690 | <map> | ||
691 | <key>Comment</key> | ||
692 | <string>Ignore's appearance messages (for simulating Ruth)</string> | ||
693 | <key>Persist</key> | ||
694 | <integer>1</integer> | ||
695 | <key>Type</key> | ||
696 | <string>Boolean</string> | ||
697 | <key>Value</key> | ||
698 | <integer>0</integer> | ||
699 | </map> | ||
673 | <key>BrowserProxyAddress</key> | 700 | <key>BrowserProxyAddress</key> |
674 | <map> | 701 | <map> |
675 | <key>Comment</key> | 702 | <key>Comment</key> |
@@ -888,7 +915,7 @@ | |||
888 | <key>Type</key> | 915 | <key>Type</key> |
889 | <string>S32</string> | 916 | <string>S32</string> |
890 | <key>Value</key> | 917 | <key>Value</key> |
891 | <integer>3</integer> | 918 | <integer>8</integer> |
892 | </map> | 919 | </map> |
893 | <key>ButtonFlashRate</key> | 920 | <key>ButtonFlashRate</key> |
894 | <map> | 921 | <map> |
@@ -899,7 +926,7 @@ | |||
899 | <key>Type</key> | 926 | <key>Type</key> |
900 | <string>F32</string> | 927 | <string>F32</string> |
901 | <key>Value</key> | 928 | <key>Value</key> |
902 | <real>2.0</real> | 929 | <real>1.25</real> |
903 | </map> | 930 | </map> |
904 | <key>ButtonHPad</key> | 931 | <key>ButtonHPad</key> |
905 | <map> | 932 | <map> |
@@ -1131,7 +1158,7 @@ | |||
1131 | <key>Type</key> | 1158 | <key>Type</key> |
1132 | <string>F32</string> | 1159 | <string>F32</string> |
1133 | <key>Value</key> | 1160 | <key>Value</key> |
1134 | <real>15.0</real> | 1161 | <real>20.0</real> |
1135 | </map> | 1162 | </map> |
1136 | <key>ChatShowTimestamps</key> | 1163 | <key>ChatShowTimestamps</key> |
1137 | <map> | 1164 | <map> |
@@ -1864,7 +1891,7 @@ | |||
1864 | <key>Type</key> | 1891 | <key>Type</key> |
1865 | <string>F32</string> | 1892 | <string>F32</string> |
1866 | <key>Value</key> | 1893 | <key>Value</key> |
1867 | <real>0.40000000596</real> | 1894 | <real>0.700</real> |
1868 | </map> | 1895 | </map> |
1869 | <key>ConsoleBufferSize</key> | 1896 | <key>ConsoleBufferSize</key> |
1870 | <map> | 1897 | <map> |
@@ -2333,17 +2360,6 @@ | |||
2333 | <real>1.0</real> | 2360 | <real>1.0</real> |
2334 | </array> | 2361 | </array> |
2335 | </map> | 2362 | </map> |
2336 | <key>EnablePushToTalk</key> | ||
2337 | <map> | ||
2338 | <key>Comment</key> | ||
2339 | <string>Must hold down a key or moouse button when talking into your microphone</string> | ||
2340 | <key>Persist</key> | ||
2341 | <integer>1</integer> | ||
2342 | <key>Type</key> | ||
2343 | <string>Boolean</string> | ||
2344 | <key>Value</key> | ||
2345 | <integer>1</integer> | ||
2346 | </map> | ||
2347 | <key>EnableRippleWater</key> | 2363 | <key>EnableRippleWater</key> |
2348 | <map> | 2364 | <map> |
2349 | <key>Comment</key> | 2365 | <key>Comment</key> |
@@ -2594,7 +2610,7 @@ | |||
2594 | <key>Type</key> | 2610 | <key>Type</key> |
2595 | <string>String</string> | 2611 | <string>String</string> |
2596 | <key>Value</key> | 2612 | <key>Value</key> |
2597 | <string>speaker_name</string> | 2613 | <string>speaking_status</string> |
2598 | </map> | 2614 | </map> |
2599 | <key>FloaterAdvancedSkyRect</key> | 2615 | <key>FloaterAdvancedSkyRect</key> |
2600 | <map> | 2616 | <map> |
@@ -4126,6 +4142,17 @@ | |||
4126 | <key>Value</key> | 4142 | <key>Value</key> |
4127 | <integer>0</integer> | 4143 | <integer>0</integer> |
4128 | </map> | 4144 | </map> |
4145 | <key>LSLFindCaseInsensitivity</key> | ||
4146 | <map> | ||
4147 | <key>Comment</key> | ||
4148 | <string>Use case insensitivity when searching in LSL editor</string> | ||
4149 | <key>Persist</key> | ||
4150 | <integer>1</integer> | ||
4151 | <key>Type</key> | ||
4152 | <string>Boolean</string> | ||
4153 | <key>Value</key> | ||
4154 | <integer>0</integer> | ||
4155 | </map> | ||
4129 | <key>LSLHelpRect</key> | 4156 | <key>LSLHelpRect</key> |
4130 | <map> | 4157 | <map> |
4131 | <key>Comment</key> | 4158 | <key>Comment</key> |
@@ -4186,6 +4213,17 @@ | |||
4186 | <key>Value</key> | 4213 | <key>Value</key> |
4187 | <string>default</string> | 4214 | <string>default</string> |
4188 | </map> | 4215 | </map> |
4216 | <key>LanguageIsPublic</key> | ||
4217 | <map> | ||
4218 | <key>Comment</key> | ||
4219 | <string>Let other residents see our language information</string> | ||
4220 | <key>Persist</key> | ||
4221 | <integer>1</integer> | ||
4222 | <key>Type</key> | ||
4223 | <string>Boolean</string> | ||
4224 | <key>Value</key> | ||
4225 | <integer>1</integer> | ||
4226 | </map> | ||
4189 | <key>LastFeatureVersion</key> | 4227 | <key>LastFeatureVersion</key> |
4190 | <map> | 4228 | <map> |
4191 | <key>Comment</key> | 4229 | <key>Comment</key> |
@@ -4450,6 +4488,17 @@ | |||
4450 | <key>Value</key> | 4488 | <key>Value</key> |
4451 | <real>20.0</real> | 4489 | <real>20.0</real> |
4452 | </map> | 4490 | </map> |
4491 | <key>MainloopTimeoutDefault</key> | ||
4492 | <map> | ||
4493 | <key>Comment</key> | ||
4494 | <string>Timeout duration for mainloop lock detection, in seconds.</string> | ||
4495 | <key>Persist</key> | ||
4496 | <integer>1</integer> | ||
4497 | <key>Type</key> | ||
4498 | <string>F32</string> | ||
4499 | <key>Value</key> | ||
4500 | <real>10.0</real> | ||
4501 | </map> | ||
4453 | <key>MapOverlayIndex</key> | 4502 | <key>MapOverlayIndex</key> |
4454 | <map> | 4503 | <map> |
4455 | <key>Comment</key> | 4504 | <key>Comment</key> |
@@ -4472,17 +4521,6 @@ | |||
4472 | <key>Value</key> | 4521 | <key>Value</key> |
4473 | <real>128.0</real> | 4522 | <real>128.0</real> |
4474 | </map> | 4523 | </map> |
4475 | <key>MapShowClassifieds</key> | ||
4476 | <map> | ||
4477 | <key>Comment</key> | ||
4478 | <string>Show locations associated with classified ads on world map</string> | ||
4479 | <key>Persist</key> | ||
4480 | <integer>1</integer> | ||
4481 | <key>Type</key> | ||
4482 | <string>Boolean</string> | ||
4483 | <key>Value</key> | ||
4484 | <integer>1</integer> | ||
4485 | </map> | ||
4486 | <key>MapShowEvents</key> | 4524 | <key>MapShowEvents</key> |
4487 | <map> | 4525 | <map> |
4488 | <key>Comment</key> | 4526 | <key>Comment</key> |
@@ -4922,17 +4960,6 @@ | |||
4922 | <key>Value</key> | 4960 | <key>Value</key> |
4923 | <integer>0</integer> | 4961 | <integer>0</integer> |
4924 | </map> | 4962 | </map> |
4925 | <key>NoQuickTime</key> | ||
4926 | <map> | ||
4927 | <key>Comment</key> | ||
4928 | <string>Disable quicktime playback.</string> | ||
4929 | <key>Persist</key> | ||
4930 | <integer>1</integer> | ||
4931 | <key>Type</key> | ||
4932 | <string>Boolean</string> | ||
4933 | <key>Value</key> | ||
4934 | <integer>0</integer> | ||
4935 | </map> | ||
4936 | <key>NoVerifySSLCert</key> | 4963 | <key>NoVerifySSLCert</key> |
4937 | <map> | 4964 | <map> |
4938 | <key>Comment</key> | 4965 | <key>Comment</key> |
@@ -5036,10 +5063,10 @@ | |||
5036 | <string>Color4</string> | 5063 | <string>Color4</string> |
5037 | <key>Value</key> | 5064 | <key>Value</key> |
5038 | <array> | 5065 | <array> |
5039 | <real>0.699999988079</real> | 5066 | <real>1</real> |
5040 | <real>0.899999976158</real> | 5067 | <real>0.5</real> |
5041 | <real>0.699999988079</real> | 5068 | <real>0.0</real> |
5042 | <real>1.0</real> | 5069 | <real>1</real> |
5043 | </array> | 5070 | </array> |
5044 | </map> | 5071 | </map> |
5045 | <key>OpenDebugStatAdvanced</key> | 5072 | <key>OpenDebugStatAdvanced</key> |
@@ -5138,7 +5165,7 @@ | |||
5138 | <key>PTTCurrentlyEnabled</key> | 5165 | <key>PTTCurrentlyEnabled</key> |
5139 | <map> | 5166 | <map> |
5140 | <key>Comment</key> | 5167 | <key>Comment</key> |
5141 | <string /> | 5168 | <string>Use Push to Talk mode</string> |
5142 | <key>Persist</key> | 5169 | <key>Persist</key> |
5143 | <integer>0</integer> | 5170 | <integer>0</integer> |
5144 | <key>Type</key> | 5171 | <key>Type</key> |
@@ -5228,6 +5255,28 @@ | |||
5228 | <key>Value</key> | 5255 | <key>Value</key> |
5229 | <real>0.34999999404</real> | 5256 | <real>0.34999999404</real> |
5230 | </map> | 5257 | </map> |
5258 | <key>PicksPerSecondMouseMoving</key> | ||
5259 | <map> | ||
5260 | <key>Comment</key> | ||
5261 | <string>How often to perform hover picks while the mouse is moving (picks per second)</string> | ||
5262 | <key>Persist</key> | ||
5263 | <integer>1</integer> | ||
5264 | <key>Type</key> | ||
5265 | <string>F32</string> | ||
5266 | <key>Value</key> | ||
5267 | <real>5.0</real> | ||
5268 | </map> | ||
5269 | <key>PicksPerSecondMouseStationary</key> | ||
5270 | <map> | ||
5271 | <key>Comment</key> | ||
5272 | <string>How often to perform hover picks while the mouse is stationary (picks per second)</string> | ||
5273 | <key>Persist</key> | ||
5274 | <integer>1</integer> | ||
5275 | <key>Type</key> | ||
5276 | <string>F32</string> | ||
5277 | <key>Value</key> | ||
5278 | <real>0.0</real> | ||
5279 | </map> | ||
5231 | <key>PieMenuLineWidth</key> | 5280 | <key>PieMenuLineWidth</key> |
5232 | <map> | 5281 | <map> |
5233 | <key>Comment</key> | 5282 | <key>Comment</key> |
@@ -5580,6 +5629,17 @@ | |||
5580 | <key>Value</key> | 5629 | <key>Value</key> |
5581 | <integer>0</integer> | 5630 | <integer>0</integer> |
5582 | </map> | 5631 | </map> |
5632 | <key>LandBrushForce</key> | ||
5633 | <map> | ||
5634 | <key>Comment</key> | ||
5635 | <string>Multiplier for land modification brush force.</string> | ||
5636 | <key>Persist</key> | ||
5637 | <integer>1</integer> | ||
5638 | <key>Type</key> | ||
5639 | <string>F32</string> | ||
5640 | <key>Value</key> | ||
5641 | <real>1.0</real> | ||
5642 | </map> | ||
5583 | <key>RecentItemsSortOrder</key> | 5643 | <key>RecentItemsSortOrder</key> |
5584 | <map> | 5644 | <map> |
5585 | <key>Comment</key> | 5645 | <key>Comment</key> |
@@ -5646,6 +5706,28 @@ | |||
5646 | <key>Value</key> | 5706 | <key>Value</key> |
5647 | <integer>0</integer> | 5707 | <integer>0</integer> |
5648 | </map> | 5708 | </map> |
5709 | <key>RenderAttachedLights</key> | ||
5710 | <map> | ||
5711 | <key>Comment</key> | ||
5712 | <string>Render lighted prims that are attached to avatars</string> | ||
5713 | <key>Persist</key> | ||
5714 | <integer>1</integer> | ||
5715 | <key>Type</key> | ||
5716 | <string>Boolean</string> | ||
5717 | <key>Value</key> | ||
5718 | <integer>1</integer> | ||
5719 | </map> | ||
5720 | <key>RenderAttachedParticles</key> | ||
5721 | <map> | ||
5722 | <key>Comment</key> | ||
5723 | <string>Render particle systems that are attached to avatars</string> | ||
5724 | <key>Persist</key> | ||
5725 | <integer>1</integer> | ||
5726 | <key>Type</key> | ||
5727 | <string>Boolean</string> | ||
5728 | <key>Value</key> | ||
5729 | <integer>1</integer> | ||
5730 | </map> | ||
5649 | <key>RenderAvatarCloth</key> | 5731 | <key>RenderAvatarCloth</key> |
5650 | <map> | 5732 | <map> |
5651 | <key>Comment</key> | 5733 | <key>Comment</key> |
@@ -6803,17 +6885,6 @@ | |||
6803 | <key>Value</key> | 6885 | <key>Value</key> |
6804 | <integer>0</integer> | 6886 | <integer>0</integer> |
6805 | </map> | 6887 | </map> |
6806 | <key>ShowDepthBuffer</key> | ||
6807 | <map> | ||
6808 | <key>Comment</key> | ||
6809 | <string>Show depth buffer contents</string> | ||
6810 | <key>Persist</key> | ||
6811 | <integer>1</integer> | ||
6812 | <key>Type</key> | ||
6813 | <string>Boolean</string> | ||
6814 | <key>Value</key> | ||
6815 | <integer>0</integer> | ||
6816 | </map> | ||
6817 | <key>ShowDirectory</key> | 6888 | <key>ShowDirectory</key> |
6818 | <map> | 6889 | <map> |
6819 | <key>Comment</key> | 6890 | <key>Comment</key> |
@@ -6979,12 +7050,23 @@ | |||
6979 | <key>Value</key> | 7050 | <key>Value</key> |
6980 | <integer>1</integer> | 7051 | <integer>1</integer> |
6981 | </map> | 7052 | </map> |
7053 | <key>ShowInInventory</key> | ||
7054 | <map> | ||
7055 | <key>Comment</key> | ||
7056 | <string>Automatically opens inventory to show accepted objects</string> | ||
7057 | <key>Persist</key> | ||
7058 | <integer>1</integer> | ||
7059 | <key>Type</key> | ||
7060 | <string>Boolean</string> | ||
7061 | <key>Value</key> | ||
7062 | <integer>1</integer> | ||
7063 | </map> | ||
6982 | <key>ShowObjectUpdates</key> | 7064 | <key>ShowObjectUpdates</key> |
6983 | <map> | 7065 | <map> |
6984 | <key>Comment</key> | 7066 | <key>Comment</key> |
6985 | <string>Show when update messages are received for individual objects</string> | 7067 | <string>Show when update messages are received for individual objects</string> |
6986 | <key>Persist</key> | 7068 | <key>Persist</key> |
6987 | <integer>1</integer> | 7069 | <integer>0</integer> |
6988 | <key>Type</key> | 7070 | <key>Type</key> |
6989 | <string>Boolean</string> | 7071 | <string>Boolean</string> |
6990 | <key>Value</key> | 7072 | <key>Value</key> |
@@ -7100,7 +7182,18 @@ | |||
7100 | <key>Value</key> | 7182 | <key>Value</key> |
7101 | <integer>0</integer> | 7183 | <integer>0</integer> |
7102 | </map> | 7184 | </map> |
7103 | <key>ShowVoiceChannelPopup</key> | 7185 | <key>ShowTutorial</key> |
7186 | <map> | ||
7187 | <key>Comment</key> | ||
7188 | <string>Show tutorial window on login</string> | ||
7189 | <key>Persist</key> | ||
7190 | <integer>1</integer> | ||
7191 | <key>Type</key> | ||
7192 | <string>Boolean</string> | ||
7193 | <key>Value</key> | ||
7194 | <integer>0</integer> | ||
7195 | </map> | ||
7196 | <key>ShowVoiceChannelPopup</key> | ||
7104 | <map> | 7197 | <map> |
7105 | <key>Comment</key> | 7198 | <key>Comment</key> |
7106 | <string>Controls visibility of the current voice channel popup above the voice tab</string> | 7199 | <string>Controls visibility of the current voice channel popup above the voice tab</string> |
@@ -7316,6 +7409,17 @@ | |||
7316 | <key>Value</key> | 7409 | <key>Value</key> |
7317 | <integer>0</integer> | 7410 | <integer>0</integer> |
7318 | </map> | 7411 | </map> |
7412 | <key>SnapshotFormat</key> | ||
7413 | <map> | ||
7414 | <key>Comment</key> | ||
7415 | <string>Save snapshots in this format (0 = PNG, 1 = JPEG, 2 = BMP)</string> | ||
7416 | <key>Persist</key> | ||
7417 | <integer>1</integer> | ||
7418 | <key>Type</key> | ||
7419 | <string>S32</string> | ||
7420 | <key>Value</key> | ||
7421 | <integer>0</integer> | ||
7422 | </map> | ||
7319 | <key>SnapshotLocalLastResolution</key> | 7423 | <key>SnapshotLocalLastResolution</key> |
7320 | <map> | 7424 | <map> |
7321 | <key>Comment</key> | 7425 | <key>Comment</key> |