diff options
Diffstat (limited to 'linden/indra/newview/app_settings')
-rw-r--r-- | linden/indra/newview/app_settings/cmd_line.xml | 674 | ||||
-rw-r--r-- | linden/indra/newview/app_settings/keywords.ini | 10 | ||||
-rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 167 | ||||
-rw-r--r-- | linden/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl | 2 |
4 files changed, 468 insertions, 385 deletions
diff --git a/linden/indra/newview/app_settings/cmd_line.xml b/linden/indra/newview/app_settings/cmd_line.xml index db665b7..5f11ed8 100644 --- a/linden/indra/newview/app_settings/cmd_line.xml +++ b/linden/indra/newview/app_settings/cmd_line.xml | |||
@@ -1,337 +1,337 @@ | |||
1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
2 | <llsd> | 2 | <llsd> |
3 | <map> | 3 | <map> |
4 | <key>help</key> | 4 | <key>help</key> |
5 | <map> | 5 | <map> |
6 | <key>desc</key> | 6 | <key>desc</key> |
7 | <string>display this help message</string> | 7 | <string>display this help message</string> |
8 | 8 | ||
9 | <key>short</key> | 9 | <key>short</key> |
10 | <string>h</string> | 10 | <string>h</string> |
11 | </map> | 11 | </map> |
12 | 12 | ||
13 | <key>port</key> | 13 | <key>port</key> |
14 | <map> | 14 | <map> |
15 | <key>count</key> | 15 | <key>count</key> |
16 | <integer>1</integer> | 16 | <integer>1</integer> |
17 | <key>map-to</key> | 17 | <key>map-to</key> |
18 | <string>UserConnectionPort</string> | 18 | <string>UserConnectionPort</string> |
19 | </map> | 19 | </map> |
20 | 20 | ||
21 | <key>drop</key> | 21 | <key>drop</key> |
22 | <map> | 22 | <map> |
23 | <key>count</key> | 23 | <key>count</key> |
24 | <integer>1</integer> | 24 | <integer>1</integer> |
25 | <key>map-to</key> | 25 | <key>map-to</key> |
26 | <string>PacketDropPercentage</string> | 26 | <string>PacketDropPercentage</string> |
27 | </map> | 27 | </map> |
28 | 28 | ||
29 | <key>inbw</key> | 29 | <key>inbw</key> |
30 | <map> | 30 | <map> |
31 | <key>count</key> | 31 | <key>count</key> |
32 | <integer>1</integer> | 32 | <integer>1</integer> |
33 | <key>map-to</key> | 33 | <key>map-to</key> |
34 | <string>InBandwidth</string> | 34 | <string>InBandwidth</string> |
35 | </map> | 35 | </map> |
36 | 36 | ||
37 | <key>outbw</key> | 37 | <key>outbw</key> |
38 | <map> | 38 | <map> |
39 | <key>count</key> | 39 | <key>count</key> |
40 | <integer>1</integer> | 40 | <integer>1</integer> |
41 | <key>map-to</key> | 41 | <key>map-to</key> |
42 | <string>OutBandwidth</string> | 42 | <string>OutBandwidth</string> |
43 | </map> | 43 | </map> |
44 | 44 | ||
45 | <key>grid</key> | 45 | <key>grid</key> |
46 | <map> | 46 | <map> |
47 | <key>desc</key> | 47 | <key>desc</key> |
48 | <string>Specify the name of the grid, local, or an IP address to connect to.</string> | 48 | <string>Specify the name of the grid, local, or an IP address to connect to.</string> |
49 | <key>count</key> | 49 | <key>count</key> |
50 | <integer>1</integer> | 50 | <integer>1</integer> |
51 | <key>map-to</key> | 51 | <key>map-to</key> |
52 | <string>CmdLineGridChoice</string> | 52 | <string>CmdLineGridChoice</string> |
53 | </map> | 53 | </map> |
54 | 54 | ||
55 | <key>loginuri</key> | 55 | <key>loginuri</key> |
56 | <map> | 56 | <map> |
57 | <key>desc</key> | 57 | <key>desc</key> |
58 | <string>login server and CGI script to use</string> | 58 | <string>login server and CGI script to use</string> |
59 | <key>count</key> | 59 | <key>count</key> |
60 | <integer>1</integer> | 60 | <integer>1</integer> |
61 | <key>compose</key> | 61 | <key>compose</key> |
62 | <boolean>true</boolean> | 62 | <boolean>true</boolean> |
63 | <key>map-to</key> | 63 | <key>map-to</key> |
64 | <string>CmdLineLoginURI</string> | 64 | <string>CmdLineLoginURI</string> |
65 | </map> | 65 | </map> |
66 | 66 | ||
67 | <key>helperuri</key> | 67 | <key>helperuri</key> |
68 | <map> | 68 | <map> |
69 | <key>desc</key> | 69 | <key>desc</key> |
70 | <string>helper web CGI prefix to use</string> | 70 | <string>helper web CGI prefix to use</string> |
71 | <key>count</key> | 71 | <key>count</key> |
72 | <integer>1</integer> | 72 | <integer>1</integer> |
73 | <key>map-to</key> | 73 | <key>map-to</key> |
74 | <string>CmdLineHelperURI</string> | 74 | <string>CmdLineHelperURI</string> |
75 | </map> | 75 | </map> |
76 | 76 | ||
77 | <key>debugviews</key> | 77 | <key>debugviews</key> |
78 | <map> | 78 | <map> |
79 | <key>map-to</key> | 79 | <key>map-to</key> |
80 | <string>DebugViews</string> | 80 | <string>DebugViews</string> |
81 | </map> | 81 | </map> |
82 | 82 | ||
83 | <key>skin</key> | 83 | <key>skin</key> |
84 | <map> | 84 | <map> |
85 | <key>desc</key> | 85 | <key>desc</key> |
86 | <string>ui/branding skin folder to use</string> | 86 | <string>ui/branding skin folder to use</string> |
87 | <key>count</key> | 87 | <key>count</key> |
88 | <integer>1</integer> | 88 | <integer>1</integer> |
89 | <key>map-to</key> | 89 | <key>map-to</key> |
90 | <string>SkinFolder</string> | 90 | <string>SkinFolder</string> |
91 | </map> | 91 | </map> |
92 | 92 | ||
93 | <key>autologin</key> | 93 | <key>autologin</key> |
94 | <map> | 94 | <map> |
95 | <key>desc</key> | 95 | <key>desc</key> |
96 | <string>log in as last saved user</string> | 96 | <string>log in as last saved user</string> |
97 | <key>map-to</key> | 97 | <key>map-to</key> |
98 | <string>AutoLogin</string> | 98 | <string>AutoLogin</string> |
99 | </map> | 99 | </map> |
100 | 100 | ||
101 | <key>quitafter</key> | 101 | <key>quitafter</key> |
102 | <map> | 102 | <map> |
103 | <key>count</key> | 103 | <key>count</key> |
104 | <integer>1</integer> | 104 | <integer>1</integer> |
105 | <key>map-to</key> | 105 | <key>map-to</key> |
106 | <string>QuitAfterSeconds</string> | 106 | <string>QuitAfterSeconds</string> |
107 | </map> | 107 | </map> |
108 | 108 | ||
109 | <key>rotate</key> | 109 | <key>rotate</key> |
110 | <map> | 110 | <map> |
111 | <key>map-to</key> | 111 | <key>map-to</key> |
112 | <string>RotateRight</string> | 112 | <string>RotateRight</string> |
113 | </map> | 113 | </map> |
114 | 114 | ||
115 | <key>noaudio</key> | 115 | <key>noaudio</key> |
116 | <map> | 116 | <map> |
117 | <key>map-to</key> | 117 | <key>map-to</key> |
118 | <string>NoAudio</string> | 118 | <string>NoAudio</string> |
119 | </map> | 119 | </map> |
120 | 120 | ||
121 | <key>nosound</key> | 121 | <key>nosound</key> |
122 | <map> | 122 | <map> |
123 | <key>map-to</key> | 123 | <key>map-to</key> |
124 | <string>NoAudio</string> | 124 | <string>NoAudio</string> |
125 | </map> | 125 | </map> |
126 | 126 | ||
127 | <key>noprobe</key> | 127 | <key>noprobe</key> |
128 | <map> | 128 | <map> |
129 | <key>map-to</key> | 129 | <key>map-to</key> |
130 | <string>NoHardwareProbe</string> | 130 | <string>NoHardwareProbe</string> |
131 | </map> | 131 | </map> |
132 | 132 | ||
133 | <key>noquicktime</key> | 133 | <key>noquicktime</key> |
134 | <map> | 134 | <map> |
135 | <key>map-to</key> | 135 | <key>map-to</key> |
136 | <string>NoQuickTime</string> | 136 | <string>NoQuickTime</string> |
137 | </map> | 137 | </map> |
138 | 138 | ||
139 | <key>nopreload</key> | 139 | <key>nopreload</key> |
140 | <map> | 140 | <map> |
141 | <key>map-to</key> | 141 | <key>map-to</key> |
142 | <string>NoPreload</string> | 142 | <string>NoPreload</string> |
143 | </map> | 143 | </map> |
144 | 144 | ||
145 | <key>purge</key> | 145 | <key>purge</key> |
146 | <map> | 146 | <map> |
147 | <key>desc</key> | 147 | <key>desc</key> |
148 | <string>Delete files in the cache.</string> | 148 | <string>Delete files in the cache.</string> |
149 | <key>map-to</key> | 149 | <key>map-to</key> |
150 | <string>PurgeCacheOnNextStartup</string> | 150 | <string>PurgeCacheOnNextStartup</string> |
151 | </map> | 151 | </map> |
152 | 152 | ||
153 | <key>noinvlib</key> | 153 | <key>noinvlib</key> |
154 | <map> | 154 | <map> |
155 | <key>desc</key> | 155 | <key>desc</key> |
156 | <string>Do not request the inventory library.</string> | 156 | <string>Do not request the inventory library.</string> |
157 | <key>map-to</key> | 157 | <key>map-to</key> |
158 | <string>NoInventoryLibrary</string> | 158 | <string>NoInventoryLibrary</string> |
159 | </map> | 159 | </map> |
160 | 160 | ||
161 | <key>logfile</key> | 161 | <key>logfile</key> |
162 | <map> | 162 | <map> |
163 | <key>count</key> | 163 | <key>count</key> |
164 | <integer>1</integer> | 164 | <integer>1</integer> |
165 | <key>map-to</key> | 165 | <key>map-to</key> |
166 | <string>UserLogFile</string> | 166 | <string>UserLogFile</string> |
167 | </map> | 167 | </map> |
168 | 168 | ||
169 | <key>setdefault</key> | 169 | <key>setdefault</key> |
170 | <map> | 170 | <map> |
171 | <key>desc</key> | 171 | <key>desc</key> |
172 | <string> specify the value of a particular | 172 | <string> specify the value of a particular |
173 | configuration variable which can be | 173 | configuration variable which can be |
174 | overridden by settings.xml | 174 | overridden by settings.xml |
175 | </string> | 175 | </string> |
176 | <key>count</key> | 176 | <key>count</key> |
177 | <integer>2</integer> | 177 | <integer>2</integer> |
178 | <!-- Special case. Mapped to settings procedurally. --> | 178 | <!-- Special case. Mapped to settings procedurally. --> |
179 | </map> | 179 | </map> |
180 | 180 | ||
181 | <key>set</key> | 181 | <key>set</key> |
182 | <map> | 182 | <map> |
183 | <key>desc</key> | 183 | <key>desc</key> |
184 | <string> specify the value of a particular | 184 | <string> specify the value of a particular |
185 | configuration variable that | 185 | configuration variable that |
186 | overrides all other settings | 186 | overrides all other settings |
187 | </string> | 187 | </string> |
188 | <key>count</key> | 188 | <key>count</key> |
189 | <integer>2</integer> | 189 | <integer>2</integer> |
190 | <key>compose</key> | 190 | <key>compose</key> |
191 | <boolean>true</boolean> | 191 | <boolean>true</boolean> |
192 | <!-- Special case. Mapped to settings procedurally. --> | 192 | <!-- Special case. Mapped to settings procedurally. --> |
193 | </map> | 193 | </map> |
194 | 194 | ||
195 | <key>settings</key> | 195 | <key>settings</key> |
196 | <map> | 196 | <map> |
197 | <key>desc</key> | 197 | <key>desc</key> |
198 | <string>Specify the filename of a configuration file.</string> | 198 | <string>Specify the filename of a configuration file.</string> |
199 | <key>count</key> | 199 | <key>count</key> |
200 | <integer>1</integer> | 200 | <integer>1</integer> |
201 | <!-- Special case. Mapped to settings procedurally. --> | 201 | <!-- Special case. Mapped to settings procedurally. --> |
202 | </map> | 202 | </map> |
203 | 203 | ||
204 | <key>login</key> | 204 | <key>login</key> |
205 | <map> | 205 | <map> |
206 | <key>desc</key> | 206 | <key>desc</key> |
207 | <string>3 tokens: first, last and password</string> | 207 | <string>3 tokens: first, last and password</string> |
208 | <key>count</key> | 208 | <key>count</key> |
209 | <integer>3</integer> | 209 | <integer>3</integer> |
210 | <key>map-to</key> | 210 | <key>map-to</key> |
211 | <string>UserLoginInfo</string> | 211 | <string>UserLoginInfo</string> |
212 | </map> | 212 | </map> |
213 | 213 | ||
214 | <key>god</key> | 214 | <key>god</key> |
215 | <map> | 215 | <map> |
216 | <key>desc</key> | 216 | <key>desc</key> |
217 | <string>Log in a god if you have god access.</string> | 217 | <string>Log in a god if you have god access.</string> |
218 | <key>map-to</key> | 218 | <key>map-to</key> |
219 | <string>ConnectAsGod</string> | 219 | <string>ConnectAsGod</string> |
220 | </map> | 220 | </map> |
221 | 221 | ||
222 | <key>console</key> | 222 | <key>console</key> |
223 | <map> | 223 | <map> |
224 | <key>count</key> | 224 | <key>count</key> |
225 | <integer>1</integer> | 225 | <integer>1</integer> |
226 | <key>map-to</key> | 226 | <key>map-to</key> |
227 | <string>ShowConsoleWindow</string> | 227 | <string>ShowConsoleWindow</string> |
228 | </map> | 228 | </map> |
229 | 229 | ||
230 | <key>safe</key> | 230 | <key>safe</key> |
231 | <map> | 231 | <map> |
232 | <key>desc</key> | 232 | <key>desc</key> |
233 | <string>Reset preferences, run in safe mode.</string> | 233 | <string>Reset preferences, run in safe mode.</string> |
234 | <key>map-to</key> | 234 | <key>map-to</key> |
235 | <string>SafeMode</string> | 235 | <string>SafeMode</string> |
236 | </map> | 236 | </map> |
237 | 237 | ||
238 | <key>multiple</key> | 238 | <key>multiple</key> |
239 | <map> | 239 | <map> |
240 | <key>desc</key> | 240 | <key>desc</key> |
241 | <string>Allow multple viewers.</string> | 241 | <string>Allow multple viewers.</string> |
242 | <key>map-to</key> | 242 | <key>map-to</key> |
243 | <string>AllowMultipleViewers</string> | 243 | <string>AllowMultipleViewers</string> |
244 | </map> | 244 | </map> |
245 | 245 | ||
246 | <key>novoice</key> | 246 | <key>novoice</key> |
247 | <map> | 247 | <map> |
248 | <key>desc</key> | 248 | <key>desc</key> |
249 | <string>Disable voice.</string> | 249 | <string>Disable voice.</string> |
250 | <key>map-to</key> | 250 | <key>map-to</key> |
251 | <string>CmdLineDisableVoice</string> | 251 | <string>CmdLineDisableVoice</string> |
252 | </map> | 252 | </map> |
253 | 253 | ||
254 | <key>url</key> | 254 | <key>url</key> |
255 | <map> | 255 | <map> |
256 | <key>desc</key> | 256 | <key>desc</key> |
257 | <string>Startup location</string> | 257 | <string>Startup location</string> |
258 | <key>count</key> | 258 | <key>count</key> |
259 | <integer>1</integer> | 259 | <integer>1</integer> |
260 | <key>last_option</key> | 260 | <key>last_option</key> |
261 | <boolean>true</boolean> | 261 | <boolean>true</boolean> |
262 | <!-- Special case. Not mapped to a setting. --> | 262 | <!-- Special case. Not mapped to a setting. --> |
263 | </map> | 263 | </map> |
264 | 264 | ||
265 | <key>slurl</key> | 265 | <key>slurl</key> |
266 | <map> | 266 | <map> |
267 | <key>desc</key> | 267 | <key>desc</key> |
268 | <string>Startup SLurl</string> | 268 | <string>Startup SLurl</string> |
269 | <key>count</key> | 269 | <key>count</key> |
270 | <integer>1</integer> | 270 | <integer>1</integer> |
271 | <key>positional</key> | 271 | <key>positional</key> |
272 | <boolean>true</boolean> | 272 | <boolean>true</boolean> |
273 | <key>last_option</key> | 273 | <key>last_option</key> |
274 | <boolean>true</boolean> | 274 | <boolean>true</boolean> |
275 | <!-- Special case. Not mapped to a setting. --> | 275 | <!-- Special case. Not mapped to a setting. --> |
276 | </map> | 276 | </map> |
277 | 277 | ||
278 | <key>ignorepixeldepth</key> | 278 | <key>ignorepixeldepth</key> |
279 | <map> | 279 | <map> |
280 | <key>desc</key> | 280 | <key>desc</key> |
281 | <string>Ignore pixel depth settings.</string> | 281 | <string>Ignore pixel depth settings.</string> |
282 | <key>map-to</key> | 282 | <key>map-to</key> |
283 | <string>IgnorePixelDepth</string> | 283 | <string>IgnorePixelDepth</string> |
284 | </map> | 284 | </map> |
285 | 285 | ||
286 | <key>cooperative</key> | 286 | <key>cooperative</key> |
287 | <map> | 287 | <map> |
288 | <key>desc</key> | 288 | <key>desc</key> |
289 | <string>Yield some idle time to local host.</string> | 289 | <string>Yield some idle time to local host.</string> |
290 | <key>count</key> | 290 | <key>count</key> |
291 | <integer>1</integer> | 291 | <integer>1</integer> |
292 | <key>map-to</key> | 292 | <key>map-to</key> |
293 | <string>YieldTime</string> | 293 | <string>YieldTime</string> |
294 | </map> | 294 | </map> |
295 | 295 | ||
296 | <key>no-verify-ssl-cert</key> | 296 | <key>no-verify-ssl-cert</key> |
297 | <map> | 297 | <map> |
298 | <key>map-to</key> | 298 | <key>map-to</key> |
299 | <string>NoVerifySSLCert</string> | 299 | <string>NoVerifySSLCert</string> |
300 | </map> | 300 | </map> |
301 | 301 | ||
302 | <key>channel</key> | 302 | <key>channel</key> |
303 | <map> | 303 | <map> |
304 | <key>count</key> | 304 | <key>count</key> |
305 | <integer>1</integer> | 305 | <integer>1</integer> |
306 | <key>map-to</key> | 306 | <key>map-to</key> |
307 | <string>VersionChannelName</string> | 307 | <string>VersionChannelName</string> |
308 | </map> | 308 | </map> |
309 | 309 | ||
310 | <key>loginpage</key> | 310 | <key>loginpage</key> |
311 | <map> | 311 | <map> |
312 | <key>desc</key> | 312 | <key>desc</key> |
313 | <string>Login authentication page to use.</string> | 313 | <string>Login authentication page to use.</string> |
314 | <key>count</key> | 314 | <key>count</key> |
315 | <integer>1</integer> | 315 | <integer>1</integer> |
316 | <key>map-to</key> | 316 | <key>map-to</key> |
317 | <string>LoginPage</string> | 317 | <string>LoginPage</string> |
318 | </map> | 318 | </map> |
319 | 319 | ||
320 | <key>qa</key> | 320 | <key>qa</key> |
321 | <map> | 321 | <map> |
322 | <key>desc</key> | 322 | <key>desc</key> |
323 | <string>Activated debugging menu in Advanced Settings.</string> | 323 | <string>Activated debugging menu in Advanced Settings.</string> |
324 | <key>map-to</key> | 324 | <key>map-to</key> |
325 | <string>QAMode</string> | 325 | <string>QAMode</string> |
326 | </map> | 326 | </map> |
327 | 327 | ||
328 | <key>crashonstartup</key> | 328 | <key>crashonstartup</key> |
329 | <map> | 329 | <map> |
330 | <key>desc</key> | 330 | <key>desc</key> |
331 | <string>Crashes on startup. For QA use.</string> | 331 | <string>Crashes on startup. For QA use.</string> |
332 | <key>map-to</key> | 332 | <key>map-to</key> |
333 | <string>CrashOnStartup</string> | 333 | <string>CrashOnStartup</string> |
334 | </map> | 334 | </map> |
335 | 335 | ||
336 | </map> | 336 | </map> |
337 | </llsd> | 337 | </llsd> |
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini index 56acf4c..5118e67 100644 --- a/linden/indra/newview/app_settings/keywords.ini +++ b/linden/indra/newview/app_settings/keywords.ini | |||
@@ -332,11 +332,11 @@ REMOTE_DATA_REQUEST Value of event_type in remote_event if XML-RPC request is re | |||
332 | REMOTE_DATA_REPLY Value of event_type in remote_event if XML-RPC reply is received | 332 | REMOTE_DATA_REPLY Value of event_type in remote_event if XML-RPC reply is received |
333 | 333 | ||
334 | 334 | ||
335 | PRIM_TYPE Followed by PRIM_TYPE_BOX, PRIM_TYPE_CYLINDER, PRIM_TYPE_PRISM, PRIM_TYPE_SPHERE,:PRIM_TYPE_TORUS, or PRIM_TYPE_TUBE and their arguments | 335 | PRIM_TYPE Followed by PRIM_TYPE_BOX, PRIM_TYPE_CYLINDER, PRIM_TYPE_PRISM, PRIM_TYPE_SPHERE, PRIM_TYPE_TORUS, PRIM_TYPE_TUBE, or PRIM_TYPE_SCULPT and their arguments |
336 | PRIM_MATERIAL Sets material to PRIM_MATERIAL_STONE, PRIM_MATERIAL_METAL, PRIM_MATERIAL_GLASS,:PRIM_MATERIAL_WOOD, PRIM_MATERIAL_FLESH, PRIM_MATERIAL_PLASTIC,:PRIM_MATERIAL_RUBBER, or PRIM_MATERIAL_LIGHT | 336 | PRIM_MATERIAL Followed by PRIM_MATERIAL_STONE, PRIM_MATERIAL_METAL, PRIM_MATERIAL_GLASS, PRIM_MATERIAL_WOOD, PRIM_MATERIAL_FLESH, PRIM_MATERIAL_PLASTIC, or PRIM_MATERIAL_RUBBER |
337 | PRIM_PHYSICS Sets physics to TRUE or FALSE | 337 | PRIM_PHYSICS Sets physics to TRUE or FALSE |
338 | PRIM_FLEXIBLE Sets primitive flexibility to TRUE or FALSE | 338 | PRIM_FLEXIBLE Followed by TRUE or FALSE, integer softness, float gravity, float friction, float wind, float tension, and vector force |
339 | PRIM_POINT_LIGHT Sets light emission to TRUE or FALSE | 339 | PRIM_POINT_LIGHT Followed by TRUE or FALSE, vector color, float intensity, float radius, float falloff |
340 | PRIM_TEMP_ON_REZ Sets temporay on rez to TRUE or FALSE | 340 | PRIM_TEMP_ON_REZ Sets temporay on rez to TRUE or FALSE |
341 | PRIM_PHANTOM Sets phantom to TRUE or FALSE | 341 | PRIM_PHANTOM Sets phantom to TRUE or FALSE |
342 | PRIM_CAST_SHADOWS DEPRECATED. Takes 1 parameter, an integer, but has no effect when set and always returns 0 if used in llGetPrimitiveParams. | 342 | PRIM_CAST_SHADOWS DEPRECATED. Takes 1 parameter, an integer, but has no effect when set and always returns 0 if used in llGetPrimitiveParams. |
@@ -357,7 +357,7 @@ PRIM_TYPE_SPHERE Followed by integer hole shape, vector cut, float hollow, vecto | |||
357 | PRIM_TYPE_TORUS Followed by integer hole shape, vector cut, float hollow, vector twist,:vector hole size, vector top shear, vector advanced cut, vector taper,:float revolutions, float radius offset, and float skew | 357 | PRIM_TYPE_TORUS Followed by integer hole shape, vector cut, float hollow, vector twist,:vector hole size, vector top shear, vector advanced cut, vector taper,:float revolutions, float radius offset, and float skew |
358 | PRIM_TYPE_TUBE Followed by integer hole shape, vector cut, float hollow, vector twist,:vector hole size, vector top shear, vector advanced cut, vector taper,:float revolutions, float radius offset, and float skew | 358 | PRIM_TYPE_TUBE Followed by integer hole shape, vector cut, float hollow, vector twist,:vector hole size, vector top shear, vector advanced cut, vector taper,:float revolutions, float radius offset, and float skew |
359 | PRIM_TYPE_RING Followed by integer hole shape, vector cut, float hollow, vector twist,:vector hole size, vector top shear, vector advanced cut, vector taper,:float revolutions, float radius offset, and float skew | 359 | PRIM_TYPE_RING Followed by integer hole shape, vector cut, float hollow, vector twist,:vector hole size, vector top shear, vector advanced cut, vector taper,:float revolutions, float radius offset, and float skew |
360 | PRIM_TYPE_SCULPT Followed by a key or string texture uuid. | 360 | PRIM_TYPE_SCULPT Followed by a key/string texture uuid, and one of PRIM_SCULPT_TYPE_SPHERE, PRIM_SCULPT_TYPE_TORUS, PRIM_SCULPT_TYPE_PLANE, or PRIM_SCULPT_TYPE_CYLINDER |
361 | 361 | ||
362 | PRIM_HOLE_DEFAULT Sets hole type to match the prim type. | 362 | PRIM_HOLE_DEFAULT Sets hole type to match the prim type. |
363 | PRIM_HOLE_SQUARE Sets hole type to square. | 363 | PRIM_HOLE_SQUARE Sets hole type to square. |
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 55ff208..9a6749b 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
@@ -33,10 +33,10 @@ | |||
33 | <string>Color4</string> | 33 | <string>Color4</string> |
34 | <key>Value</key> | 34 | <key>Value</key> |
35 | <array> | 35 | <array> |
36 | <real>0.0196078431372</real> | 36 | <real>1.0</real> |
37 | <real>0.6862745098039</real> | 37 | <real>1.0</real> |
38 | <real>0.9803921568627</real> | 38 | <real>1.0</real> |
39 | <real>1</real> | 39 | <real>1.0</real> |
40 | </array> | 40 | </array> |
41 | </map> | 41 | </map> |
42 | <key>AgentChatColor</key> | 42 | <key>AgentChatColor</key> |
@@ -165,17 +165,6 @@ | |||
165 | <key>Value</key> | 165 | <key>Value</key> |
166 | <integer>0</integer> | 166 | <integer>0</integer> |
167 | </map> | 167 | </map> |
168 | <key>AsyncKeyboard</key> | ||
169 | <map> | ||
170 | <key>Comment</key> | ||
171 | <string>Improves responsiveness to keyboard input when at low framerates</string> | ||
172 | <key>Persist</key> | ||
173 | <integer>1</integer> | ||
174 | <key>Type</key> | ||
175 | <string>Boolean</string> | ||
176 | <key>Value</key> | ||
177 | <integer>1</integer> | ||
178 | </map> | ||
179 | <key>AuctionShowFence</key> | 168 | <key>AuctionShowFence</key> |
180 | <map> | 169 | <map> |
181 | <key>Comment</key> | 170 | <key>Comment</key> |
@@ -2599,7 +2588,7 @@ | |||
2599 | <key>Type</key> | 2588 | <key>Type</key> |
2600 | <string>Boolean</string> | 2589 | <string>Boolean</string> |
2601 | <key>Value</key> | 2590 | <key>Value</key> |
2602 | <integer>0</integer> | 2591 | <integer>1</integer> |
2603 | </map> | 2592 | </map> |
2604 | <key>FloaterActiveSpeakersSortColumn</key> | 2593 | <key>FloaterActiveSpeakersSortColumn</key> |
2605 | <map> | 2594 | <map> |
@@ -2660,6 +2649,22 @@ | |||
2660 | <integer>0</integer> | 2649 | <integer>0</integer> |
2661 | </array> | 2650 | </array> |
2662 | </map> | 2651 | </map> |
2652 | <key>FloaterBeaconsRect</key> | ||
2653 | <map> | ||
2654 | <key>Comment</key> | ||
2655 | <string>Rectangle for beacon and highlight controls</string> | ||
2656 | <key>Persist</key> | ||
2657 | <integer>1</integer> | ||
2658 | <key>Type</key> | ||
2659 | <string>Rect</string> | ||
2660 | <key>Value</key> | ||
2661 | <array> | ||
2662 | <integer>200</integer> | ||
2663 | <integer>250</integer> | ||
2664 | <integer>250</integer> | ||
2665 | <integer>200</integer> | ||
2666 | </array> | ||
2667 | </map> | ||
2663 | <key>FloaterBuildOptionsRect</key> | 2668 | <key>FloaterBuildOptionsRect</key> |
2664 | <map> | 2669 | <map> |
2665 | <key>Comment</key> | 2670 | <key>Comment</key> |
@@ -3579,6 +3584,17 @@ | |||
3579 | <key>Value</key> | 3584 | <key>Value</key> |
3580 | <integer>0</integer> | 3585 | <integer>0</integer> |
3581 | </map> | 3586 | </map> |
3587 | <key>ForceMandatoryUpdate</key> | ||
3588 | <map> | ||
3589 | <key>Comment</key> | ||
3590 | <string>For QA: On next startup, forces the auto-updater to run</string> | ||
3591 | <key>Persist</key> | ||
3592 | <integer>1</integer> | ||
3593 | <key>Type</key> | ||
3594 | <string>Boolean</string> | ||
3595 | <key>Value</key> | ||
3596 | <integer>0</integer> | ||
3597 | </map> | ||
3582 | <key>ForwardBtnRect</key> | 3598 | <key>ForwardBtnRect</key> |
3583 | <map> | 3599 | <map> |
3584 | <key>Comment</key> | 3600 | <key>Comment</key> |
@@ -3950,7 +3966,18 @@ | |||
3950 | <key>Value</key> | 3966 | <key>Value</key> |
3951 | <real>0.0</real> | 3967 | <real>0.0</real> |
3952 | </map> | 3968 | </map> |
3953 | <key>InventoryAutoOpenDelay</key> | 3969 | <key>InstallLanguage</key> |
3970 | <map> | ||
3971 | <key>Comment</key> | ||
3972 | <string>Language passed from installer (for UI)</string> | ||
3973 | <key>Persist</key> | ||
3974 | <integer>1</integer> | ||
3975 | <key>Type</key> | ||
3976 | <string>String</string> | ||
3977 | <key>Value</key> | ||
3978 | <string>default</string> | ||
3979 | </map> | ||
3980 | <key>InventoryAutoOpenDelay</key> | ||
3954 | <map> | 3981 | <map> |
3955 | <key>Comment</key> | 3982 | <key>Comment</key> |
3956 | <string>Seconds before automatically opening inventory when mouse is over inventory button when performing inventory drag and drop</string> | 3983 | <string>Seconds before automatically opening inventory when mouse is over inventory button when performing inventory drag and drop</string> |
@@ -4173,7 +4200,7 @@ | |||
4173 | <key>Type</key> | 4200 | <key>Type</key> |
4174 | <string>String</string> | 4201 | <string>String</string> |
4175 | <key>Value</key> | 4202 | <key>Value</key> |
4176 | <string>https://wiki.secondlife.com/wiki/[LSL_STRING]</string> | 4203 | <string>http://wiki.secondlife.com/wiki/[LSL_STRING]</string> |
4177 | </map> | 4204 | </map> |
4178 | <key>LagMeterShrunk</key> | 4205 | <key>LagMeterShrunk</key> |
4179 | <map> | 4206 | <map> |
@@ -4200,7 +4227,7 @@ | |||
4200 | <key>Language</key> | 4227 | <key>Language</key> |
4201 | <map> | 4228 | <map> |
4202 | <key>Comment</key> | 4229 | <key>Comment</key> |
4203 | <string>Language specifier (for XUI)</string> | 4230 | <string>Language specifier (for UI)</string> |
4204 | <key>Persist</key> | 4231 | <key>Persist</key> |
4205 | <integer>1</integer> | 4232 | <integer>1</integer> |
4206 | <key>Type</key> | 4233 | <key>Type</key> |
@@ -4274,10 +4301,11 @@ | |||
4274 | <key>Value</key> | 4301 | <key>Value</key> |
4275 | <string>0.0.0</string> | 4302 | <string>0.0.0</string> |
4276 | </map> | 4303 | </map> |
4277 | <key>LastSnapshotHeight</key> | 4304 | |
4305 | <key>LastSnapshotToEmailHeight</key> | ||
4278 | <map> | 4306 | <map> |
4279 | <key>Comment</key> | 4307 | <key>Comment</key> |
4280 | <string>The height of the last snapshot, in px</string> | 4308 | <string>The height of the last email snapshot, in px</string> |
4281 | <key>Persist</key> | 4309 | <key>Persist</key> |
4282 | <integer>1</integer> | 4310 | <integer>1</integer> |
4283 | <key>Type</key> | 4311 | <key>Type</key> |
@@ -4285,21 +4313,32 @@ | |||
4285 | <key>Value</key> | 4313 | <key>Value</key> |
4286 | <integer>768</integer> | 4314 | <integer>768</integer> |
4287 | </map> | 4315 | </map> |
4288 | <key>LastSnapshotType</key> | 4316 | <key>LastSnapshotToEmailWidth</key> |
4289 | <map> | 4317 | <map> |
4290 | <key>Comment</key> | 4318 | <key>Comment</key> |
4291 | <string>Select this as next type of snapshot to take (0 = postcard, 1 = texture, 2 = local image)</string> | 4319 | <string>The width of the last email snapshot, in px</string> |
4292 | <key>Persist</key> | 4320 | <key>Persist</key> |
4293 | <integer>1</integer> | 4321 | <integer>1</integer> |
4294 | <key>Type</key> | 4322 | <key>Type</key> |
4295 | <string>S32</string> | 4323 | <string>S32</string> |
4296 | <key>Value</key> | 4324 | <key>Value</key> |
4297 | <integer>0</integer> | 4325 | <integer>1024</integer> |
4326 | </map> | ||
4327 | <key>LastSnapshotToDiskHeight</key> | ||
4328 | <map> | ||
4329 | <key>Comment</key> | ||
4330 | <string>The height of the last disk snapshot, in px</string> | ||
4331 | <key>Persist</key> | ||
4332 | <integer>1</integer> | ||
4333 | <key>Type</key> | ||
4334 | <string>S32</string> | ||
4335 | <key>Value</key> | ||
4336 | <integer>768</integer> | ||
4298 | </map> | 4337 | </map> |
4299 | <key>LastSnapshotWidth</key> | 4338 | <key>LastSnapshotToDiskWidth</key> |
4300 | <map> | 4339 | <map> |
4301 | <key>Comment</key> | 4340 | <key>Comment</key> |
4302 | <string>The width of the last snapshot, in px</string> | 4341 | <string>The width of the last disk snapshot, in px</string> |
4303 | <key>Persist</key> | 4342 | <key>Persist</key> |
4304 | <integer>1</integer> | 4343 | <integer>1</integer> |
4305 | <key>Type</key> | 4344 | <key>Type</key> |
@@ -4307,6 +4346,39 @@ | |||
4307 | <key>Value</key> | 4346 | <key>Value</key> |
4308 | <integer>1024</integer> | 4347 | <integer>1024</integer> |
4309 | </map> | 4348 | </map> |
4349 | <key>LastSnapshotToInventoryHeight</key> | ||
4350 | <map> | ||
4351 | <key>Comment</key> | ||
4352 | <string>The height of the last texture snapshot, in px</string> | ||
4353 | <key>Persist</key> | ||
4354 | <integer>1</integer> | ||
4355 | <key>Type</key> | ||
4356 | <string>S32</string> | ||
4357 | <key>Value</key> | ||
4358 | <integer>512</integer> | ||
4359 | </map> | ||
4360 | <key>LastSnapshotToInventoryWidth</key> | ||
4361 | <map> | ||
4362 | <key>Comment</key> | ||
4363 | <string>The width of the last texture snapshot, in px</string> | ||
4364 | <key>Persist</key> | ||
4365 | <integer>1</integer> | ||
4366 | <key>Type</key> | ||
4367 | <string>S32</string> | ||
4368 | <key>Value</key> | ||
4369 | <integer>512</integer> | ||
4370 | </map> | ||
4371 | <key>LastSnapshotType</key> | ||
4372 | <map> | ||
4373 | <key>Comment</key> | ||
4374 | <string>Select this as next type of snapshot to take (0 = postcard, 1 = texture, 2 = local image)</string> | ||
4375 | <key>Persist</key> | ||
4376 | <integer>1</integer> | ||
4377 | <key>Type</key> | ||
4378 | <string>S32</string> | ||
4379 | <key>Value</key> | ||
4380 | <integer>0</integer> | ||
4381 | </map> | ||
4310 | <key>LeftClickShowMenu</key> | 4382 | <key>LeftClickShowMenu</key> |
4311 | <map> | 4383 | <map> |
4312 | <key>Comment</key> | 4384 | <key>Comment</key> |
@@ -4483,17 +4555,6 @@ | |||
4483 | <key>Value</key> | 4555 | <key>Value</key> |
4484 | <real>20.0</real> | 4556 | <real>20.0</real> |
4485 | </map> | 4557 | </map> |
4486 | <key>MainloopTimeoutDefault</key> | ||
4487 | <map> | ||
4488 | <key>Comment</key> | ||
4489 | <string>Timeout duration for mainloop lock detection, in seconds.</string> | ||
4490 | <key>Persist</key> | ||
4491 | <integer>1</integer> | ||
4492 | <key>Type</key> | ||
4493 | <string>F32</string> | ||
4494 | <key>Value</key> | ||
4495 | <real>10.0</real> | ||
4496 | </map> | ||
4497 | <key>MapOverlayIndex</key> | 4558 | <key>MapOverlayIndex</key> |
4498 | <map> | 4559 | <map> |
4499 | <key>Comment</key> | 4560 | <key>Comment</key> |
@@ -6094,6 +6155,17 @@ | |||
6094 | <key>Value</key> | 6155 | <key>Value</key> |
6095 | <real>1.3</real> | 6156 | <real>1.3</real> |
6096 | </map> | 6157 | </map> |
6158 | <key>RenderGround</key> | ||
6159 | <map> | ||
6160 | <key>Comment</key> | ||
6161 | <string>Determines whether we can render the ground pool or not</string> | ||
6162 | <key>Persist</key> | ||
6163 | <integer>1</integer> | ||
6164 | <key>Type</key> | ||
6165 | <string>Boolean</string> | ||
6166 | <key>Value</key> | ||
6167 | <integer>1</integer> | ||
6168 | </map> | ||
6097 | <key>RenderHUDInSnapshot</key> | 6169 | <key>RenderHUDInSnapshot</key> |
6098 | <map> | 6170 | <map> |
6099 | <key>Comment</key> | 6171 | <key>Comment</key> |
@@ -7648,7 +7720,7 @@ | |||
7648 | <key>SystemLanguage</key> | 7720 | <key>SystemLanguage</key> |
7649 | <map> | 7721 | <map> |
7650 | <key>Comment</key> | 7722 | <key>Comment</key> |
7651 | <string>Language indicated by system settings (for XUI)</string> | 7723 | <string>Language indicated by system settings (for UI)</string> |
7652 | <key>Persist</key> | 7724 | <key>Persist</key> |
7653 | <integer>1</integer> | 7725 | <integer>1</integer> |
7654 | <key>Type</key> | 7726 | <key>Type</key> |
@@ -9596,16 +9668,27 @@ | |||
9596 | <key>Value</key> | 9668 | <key>Value</key> |
9597 | <string>-1</string> | 9669 | <string>-1</string> |
9598 | </map> | 9670 | </map> |
9599 | <key>VivoxDebugServerName</key> | 9671 | <key>VivoxDebugSIPURIHostName</key> |
9672 | <map> | ||
9673 | <key>Comment</key> | ||
9674 | <string>Hostname portion of vivox SIP URIs (empty string for the default).</string> | ||
9675 | <key>Persist</key> | ||
9676 | <integer>1</integer> | ||
9677 | <key>Type</key> | ||
9678 | <string>String</string> | ||
9679 | <key>Value</key> | ||
9680 | <string></string> | ||
9681 | </map> | ||
9682 | <key>VivoxDebugVoiceAccountServerURI</key> | ||
9600 | <map> | 9683 | <map> |
9601 | <key>Comment</key> | 9684 | <key>Comment</key> |
9602 | <string>Hostname of the vivox account server to use for voice when not connected to Agni.</string> | 9685 | <string>URI to the vivox account management server (empty string for the default).</string> |
9603 | <key>Persist</key> | 9686 | <key>Persist</key> |
9604 | <integer>1</integer> | 9687 | <integer>1</integer> |
9605 | <key>Type</key> | 9688 | <key>Type</key> |
9606 | <string>String</string> | 9689 | <string>String</string> |
9607 | <key>Value</key> | 9690 | <key>Value</key> |
9608 | <string>bhd.vivox.com</string> | 9691 | <string></string> |
9609 | </map> | 9692 | </map> |
9610 | <key>VoiceCallsFriendsOnly</key> | 9693 | <key>VoiceCallsFriendsOnly</key> |
9611 | <map> | 9694 | <map> |
@@ -9748,7 +9831,7 @@ | |||
9748 | <key>Type</key> | 9831 | <key>Type</key> |
9749 | <string>U32</string> | 9832 | <string>U32</string> |
9750 | <key>Value</key> | 9833 | <key>Value</key> |
9751 | <integer>44124</integer> | 9834 | <integer>44125</integer> |
9752 | </map> | 9835 | </map> |
9753 | <key>WLSkyDetail</key> | 9836 | <key>WLSkyDetail</key> |
9754 | <map> | 9837 | <map> |
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl index 0df89c8..78b96b3 100644 --- a/linden/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl +++ b/linden/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl | |||
@@ -11,7 +11,7 @@ void calcAtmospherics(vec3 inPositionEye); | |||
11 | void main() | 11 | void main() |
12 | { | 12 | { |
13 | //transform vertex | 13 | //transform vertex |
14 | gl_Position = ftransform(); //gl_ModelViewProjectionMatrix * gl_Vertex; | 14 | gl_Position = ftransform(); |
15 | gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; | 15 | gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; |
16 | 16 | ||
17 | vec4 pos = (gl_ModelViewMatrix * gl_Vertex); | 17 | vec4 pos = (gl_ModelViewMatrix * gl_Vertex); |