aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt291
-rw-r--r--RELEASE_NOTES.txt294
-rw-r--r--linden/LICENSE-libraries-linux.txt811
-rw-r--r--linden/LICENSE-libraries-mac.txt696
-rw-r--r--linden/LICENSE-libraries-win32.txt737
-rw-r--r--linden/LICENSE-logos.txt23
-rw-r--r--linden/doc/contributions.txt1
-rw-r--r--linden/indra/llcommon/llsecondlifeurls.cpp2
-rw-r--r--linden/indra/llcommon/llversionviewer.h3
-rw-r--r--linden/indra/newview/app_settings/settings.xml32
-rw-r--r--linden/indra/newview/llappviewer.cpp7
-rw-r--r--linden/indra/newview/llcolorscheme.cpp5
-rw-r--r--linden/indra/newview/llcolorscheme.h2
-rw-r--r--linden/indra/newview/llfloaterabout.cpp19
-rw-r--r--linden/indra/newview/llfloatergroupinvite.cpp20
-rw-r--r--linden/indra/newview/llfloatergroupinvite.h6
-rw-r--r--linden/indra/newview/llfloaterhtmlhelp.cpp38
-rw-r--r--linden/indra/newview/llfloaterhtmlhelp.h3
-rw-r--r--linden/indra/newview/llfloaterinspect.cpp5
-rw-r--r--linden/indra/newview/llnetmap.cpp7
-rw-r--r--linden/indra/newview/llnetmap.h3
-rw-r--r--linden/indra/newview/llpanellogin.cpp13
-rw-r--r--linden/indra/newview/llpanellogin.h1
-rw-r--r--linden/indra/newview/llselectmgr.cpp7
-rw-r--r--linden/indra/newview/llstartup.cpp4
-rw-r--r--linden/indra/newview/llurlhistory.cpp14
-rw-r--r--linden/indra/newview/llviewermenu.cpp17
-rw-r--r--linden/indra/newview/llviewernetwork.cpp39
-rw-r--r--linden/indra/newview/llviewerregion.cpp4
-rw-r--r--linden/indra/newview/llviewerwindow.cpp2
-rw-r--r--linden/indra/newview/llworld.cpp9
-rw-r--r--linden/indra/newview/llworldmapview.cpp8
-rw-r--r--linden/indra/newview/llworldmapview.h2
-rw-r--r--linden/indra/newview/pipeline.cpp2
-rw-r--r--linden/indra/newview/skins/default/colors_base.xml319
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_login.xml66
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml17
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notify.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_groups.xml8
-rw-r--r--linden/indra/newview/skins/silver/colors_base.xml384
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py99
-rw-r--r--linden/install.xml4
-rwxr-xr-xlinden/scripts/build_version.py4
45 files changed, 3546 insertions, 507 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 01af210..6b75515 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,41 @@
12008-12-16 Jacek Antonelli <jacek.antonelli@gmail.com>
2
3 * linden/indra/newview/llselectmgr.cpp:
4 VWR-1582: Local ruler mode wrong for linked objects.
5 Also VWR-11103 (regression of above).
6
7
82008-12-15 Jacek Antonelli <jacek.antonelli@gmail.com>
9
10 * linden/install.xml:
11 Switched OpenJPEG package to a tar.bz2.
12 The install.py script doesn't support .zip files.
13 Maybe later we could add support for that.
14
15
16 * linden/indra/newview/llworld.cpp:
17 VWR-9352: Prim falls to 256m height when moved outworld.
18 Patch by Aimee Trescothick.
19
20
212008-12-13 Jacek Antonelli <jacek.antonelli@gmail.com>
22
23 * linden/scripts/build_version.py:
24 Version string generator now includes test label.
25 This is used for naming packages on Linux, among other things.
26
27
28 * linden/indra/llcommon/llversionviewer.h:
29 Bumped version to 1.1.0 alpha.
30
31
322008-12-11 McCabe Maxsted <hakushakukun@gmail.com>
33
34 * linden/indra/newview/llfloaterinspect.cpp:
35 VWR-10823: Right click > Inspect crashes viewer.
36 Backported from LL's 1.22 RC3.
37
38
12008-12-10 Jacek Antonelli <jacek.antonelli@gmail.com> 392008-12-10 Jacek Antonelli <jacek.antonelli@gmail.com>
2 40
3 * linden/indra/newview/llinventoryview.cpp: 41 * linden/indra/newview/llinventoryview.cpp:
@@ -108,40 +146,50 @@
108 New bitfield enumerator for inventory types. 146 New bitfield enumerator for inventory types.
109 147
110 148
1112008-12-06 Jacek Antonelli <jacek.antonelli@gmail.com> 1492008-12-01 McCabe Maxsted <hakushakukun@gmail.com>
112 150
113 * ChangeLog: 151 * linden/indra/newview/app_settings/settings.xml:
114 Added banners in ChangeLog to set versions apart. 152 Added "Select Only Copyable Objects" menu option.
115 153 * linden/indra/newview/llselectmgr.cpp:
116 Entries should be placed in the section for the 154 Ditto
117 version into which they were merged. Entries within 155 * linden/indra/newview/llviewermenu.cpp:
118 a section should be sorted chronologically. 156 Ditto
157 * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
158 Ditto
119 159
120 This is important for keeping track of changes which
121 weren't merged until a later release than they were
122 written. (Mixing them in chronologically would cause
123 confusion about which changes were included in a
124 release.)
125 160
1612008-11-24 McCabe Maxsted <hakushakukun@gmail.com>
126 162
127 * linden/indra/llmessage/llhttpclient.cpp: 163 * linden/indra/newview/llfloatergroupinvite.cpp:
128 VWR-9400b (memleak whenever an LSL script is uploaded) 164 Add group name to group invite window.
129 Patch by Henri Beauchamp. 165 * linden/indra/newview/llfloatergroupinvite.h:
166 Ditto.
130 167
131 168
132 * linden/indra/llmessage/llhttpclient.cpp: 1692008-11-23 McCabe Maxsted <hakushakukun@gmail.com>
133 VWR-9400 (memleak whenever an LSL script is uploaded)
134 Patch by Carjay McGinnis.
135 170
171 * linden/indra/newview/skins/default/xui/en-us/notify.xml:
172 VWR-4826 (ability to ignore friendship offers).
136 173
137 * linden/indra/llimage/llimagetga.cpp:
138 VWR-10837 (use delete [] in LLImageTGA)
139 Patch by Aleric Inglewood.
140 174
175 * linden/indra/newview/app_settings/settings.xml:
176 Beacons no longer persist between sessions.
177 That distressed users who accidentally enabled them,
178 since not even relogging would disable them.
179 * linden/indra/newview/llviewerwindow.cpp:
180 Ditto.
181 * linden/indra/newview/pipeline.cpp:
182 Ditto.
183 * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
184 Ditto.
141 185
142 * linden/indra/llmedia/llmediaimplgstreamer.cpp: 186
143 VWR-10759 (use delete [] in LLMediaImplGStreamer) 187 * linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml:
144 Patch by Aleric Inglewood. 188 Moved 'Offer Teleport' in IM to be on the left side.
189
190
191 * linden/indra/newview/skins/default/xui/en-us/panel_groups.xml:
192 Switched Invite and Leave buttons in group panel.
145 193
146 194
1472008-11-23 Jacek Antonelli <jacek.antonelli@gmail.com> 1952008-11-23 Jacek Antonelli <jacek.antonelli@gmail.com>
@@ -202,6 +250,40 @@
202 Ditto. 250 Ditto.
203 251
204 252
2532008-11-22 McCabe Maxsted <hakushakukun@gmail.com>
254
255 * linden\indra\newview\skins\default\colors_base.xml:
256 Added full comments to default skin colors.
257 * linden\indra\newview\skins\silver\colors_base.xml:
258 Added full comments to silver skin colors.
259
260
2612008-11-22 McCabe Maxsted <hakushakukun@gmail.com>
262
263 * indra/newview/llcolorscheme.cpp:
264 Added minimap glyph color to colors.xml.
265 * indra/newview/llcolorscheme.h:
266 Ditto.
267 * indra/newview/llnetmap.cpp:
268 Ditto.
269 * indra/newview/llnetmap.h:
270 Ditto.
271 * indra/newview/llworldmapview.cpp:
272 Ditto.
273 * indra/newview/llworldmapview.h:
274 Ditto.
275 * indra/newview/skins/default/colors_base.xml:
276 Ditto.
277 * indra/newview/skins/silver/colors_base.xml:
278 Ditto.
279
280
2812008-11-21 McCabe Maxsted <hakushakukun@gmail.com>
282
283 * linden/indra/newview/llnetmap.cpp:
284 Friends show yellow in minimap (VWR-3336).
285
286
2052008-11-11 Jacek Antonelli <jacek.antonelli@gmail.com> 2872008-11-11 Jacek Antonelli <jacek.antonelli@gmail.com>
206 288
207 * linden/indra/newview/llinventoryview.cpp: 289 * linden/indra/newview/llinventoryview.cpp:
@@ -232,6 +314,163 @@
232 Added XUI for the Quick Filter combo box. 314 Added XUI for the Quick Filter combo box.
233 315
234 316
317
3182008-10-18 McCabe Maxsted <hakushakukun@gmail.com>
319
320 * linden\indra\newview\skins\default\xui\en-us\menu_viewer.xml:
321 Added menu option for inworld browser.
322 * linden\indra\newview\llviewermenu.cpp:
323 Ditto.
324
325
326 * linden/indra/newview/app_settings/settings.xml:
327 Added Home button functionality to the web browser.
328 * linden/indra/newview/llfloaterhtmlhelp.cpp:
329 Ditto.
330 * linden/indra/newview/llfloaterhtmlhelp.h:
331 Ditto.
332 * linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml:
333 Ditto.
334
335
336=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
337=- 1.0.0 -=
338=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
339
340
3412008-12-12 Jacek Antonelli <jacek.antonelli@gmail.com>
342
343 * Imprudence 1.0.0 finalized.
344
345
346 * RELEASE_NOTES.txt:
347 Added release notes.
348 * linden/indra/newview/viewer_manifest.py:
349 Ditto.
350
351
352 * linden/indra/llcommon/llversionviewer.h:
353 Blanked the test version string. Not RC anymore.
354
355
356 * linden/install.xml:
357 Windows build uses OpenJPEG 1.3.
358 Fixes half-opaque skirts/textures issue.
359
360
361 * linden/indra/newview/viewer_manifest.py:
362 README.txt will stay that name; README-linux.txt removed.
363
364
3652008-12-11 Jacek Antonelli <jacek.antonelli@gmail.com>
366
367 * linden/indra/newview/llfloaterabout.cpp:
368 Simplified release notes URL scheme.
369 Now uses e.g. "wiki/Release Notes/1.0.0-RC2",
370 which is set up as a wiki redirect.
371
372
373 * linden/indra/newview/llfloaterabout.cpp:
374 Fixed bad string comparison (rel notes url) [#28]
375 Reported by Balp Allen.
376
377
3782008-12-10 Jacek Antonelli <jacek.antonelli@gmail.com>
379
380 * linden/indra/newview/llpanellogin.cpp:
381 Fix grid selector having a duplicate entry. [#24]
382 Patch by Balp Allen.
383 * linden/indra/newview/llpanellogin.h:
384 Ditto.
385 * linden/indra/newview/llstartup.cpp:
386 Ditto.
387
388
389 * linden/indra/newview/llurlhistory.cpp:
390 Better warning when url_history.xml save fails.
391
392
393 * linden/indra/newview/llviewernetwork.cpp:
394 Fixed bad string comparison (grid code name). [#22]
395 Reported by Balp Allen.
396
397
3982008-12-06 Jacek Antonelli <jacek.antonelli@gmail.com>
399
400 * ChangeLog:
401 Added banners in ChangeLog to set versions apart.
402
403 Entries should be placed in the section for the
404 version into which they were merged. Entries within
405 a section should be sorted chronologically.
406
407 This is important for keeping track of changes which
408 weren't merged until a later release than they were
409 written. (Mixing them in chronologically would cause
410 confusion about which changes were included in a
411 release.)
412
413
414 * linden/indra/llmessage/llhttpclient.cpp:
415 VWR-9400b (memleak whenever an LSL script is uploaded)
416 Patch by Henri Beauchamp.
417
418
419 * linden/indra/llmessage/llhttpclient.cpp:
420 VWR-9400 (memleak whenever an LSL script is uploaded)
421 Patch by Carjay McGinnis.
422
423
424 * linden/indra/llimage/llimagetga.cpp:
425 VWR-10837 (use delete [] in LLImageTGA)
426 Patch by Aleric Inglewood.
427
428
429 * linden/indra/llmedia/llmediaimplgstreamer.cpp:
430 VWR-10759 (use delete [] in LLMediaImplGStreamer)
431 Patch by Aleric Inglewood.
432
433
4342008-12-06 McCabe Maxsted <hakushakukun@gmail.com>
435
436 * linden/indra/llcommon/llversionviewer.h:
437 Added test version info.
438 * linden/indra/newview/llfloaterabout.cpp:
439 Ditto.
440 * linden/indra/newview/llappviewer.cpp:
441 Ditto.
442 * linden/indra/newview/llpanellogin.cpp:
443 Ditto.
444
445
4462008-12-05 McCabe Maxsted <hakushakukun@gmail.com>
447
448 * linden/indra/llcommon/llsecondlifeurls.cpp:
449 Changed Release Notes link to point to Imprudence.
450 * linden/indra/newview/llfloaterabout.cpp:
451 Ditto.
452
453
454 * linden/indra/newview/skins/default/xui/en-us/menu_login.xml:
455 Rebranded login menu. [#23]
456
457
458 * linden/indra/newview/llurlhistory.cpp:
459 Fixed blank url_history.xml creation. (VWR-5808)
460
461
4622008-12-01 Jacek Antonelli <jacek.antonelli@gmail.com>
463
464 * linden/indra/newview/viewer_manifest.py:
465 Fixed indentation for 'skins' prefix.
466
467 * linden/indra/newview/viewer_manifest.py:
468 Doc packaging moved to platform-independent manifest.
469
470
471 * Imported license files for libraries and artwork.
472
473
235=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- 474=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
236=- 1.0.0 RC2 -= 475=- 1.0.0 RC2 -=
237=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- 476=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -248,6 +487,10 @@
248 487
2492008-11-30 Jacek Antonelli <jacek.antonelli@gmail.com> 4882008-11-30 Jacek Antonelli <jacek.antonelli@gmail.com>
250 489
490 * linden/indra/newview/viewer_manifest.py:
491 Package up README.txt, etc. on Linux.
492
493
251 * linden/indra/llmedia/llmediamanager.cpp: 494 * linden/indra/llmedia/llmediamanager.cpp:
252 Disable llmozlib-dependent code when not available. 495 Disable llmozlib-dependent code when not available.
253 Patch by Stephen Zenith. [#12] 496 Patch by Stephen Zenith. [#12]
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
new file mode 100644
index 0000000..9f39144
--- /dev/null
+++ b/RELEASE_NOTES.txt
@@ -0,0 +1,294 @@
1
2 Release Notes for the Imprudence Viewer
3 http://imprudenceviewer.org
4
5
6
7 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
8 =- 1.0.0 -=
9 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
10
11
12 KNOWN ISSUES
13
14 * Still no sound or voice yet.
15
16 * Login screen misleadingly displays the last grid you had
17 selected even if you use the --loginuri command line option
18 (IMP-29).
19
20 * The menus for non-English languages still say "Second Life" in
21 some places where they should say "Imprudence" (IMP-27).
22
23
24 CHANGES
25
26 This version of Imprudence includes the following changes (as
27 compared to Imprudence 1.0.0 RC2):
28
29 * Rendering: Windows version ships with OpenJPEG 1.3. This fixes
30 the issue of skirts and some uploaded images appearing
31 half-transparent. Thanks to McCabe and everyone who helped us
32 identify and test that!
33
34 * UI: Added support for displaying a test version identifier
35 (e.g. RC2) at the login screen and About Imprudence, to help
36 people tell the test versions apart. (Note: you won't see it in
37 this release, because this isn't a test version!) Thanks to
38 McCabe for adding that!
39
40 * UI: Rebranded the Help menu at the login screen to match the
41 main Help menu (IMP-23). Thanks to Balp Allen for reporting
42 that, and McCabe for fixing it!
43
44 * UI: The "Release Notes" link in About Imprudence now takes you
45 to the release notes on the Imprudence wiki, instead of to a
46 bogus page on the Second Life wiki. Thanks to McCabe and Jacek
47 for doing that!
48
49 * UI: Grid selector at the login screen no longer has a duplicate
50 entry (IMP-24). Thanks to Balp Allen for fixing that!
51
52 * Misc.: Fixed the viewer stupidly creating a 'url_history.xml'
53 file in 'C:\' on Windows, and perhaps in '/' (root) on Mac
54 (VWR-5808). Thanks to McCabe for fixing that!
55
56 * Code: Patched two small memory leaks when uploading scripts
57 (VWR-9400). Thanks to Carjay McGinnis and Henri Beauchamp for
58 making those patches!
59
60 * Code: Patched two minor code cleanliness issues (VWR-10759,
61 VWR-10837). Thanks to Aleric Inglewood for making those
62 patches!
63
64
65
66
67 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
68 =- 1.0.0 RC2 -=
69 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
70
71
72 KNOWN ISSUES
73
74 * Some users have reported that system skirts (not attachments)
75 and some uploaded images with alpha channels appear
76 partially transparent all over, instead of being opaque
77 in some places and transparent in others. You can fix this by
78 upgrading to OpenJPEG 1.3. Future Imprudence releases will
79 have the new OpenJPEG included in the regular download.
80
81 * The grid selection list on the login screen displays a
82 duplicate entry (e.g. two "SL Main Grid" entries). This is
83 harmless, and a PITA to fix.
84
85 * Still no sound or voice yet.
86
87
88 CHANGES
89
90 This version of Imprudence includes the following changes (as
91 compared to Imprudence 1.0.0 RC1):
92
93 * Rendering: Applied a likely fix for VWR-8920 (disappearing
94 attachments when zoomed in). Please let us know in the forums
95 whether this fixes the issue for you. Thanks to an unknown
96 Linden for the fix, and to Strife Onizuka for pointing to it!
97
98 * Rendering: Applied a likely fix for VWR-9358 (problems with
99 palletized textures). Please
100 [http://imprudenceviewer.org/forums/viewtopic.php?f=6&t=66 let
101 us know in the forums] whether this fixes the issue for you.
102 Thanks to Angus Boyd for suggesting the fix!
103
104 * Misc UI.: Grid selection list on the login page has been
105 embraced and cleaned up. It now lists 3 options: SL Main Grid,
106 SL Beta Grid, and Local OpenSim (if you run OpenSim on your
107 computer). It will be made customizable in a future version.
108 Thanks to Jacek for sprucing that up!
109
110 * Misc: Fixed the debug console window always showing up. Thanks
111 to McCabe for fixing it, and to an unknown Linden's testing
112 code for causing it in the first place!
113
114 * Misc: Fixed the Windows viewer crashing when clicking on
115 certain links in embedded web pages (VWR-4828). Thanks
116 to Nyx Linden for pointing to the updated LLMozLib!
117
118 * Misc: Fixed the Windows installer giving an error when
119 launching the viewer after installation. Thanks to McCabe for
120 fixing that!
121
122 * Misc: Imprudence now uses a separate directory from Second Life
123 for storing the cache, settings, and chat logs. This fixes the
124 viewer clearing the cache the first time it's run. On Linux,
125 it's the '.imprudence' directory in your home directory, and on
126 Mac and Windows it's the 'Imprudence' directory in your
127 Application Data directory. Thanks to Jacek for doing this!
128
129 * Misc: Fixed the Search window clearing itself out when closed
130 and re-opened. Thanks to Samantha Poindexter for reporting the
131 problem, to McCabe for fixing it, and to an unknown Linden's
132 testing code for causing it in the first place!
133
134 * Building: Fixed the Silver skin's Build floater not matching
135 the one from the Classic skin. Thanks to Damien Fate for
136 reporting the problem, and to Jacek for fixing it!
137
138 * Code: Fixed several bits of sloppy Linden code that blocked
139 compiling with gcc 4.3. Thanks to Alissa Sabre for suggesting
140 the fix to VWR-9507, and Stephen Zenith for patches
141 IMP-11 and IMP-12!
142
143 * Misc UI.: Changed Group UI to use "Resident" or "Member"
144 instead of "Person", for consistency (VWR-9007).
145 Thanks to McCabe for sprucing that up!
146
147
148
149
150 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
151 =- 1.0.0 RC1 -=
152 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
153
154
155 WHAT TO EXPECT
156
157 * Many small usability improvements.
158
159 The goal of Imprudence is to make significant usability
160 improvements over the standard SL viewer, but for this first
161 release our focus has simply been to get the project
162 established. You'll find many small improvements scattered
163 throughout the viewer, almost all of them programmed by SL
164 Residents and submitted as patches to JIRA, but which LL has not
165 (at least yet) accepted. Future versions of Imprudence will
166 feature more significant improvements made specifically for this
167 project.
168
169 * New fonts.
170
171 Imprudence uses different fonts than regular SL, because SL's
172 fonts are proprietary and very expensive to license. The new
173 fonts might make things seem "not quite right" at first, since
174 your eye expects the old font you normally see in SL. We do
175 think you'll enjoy the new fonts once you get used to them. (For
176 the curious, the fonts used are Liberation Sans for the UI, and
177 Bitstream Vera Mono for the script editor.)
178
179 * No sound or voice.
180
181 This release of Imprudence doesn't have any sound or voice
182 support, because the software libraries SL uses for those things
183 are proprietary and can't be used with open-source viewers. We
184 hope to add back sound support using OpenAL for the next version
185 of Imprudence. We're not sure yet when we'll be able to add
186 voice back in.
187
188 * Slightly slower texture loading.
189
190 Textures may load slightly slower than they do in regular SL.
191 Once again, this is because the texture software library SL uses
192 by default (Kakadu / KDU) is proprietary, so we're using
193 OpenJPEG, which is open source but not quite as speedy. The
194 difference shouldn't be a major issue.
195
196
197 CHANGES
198
199 This version of Imprudence includes the following changes (as
200 compared to Second Life viewer 1.21.6):
201
202 * Building: You can now "Slice" (aka. Dimple / Profile Cut) the
203 Box, Cylinder, and Prism prim types directly, without needing to
204 switch to Sphere and back. (VWR-7827; thanks McCabe Maxsted!)
205
206 * Stability: Several patches by Nicholaz Beresford to fix memory
207 leaks and improve stability. (VWR-2003, VWR-2683, VWR-2685,
208 VWR-3877, and VWR-3878; thanks Nicholaz!)
209
210 * Misc.: The "Advanced" menu is now written in XUI, so you can
211 edit shortcuts in that menu by editing the XML file, instead of
212 needing to recompile the viewer from source. (Note: The file to
213 edit is skins/default/xui/en-us/menu_viewer.xml) (VWR-2896;
214 thanks Jacek Antonelli!)
215
216 * Social: Added "Invite..." button to the Groups section of the
217 Communicate panel, to make it easier to invite people to the
218 selected group. (VWR-8024; thanks McCabe Maxsted!)
219
220 * Building: Up and down arrows change Path Cut / Profile Cut by
221 increments of 0.025 instead of 0.05, to make it easier to
222 path-cut boxes in half, etc. (VWR-7877; thanks McCabe Maxsted!)
223
224 * Misc. UI: Added "Return Object" to the Tools menu, to make it
225 easier to return objects that are hard to right-click on.
226 (VWR-1363; thanks McCabe Maxsted!)
227
228 * Social: Added "Offer Teleport" button to the IM window.
229 (VWR-2072; thanks Paul Churchill!)
230
231 * Building: Added "Tools > Set permissions on selected task
232 inventory" menu item, to set perms on multiple in-world objects
233 and/or their contents. This will have a nicer UI later.
234 (VWR-5082; thanks Michelle2 Zenovka!)
235
236 * Misc. UI: Several usability and UI layout improvements to the
237 land tools floater. (VWR-8430; thanks Aimee Trescothick!)
238
239 * Misc. UI: Added "Flycam" button that appears when you are in
240 flycam mode (using a joystick or SpaceNavigator); click it to
241 cancel flycam mode. (VWR-8341; thanks Aimee Trescothick!)
242
243 * Building: Rephrased "Select Texture" to the more accurate and
244 descriptive phrase "Select Faces to Texture". (Inspired by
245 VWR-5962; thanks McCabe Maxsted and Jacek Antonelli!)
246
247 * Building: Increased maximum settable transparency from 90% to
248 100% in the Textures tab. (Thanks Jacek Antonelli!)
249
250 * Social: "Offer Teleport" buttons throughough the UI are now
251 always clickable, even for avatars who are not on your friends
252 list or who appear offline. (Thanks Jacek Antonelli!)
253
254 * Misc.: Changed the application name, logo, login page, etc. to
255 Imprudence.
256
257 * Misc.: Imprudence has its own version numbers, starting at
258 1.0.0. Use "Help > About Imprudence" to check the SL source
259 version it's based on.
260
261 * Misc.: Disabled FMOD, KDU, and Vivox (SLVoice) proprietary
262 software.
263
264 * Misc.: Changed fonts to Liberation Sans and Bitstream Vera Mono.
265
266
267 KNOWN ISSUES
268
269 * Windows: At the end of the installer, if you leave the "Launch
270 Imprudence Viewer" checkbox enabled and press "Finish", you will
271 receive an error message and it will not automatically start the
272 viewer. But this does not harm anything, and starting the viewer
273 yourself (e.g. from the desktop shortcut) should work fine.
274
275 * Windows: When the viewer is started, a text console window will
276 appear displaying debug information, and then be covered by the
277 main viewer window. This will be disabled in future releases.
278 You can disable it manually by opening "Advanced > Debug
279 Settings" and changing "ShowConsoleWindow" to false, then
280 restarting the viewer.
281
282 * Windows: The viewer may crash when clicking links in embedded
283 web pages, including certain sections of the Search window and
284 the "Web" section of avatar profiles. We hope to fix this in the
285 future. To work around it for now, just avoid clicking on links
286 in embedded web pages in the viewer.
287
288 * All Platforms: The viewer may be (very) slow to start the first
289 time, as it clears the cache.
290
291 * All Platforms: When using the Silver skin, the Tools (aka Build)
292 floater doesn't have the new features (e.g. transparency up to
293 100%, smaller path cut increment), and improperly displays the
294 land tools brush size combo box on every build tab.
diff --git a/linden/LICENSE-libraries-linux.txt b/linden/LICENSE-libraries-linux.txt
new file mode 100644
index 0000000..b43c402
--- /dev/null
+++ b/linden/LICENSE-libraries-linux.txt
@@ -0,0 +1,811 @@
1===========
2APR License
3===========
4
5Copyright 2000-2004 The Apache Software Foundation
6
7Licensed under the Apache License, Version 2.0 (the "License");
8you may not use this file except in compliance with the License.
9You may obtain a copy of the License at
10
11 http://www.apache.org/licenses/LICENSE-2.0
12
13Unless required by applicable law or agreed to in writing, software
14distributed under the License is distributed on an "AS IS" BASIS,
15WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16See the License for the specific language governing permissions and
17limitations under the License.
18
19==============
20Base32 License
21==============
22
23 * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de>
24 * All rights reserved.
25 *
26 * Redistribution and use in source and binary forms, with or without
27 * modification, are permitted provided that the following conditions
28 * are met:
29 *
30 * 1. Redistributions of source code must retain the above copyright
31 * notice, this list of conditions and the following disclaimer.
32 * 2. Redistributions in binary form must reproduce the above copyright
33 * notice, this list of conditions and the following disclaimer in the
34 * documentation and/or other materials provided with the distribution.
35 * 3. Neither the name of the authors nor the names of its contributors
36 * may be used to endorse or promote products derived from this software
37 * without specific prior written permission.
38 *
39 * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
40 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
41 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
42 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
43 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
44 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
45 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
46 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
47 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
48 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
49 * SUCH DAMAGE.
50
51============
52cURL License
53============
54
55COPYRIGHT AND PERMISSION NOTICE
56
57Copyright (c) 1996 - 2002, Daniel Stenberg, <daniel@haxx.se>.
58
59All rights reserved.
60
61Permission to use, copy, modify, and distribute this software for any purpose
62with or without fee is hereby granted, provided that the above copyright
63notice and this permission notice appear in all copies.
64
65THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
66IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
67FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
68NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
69DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
70OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
71OR OTHER DEALINGS IN THE SOFTWARE.
72
73Except as contained in this notice, the name of a copyright holder shall not
74be used in advertising or otherwise to promote the sale, use or other dealings
75in this Software without prior written authorization of the copyright holder.
76
77
78=============
79expat License
80=============
81
82Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
83
84Permission is hereby granted, free of charge, to any person obtaining
85a copy of this software and associated documentation files (the
86"Software"), to deal in the Software without restriction, including
87without limitation the rights to use, copy, modify, merge, publish,
88distribute, sublicense, and/or sell copies of the Software, and to
89permit persons to whom the Software is furnished to do so, subject to
90the following conditions:
91
92The above copyright notice and this permission notice shall be included
93in all copies or substantial portions of the Software.
94
95THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
96EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
97MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
98IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
99CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
100TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
101SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
102
103================
104FreeType License
105================
106
107Portions of this software are copyright (c) 2003 The FreeType
108Project (www.freetype.org). All rights reserved.
109
110==========================
111FSI FontShop International
112==========================
113
114Certain of the fonts in the Meta family of copyrighted typefaces are
115used in Second Life under license from FSI FontShop
116International. Copies of such Meta fonts that are included in the
117Viewer are not themselves open source and are not available under the
118GPL license, and they may not be copied. Developers may use those
119fonts solely to the extent necessary to use or customize the Linden
120Software in Second Life and to develop and distribute content solely
121for use in the Second Life environment, and for no other purposes.
122Second Life developers who wish to make other uses of Meta fonts must
123obtain a license from FSI FontShop International at www.fontfont.com.
124
125==========
126GL License
127==========
128
129Mesa 3-D graphics library
130Version: 6.2
131
132Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
133
134Permission is hereby granted, free of charge, to any person obtaining a
135copy of this software and associated documentation files (the "Software"),
136to deal in the Software without restriction, including without limitation
137the rights to use, copy, modify, merge, publish, distribute, sublicense,
138and/or sell copies of the Software, and to permit persons to whom the
139Software is furnished to do so, subject to the following conditions:
140
141The above copyright notice and this permission notice shall be included
142in all copies or substantial portions of the Software.
143
144THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
145OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
146FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
147BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
148AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
149CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
150
151=========================
152glh OpenGL helper library
153=========================
154
155glh - is a platform-indepenedent C++ OpenGL helper library
156
157
158Copyright (c) 2000 Cass Everitt
159 Copyright (c) 2000 NVIDIA Corporation
160All rights reserved.
161
162Redistribution and use in source and binary forms, with or
163 without modification, are permitted provided that the following
164 conditions are met:
165
166 * Redistributions of source code must retain the above
167 copyright notice, this list of conditions and the following
168 disclaimer.
169
170 * Redistributions in binary form must reproduce the above
171 copyright notice, this list of conditions and the following
172 disclaimer in the documentation and/or other materials
173 provided with the distribution.
174
175 * The names of contributors to this software may not be used
176 to endorse or promote products derived from this software
177 without specific prior written permission.
178
179 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
180 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
181 FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
182 REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
183 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
184 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
185 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
186 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
187 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
188 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
189 POSSIBILITY OF SUCH DAMAGE.
190
191
192Cass Everitt - cass@r3.nu
193
194=======================
195JPEG Library 6b License
196=======================
197
198This software is based in part on the work of the Independent JPEG Group
199
200================
201JPEG2000 License
202================
203
204Copyright 2001, David Taubman, The University of New South Wales (UNSW)
205The copyright owner is Unisearch Ltd, Australia (commercial arm of UNSW)
206Neither this copyright statement, nor the licensing details below
207may be removed from this file or dissociated from its contents.
208
209Licensee: Linden Research, Inc.
210License number: 00024
211The licensee has been granted a COMMERCIAL license to the contents of
212this source file. A brief summary of this license appears below. This
213summary is not to be relied upon in preference to the full text of the
214license agreement, accepted at purchase of the license.
2151. The Licensee has the right to Commercial Use of the Kakadu software,
216 including distribution of one or more Applications built using the
217 software.
2182. The Licensee has the right to Internal Use of the Kakadu software,
219 including use by employees of the Licensee or an Affiliate for the
220 purpose of performing services on behalf of the Licensee or Affiliate,
221 or in the performance of services for Third Parties who engage Licensee
222 or an Affiliate for such services.
2233. The Licensee has the right to distribute Reusable Code (including
224 source code and dynamically or statically linked libraries) to a Third
225 Party, provided the Third Party possesses a license to use the Kakadu
226 software.
227
228==================
229ogg/vorbis License
230==================
231
232Copyright (c) 2001, Xiphophorus
233
234Redistribution and use in source and binary forms, with or without
235modification, are permitted provided that the following conditions
236are met:
237
238- Redistributions of source code must retain the above copyright
239notice, this list of conditions and the following disclaimer.
240
241- Redistributions in binary form must reproduce the above copyright
242notice, this list of conditions and the following disclaimer in the
243documentation and/or other materials provided with the distribution.
244
245- Neither the name of the Xiphophorus nor the names of its contributors
246may be used to endorse or promote products derived from this software
247without specific prior written permission.
248
249THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
250``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
251LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
252A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
253CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
254EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
255PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
256PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
257LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
258NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
259SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
260
261
262===========
263SDL License
264===========
265
266SDL - Simple DirectMedia Layer
267Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
268
269This library is free software; you can redistribute it and/or
270modify it under the terms of the GNU Library General Public
271License as published by the Free Software Foundation; either
272version 2 of the License, or (at your option) any later version.
273
274This library is distributed in the hope that it will be useful,
275but WITHOUT ANY WARRANTY; without even the implied warranty of
276MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
277Library General Public License for more details.
278
279You should have received a copy of the GNU Library General Public
280License along with this library; if not, write to the Free
281Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
282
283Sam Lantinga
284slouken@libsdl.org
285
286The GNU Library GPL is available at http://www.gnu.org/copyleft/lesser.html
287
288=============
289ELFIO License
290=============
291
292ELFIO.h - ELF reader and producer.
293Copyright (C) 2001 Serge Lamikhov-Center <to_serge@users.sourceforge.net>
294
295This library is free software; you can redistribute it and/or
296modify it under the terms of the GNU Lesser General Public
297License as published by the Free Software Foundation; either
298version 2.1 of the License, or (at your option) any later version.
299
300This library is distributed in the hope that it will be useful,
301but WITHOUT ANY WARRANTY; without even the implied warranty of
302MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
303Lesser General Public License for more details.
304
305You should have received a copy of the GNU Lesser General Public
306License along with this library; if not, write to the Free Software
307Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
308
309The GNU Library GPL is available at http://www.gnu.org/copyleft/lesser.html
310
311===============
312OpenSSL License
313===============
314
315Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
316
317Redistribution and use in source and binary forms, with or without
318modification, are permitted provided that the following conditions
319are met:
320
3211. Redistributions of source code must retain the above copyright
322 notice, this list of conditions and the following disclaimer.
323
3242. Redistributions in binary form must reproduce the above copyright
325 notice, this list of conditions and the following disclaimer in
326 the documentation and/or other materials provided with the
327 distribution.
328
3293. All advertising materials mentioning features or use of this
330 software must display the following acknowledgment:
331 "This product includes software developed by the OpenSSL Project
332 for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
333
3344. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
335 endorse or promote products derived from this software without
336 prior written permission. For written permission, please contact
337 openssl-core@openssl.org.
338
3395. Products derived from this software may not be called "OpenSSL"
340 nor may "OpenSSL" appear in their names without prior written
341 permission of the OpenSSL Project.
342
3436. Redistributions of any form whatsoever must retain the following
344 acknowledgment:
345 "This product includes software developed by the OpenSSL Project
346 for use in the OpenSSL Toolkit (http://www.openssl.org/)"
347
348THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
349EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
350IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
351PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
352ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
353SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
354NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
355LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
356HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
357STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
358ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
359OF THE POSSIBILITY OF SUCH DAMAGE.
360====================================================================
361
362This product includes cryptographic software written by Eric Young
363(eay@cryptsoft.com). This product includes software written by Tim
364Hudson (tjh@cryptsoft.com).
365
366
367
368=======================
369Original SSLeay License
370=======================
371
372Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
373All rights reserved.
374
375This package is an SSL implementation written
376by Eric Young (eay@cryptsoft.com).
377The implementation was written so as to conform with Netscapes SSL.
378
379This library is free for commercial and non-commercial use as long as
380the following conditions are aheared to. The following conditions
381apply to all code found in this distribution, be it the RC4, RSA,
382lhash, DES, etc., code; not just the SSL code. The SSL documentation
383included with this distribution is covered by the same copyright terms
384except that the holder is Tim Hudson (tjh@cryptsoft.com).
385
386Copyright remains Eric Young's, and as such any Copyright notices in
387the code are not to be removed.
388If this package is used in a product, Eric Young should be given attribution
389as the author of the parts of the library used.
390This can be in the form of a textual message at program startup or
391in documentation (online or textual) provided with the package.
392
393Redistribution and use in source and binary forms, with or without
394modification, are permitted provided that the following conditions
395are met:
3961. Redistributions of source code must retain the copyright
397 notice, this list of conditions and the following disclaimer.
3982. Redistributions in binary form must reproduce the above copyright
399 notice, this list of conditions and the following disclaimer in the
400 documentation and/or other materials provided with the distribution.
4013. All advertising materials mentioning features or use of this software
402 must display the following acknowledgement:
403 "This product includes cryptographic software written by
404 Eric Young (eay@cryptsoft.com)"
405 The word 'cryptographic' can be left out if the rouines from the library
406 being used are not cryptographic related :-).
4074. If you include any Windows specific code (or a derivative thereof) from
408 the apps directory (application code) you must include an acknowledgement:
409 "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
410
411THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
412ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
413IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
414ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
415FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
416DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
417OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
418HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
419LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
420OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
421SUCH DAMAGE.
422
423The licence and distribution terms for any publically available version or
424derivative of this code cannot be changed. i.e. this code cannot simply be
425copied and put under another distribution licence
426[including the GNU Public Licence.]
427
428
429==================
430xmlrpc-epi License
431==================
432
433Copyright 2000 Epinions, Inc.
434
435Subject to the following 3 conditions, Epinions, Inc. permits you, free of charge, to (a) use, copy, distribute, modify, perform and display this software and associated documentation files (the "Software"), and (b) permit others to whom the Software is furnished to do so as well.
436
4371) The above copyright notice and this permission notice shall be included without modification in all copies or substantial portions of the Software.
438
4392) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
440
4413) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH DAMAGES.
442
443
444===============
445libuuid License
446===============
447
448Copyright (C) 1999, 2000, 2003, 2004 by Theodore Ts'o
449
450Redistribution and use in source and binary forms, with or without
451modification, are permitted provided that the following conditions
452are met:
4531. Redistributions of source code must retain the above copyright
454 notice, and the entire permission notice in its entirety,
455 including the disclaimer of warranties.
4562. Redistributions in binary form must reproduce the above copyright
457 notice, this list of conditions and the following disclaimer in the
458 documentation and/or other materials provided with the distribution.
4593. The name of the author may not be used to endorse or promote
460 products derived from this software without specific prior
461 written permission.
462
463THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
464WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
465OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
466WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
467LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
468CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
469OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
470BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
471LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
472(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
473USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
474DAMAGE.
475
476
477============
478zlib License
479============
480
481'zlib' general purpose compression library version 1.1.4, March 11th, 2002
482
483Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
484
485This software is provided 'as-is', without any express or implied warranty.
486In no event will the authors be held liable for any damages arising from the
487use of this software.
488
489Permission is granted to anyone to use this software for any purpose,
490including commercial applications, and to alter it and redistribute it
491freely, subject to the following restrictions:
492
493The origin of this software must not be misrepresented; you must not claim
494that you wrote the original software. If you use this software in a product,
495an acknowledgment in the product documentation would be appreciated but is
496not required.
497
498Altered source versions must be plainly marked as such, and must not be
499misrepresented as being the original software.
500
501This notice may not be removed or altered from any source distribution.
502
503Jean-loup Gailly
504jloup@gzip.org
505
506Mark Adler
507madler@alumni.caltech.edu
508
509=================================
510tcmalloc/Google perftools license
511=================================
512
513Copyright (c) 2005, Google Inc.
514All rights reserved.
515
516Redistribution and use in source and binary forms, with or without
517modification, are permitted provided that the following conditions are
518met:
519
520 * Redistributions of source code must retain the above copyright
521notice, this list of conditions and the following disclaimer.
522 * Redistributions in binary form must reproduce the above
523copyright notice, this list of conditions and the following disclaimer
524in the documentation and/or other materials provided with the
525distribution.
526 * Neither the name of Google Inc. nor the names of its
527contributors may be used to endorse or promote products derived from
528this software without specific prior written permission.
529
530THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
531"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
532LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
533A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
534OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
535SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
536LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
537DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
538THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
539(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
540OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
541
542==============
543libpng license
544==============
545
546COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
547
548If you modify libpng you may insert additional notices immediately following
549this sentence.
550
551libpng versions 1.2.6, August 15, 2004, through 1.2.18, May 15, 2007, are
552Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
553distributed according to the same disclaimer and license as libpng-1.2.5
554with the following individual added to the list of Contributing Authors:
555
556 Cosmin Truta
557
558libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
559Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
560distributed according to the same disclaimer and license as libpng-1.0.6
561with the following individuals added to the list of Contributing Authors:
562
563 Simon-Pierre Cadieux
564 Eric S. Raymond
565 Gilles Vollant
566
567and with the following additions to the disclaimer:
568
569 There is no warranty against interference with your enjoyment of the
570 library or against infringement. There is no warranty that our
571 efforts or the library will fulfill any of your particular purposes
572 or needs. This library is provided with all faults, and the entire
573 risk of satisfactory quality, performance, accuracy, and effort is with
574 the user.
575
576libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
577Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
578distributed according to the same disclaimer and license as libpng-0.96,
579with the following individuals added to the list of Contributing Authors:
580
581 Tom Lane
582 Glenn Randers-Pehrson
583 Willem van Schaik
584
585libpng versions 0.89, June 1996, through 0.96, May 1997, are
586Copyright (c) 1996, 1997 Andreas Dilger
587Distributed according to the same disclaimer and license as libpng-0.88,
588with the following individuals added to the list of Contributing Authors:
589
590 John Bowler
591 Kevin Bracey
592 Sam Bushell
593 Magnus Holmgren
594 Greg Roelofs
595 Tom Tanner
596
597libpng versions 0.5, May 1995, through 0.88, January 1996, are
598Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
599
600For the purposes of this copyright and license, "Contributing Authors"
601is defined as the following set of individuals:
602
603 Andreas Dilger
604 Dave Martindale
605 Guy Eric Schalnat
606 Paul Schmidt
607 Tim Wegner
608
609The PNG Reference Library is supplied "AS IS". The Contributing Authors
610and Group 42, Inc. disclaim all warranties, expressed or implied,
611including, without limitation, the warranties of merchantability and of
612fitness for any purpose. The Contributing Authors and Group 42, Inc.
613assume no liability for direct, indirect, incidental, special, exemplary,
614or consequential damages, which may result from the use of the PNG
615Reference Library, even if advised of the possibility of such damage.
616
617Permission is hereby granted to use, copy, modify, and distribute this
618source code, or portions hereof, for any purpose, without fee, subject
619to the following restrictions:
620
6211. The origin of this source code must not be misrepresented.
622
6232. Altered versions must be plainly marked as such and
624must not be misrepresented as being the original source.
625
6263. This Copyright notice may not be removed or altered from
627 any source or altered source distribution.
628
629The Contributing Authors and Group 42, Inc. specifically permit, without
630fee, and encourage the use of this source code as a component to
631supporting the PNG file format in commercial products. If you use this
632source code in a product, acknowledgment is not required but would be
633appreciated.
634
635=================
636Vivox SDK License
637=================
638
639RSA Data Security, Inc. MD5 Message-Digest Algorithm
640
641Audio coding: Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C)
642
643Open Source Software Licensing
644Each open source software component utilized by this product is subject to its own copyright and licensing terms, as listed below.
645
646
647*************************************************************
648*************************************************************
649
650/**
651 * OpenAL cross platform audio library
652 * Copyright (C) 1999-2000 by authors.
653 * This library is free software; you can redistribute it and/or
654 * modify it under the terms of the GNU Library General Public
655 * License as published by the Free Software Foundation; either
656 * version 2 of the License, or (at your option) any later version.
657 *
658 * This library is distributed in the hope that it will be useful,
659 * but WITHOUT ANY WARRANTY; without even the implied warranty of
660 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
661 * Library General Public License for more details.
662 *
663 * You should have received a copy of the GNU Library General Public
664 * License along with this library; if not, write to the
665 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
666 * Boston, MA 02111-1307, USA.
667 * Or go to http://www.gnu.org/copyleft/lgpl.html
668 */
669
670*************************************************************
671*************************************************************
672RTP code under Lesser General Public License
673
674/*
675 The oRTP library is an RTP (Realtime Transport Protocol - rfc3550) stack.
676 Copyright (C) 2001 Simon MORLAT simon.morlat@linphone.org
677
678 This library is free software; you can redistribute it and/or
679 modify it under the terms of the GNU Lesser General Public
680 License as published by the Free Software Foundation; either
681 version 2.1 of the License, or (at your option) any later version.
682
683 This library is distributed in the hope that it will be useful,
684 but WITHOUT ANY WARRANTY; without even the implied warranty of
685 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
686 Lesser General Public License for more details.
687
688 You should have received a copy of the GNU Lesser General Public
689 License along with this library; if not, write to the Free Software
690 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
691*/
692
693************************************************************
694*************************************************************
695
696/*
697 * The Vovida Software License, Version 1.0
698 *
699 * Copyright (c) 2000 Vovida Networks, Inc. All rights reserved.
700 *
701 * Redistribution and use in source and binary forms, with or without
702 * modification, are permitted provided that the following conditions
703 * are met:
704 *
705 * 1. Redistributions of source code must retain the above copyright
706 * notice, this list of conditions and the following disclaimer.
707 *
708 * 2. Redistributions in binary form must reproduce the above copyright
709 * notice, this list of conditions and the following disclaimer in
710 * the documentation and/or other materials provided with the
711 * distribution.
712 *
713 * 3. The names "VOCAL", "Vovida Open Communication Application Library",
714 * and "Vovida Open Communication Application Library (VOCAL)" must
715 * not be used to endorse or promote products derived from this
716 * software without prior written permission. For written
717 * permission, please contact vocal@vovida.org.
718 *
719 * 4. Products derived from this software may not be called "VOCAL", nor
720 * may "VOCAL" appear in their name, without prior written
721 * permission of Vovida Networks, Inc.
722 *
723 * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
724 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
725 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
726 * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL VOVIDA
727 * NETWORKS, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT DAMAGES
728 * IN EXCESS OF $1,000, NOR FOR ANY INDIRECT, INCIDENTAL, SPECIAL,
729 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
730 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
731 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
732 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
733 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
734 * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
735 * DAMAGE.
736 *
737 *
738 * This software consists of voluntary contributions made by Vovida
739 * Networks, Inc. and many individuals on behalf of Vovida Networks,
740 * Inc. For more information on Vovida Networks, Inc., please see
741 *
742 *
743 */
744*************************************************************
745*************************************************************
746
747Internet Software Consortium code
748
749/* This is from the BIND 4.9.4 release, modified to compile by itself */
750/* Copyright (c) 1996 by Internet Software Consortium.
751 *
752 * Permission to use, copy, modify, and distribute this software for any
753 * purpose with or without fee is hereby granted, provided that the above
754 * copyright notice and this permission notice appear in all copies.
755 *
756 * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
757 * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
758 * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
759 * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
760 * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
761 * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
762 * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
763 * SOFTWARE.
764 */
765
766*************************************************************
767
768*************************************************************
769
770************************************************************
771
772http://tinyxpath.sourceforge.net/
773
774TinyXPath is covered by the zlib license :
775
776 www.sourceforge.net/projects/tinyxpath
777 Copyright (c) 2002-2006 Yves Berquin (yvesb@users.sourceforge.net)
778
779 This software is provided 'as-is', without any express or implied
780 warranty. In no event will the authors be held liable for any
781 damages arising from the use of this software.
782
783 Permission is granted to anyone to use this software for any
784 purpose, including commercial applications, and to alter it and
785 redistribute it freely, subject to the following restrictions:
786
787 1. The origin of this software must not be misrepresented; you must
788 not claim that you wrote the original software. If you use this
789 software in a product, an acknowledgment in the product documentation
790 would be appreciated but is not required.
791
792 2. Altered source versions must be plainly marked as such, and
793 must not be misrepresented as being the original software.
794
795 3. This notice may not be removed or altered from any source distribution.
796
797
798************************************************************
799************************************************************
800
801THE FREE SOFTWARE FOUNDATION
802
803Any customer may request the source code for all open source portions of this product which are covered by the Free Software Foundation's General Public License (GPL), for a period of three years from purchase. Please contact the vendor from whom you obtained this product for instructions. A fee equivalent to the cost of making the code available may be charged. Alternatively, customers may choose to download desired GPL components directly from their original vendors. Specifically, this product contains the following GPL-licensed components:
804
805
806From Vivox:
807 - Assorted software components. To request source, contact Vivox at:
808 Vivox, Inc.
809 Attn: customer support
810 40 Speen Street Suite 402
811 Framingham, MA 01701
diff --git a/linden/LICENSE-libraries-mac.txt b/linden/LICENSE-libraries-mac.txt
new file mode 100644
index 0000000..d488c74
--- /dev/null
+++ b/linden/LICENSE-libraries-mac.txt
@@ -0,0 +1,696 @@
1===========
2APR License
3===========
4
5Copyright 2000-2004 The Apache Software Foundation
6
7Licensed under the Apache License, Version 2.0 (the "License");
8you may not use this file except in compliance with the License.
9You may obtain a copy of the License at
10
11 http://www.apache.org/licenses/LICENSE-2.0
12
13Unless required by applicable law or agreed to in writing, software
14distributed under the License is distributed on an "AS IS" BASIS,
15WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16See the License for the specific language governing permissions and
17limitations under the License.
18
19==============
20Base32 License
21==============
22
23 * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de>
24 * All rights reserved.
25 *
26 * Redistribution and use in source and binary forms, with or without
27 * modification, are permitted provided that the following conditions
28 * are met:
29 *
30 * 1. Redistributions of source code must retain the above copyright
31 * notice, this list of conditions and the following disclaimer.
32 * 2. Redistributions in binary form must reproduce the above copyright
33 * notice, this list of conditions and the following disclaimer in the
34 * documentation and/or other materials provided with the distribution.
35 * 3. Neither the name of the authors nor the names of its contributors
36 * may be used to endorse or promote products derived from this software
37 * without specific prior written permission.
38 *
39 * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
40 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
41 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
42 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
43 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
44 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
45 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
46 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
47 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
48 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
49 * SUCH DAMAGE.
50
51============
52cURL License
53============
54
55COPYRIGHT AND PERMISSION NOTICE
56
57Copyright (c) 1996 - 2002, Daniel Stenberg, <daniel@haxx.se>.
58
59All rights reserved.
60
61Permission to use, copy, modify, and distribute this software for any purpose
62with or without fee is hereby granted, provided that the above copyright
63notice and this permission notice appear in all copies.
64
65THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
66IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
67FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
68NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
69DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
70OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
71OR OTHER DEALINGS IN THE SOFTWARE.
72
73Except as contained in this notice, the name of a copyright holder shall not
74be used in advertising or otherwise to promote the sale, use or other dealings
75in this Software without prior written authorization of the copyright holder.
76
77
78=============
79expat License
80=============
81
82Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
83
84Permission is hereby granted, free of charge, to any person obtaining
85a copy of this software and associated documentation files (the
86"Software"), to deal in the Software without restriction, including
87without limitation the rights to use, copy, modify, merge, publish,
88distribute, sublicense, and/or sell copies of the Software, and to
89permit persons to whom the Software is furnished to do so, subject to
90the following conditions:
91
92The above copyright notice and this permission notice shall be included
93in all copies or substantial portions of the Software.
94
95THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
96EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
97MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
98IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
99CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
100TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
101SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
102
103================
104FreeType License
105================
106
107Portions of this software are copyright (c) 2003 The FreeType
108Project (www.freetype.org). All rights reserved.
109
110==========================
111FSI FontShop International
112==========================
113
114Certain of the fonts in the Meta family of copyrighted typefaces are
115used in Second Life under license from FSI FontShop
116International. Copies of such Meta fonts that are included in the
117Viewer are not themselves open source and are not available under the
118GPL license, and they may not be copied. Developers may use those
119fonts solely to the extent necessary to use or customize the Linden
120Software in Second Life and to develop and distribute content solely
121for use in the Second Life environment, and for no other purposes.
122Second Life developers who wish to make other uses of Meta fonts must
123obtain a license from FSI FontShop International at www.fontfont.com.
124
125==========
126GL License
127==========
128
129Mesa 3-D graphics library
130Version: 6.2
131
132Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
133
134Permission is hereby granted, free of charge, to any person obtaining a
135copy of this software and associated documentation files (the "Software"),
136to deal in the Software without restriction, including without limitation
137the rights to use, copy, modify, merge, publish, distribute, sublicense,
138and/or sell copies of the Software, and to permit persons to whom the
139Software is furnished to do so, subject to the following conditions:
140
141The above copyright notice and this permission notice shall be included
142in all copies or substantial portions of the Software.
143
144THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
145OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
146FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
147BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
148AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
149CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
150
151=========================
152glh OpenGL helper library
153=========================
154
155glh - is a platform-indepenedent C++ OpenGL helper library
156
157
158Copyright (c) 2000 Cass Everitt
159 Copyright (c) 2000 NVIDIA Corporation
160All rights reserved.
161
162Redistribution and use in source and binary forms, with or
163 without modification, are permitted provided that the following
164 conditions are met:
165
166 * Redistributions of source code must retain the above
167 copyright notice, this list of conditions and the following
168 disclaimer.
169
170 * Redistributions in binary form must reproduce the above
171 copyright notice, this list of conditions and the following
172 disclaimer in the documentation and/or other materials
173 provided with the distribution.
174
175 * The names of contributors to this software may not be used
176 to endorse or promote products derived from this software
177 without specific prior written permission.
178
179 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
180 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
181 FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
182 REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
183 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
184 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
185 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
186 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
187 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
188 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
189 POSSIBILITY OF SUCH DAMAGE.
190
191
192Cass Everitt - cass@r3.nu
193
194=======================
195JPEG Library 6b License
196=======================
197
198This software is based in part on the work of the Independent JPEG Group
199
200================
201JPEG2000 License
202================
203
204Copyright 2001, David Taubman, The University of New South Wales (UNSW)
205The copyright owner is Unisearch Ltd, Australia (commercial arm of UNSW)
206Neither this copyright statement, nor the licensing details below
207may be removed from this file or dissociated from its contents.
208
209Licensee: Linden Research, Inc.
210License number: 00024
211The licensee has been granted a COMMERCIAL license to the contents of
212this source file. A brief summary of this license appears below. This
213summary is not to be relied upon in preference to the full text of the
214license agreement, accepted at purchase of the license.
2151. The Licensee has the right to Commercial Use of the Kakadu software,
216 including distribution of one or more Applications built using the
217 software.
2182. The Licensee has the right to Internal Use of the Kakadu software,
219 including use by employees of the Licensee or an Affiliate for the
220 purpose of performing services on behalf of the Licensee or Affiliate,
221 or in the performance of services for Third Parties who engage Licensee
222 or an Affiliate for such services.
2233. The Licensee has the right to distribute Reusable Code (including
224 source code and dynamically or statically linked libraries) to a Third
225 Party, provided the Third Party possesses a license to use the Kakadu
226 software.
227
228==================
229ogg/vorbis License
230==================
231
232Copyright (c) 2001, Xiphophorus
233
234Redistribution and use in source and binary forms, with or without
235modification, are permitted provided that the following conditions
236are met:
237
238- Redistributions of source code must retain the above copyright
239notice, this list of conditions and the following disclaimer.
240
241- Redistributions in binary form must reproduce the above copyright
242notice, this list of conditions and the following disclaimer in the
243documentation and/or other materials provided with the distribution.
244
245- Neither the name of the Xiphophorus nor the names of its contributors
246may be used to endorse or promote products derived from this software
247without specific prior written permission.
248
249THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
250``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
251LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
252A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
253CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
254EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
255PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
256PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
257LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
258NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
259SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
260
261
262===============
263OpenSSL License
264===============
265
266Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
267
268Redistribution and use in source and binary forms, with or without
269modification, are permitted provided that the following conditions
270are met:
271
2721. Redistributions of source code must retain the above copyright
273 notice, this list of conditions and the following disclaimer.
274
2752. Redistributions in binary form must reproduce the above copyright
276 notice, this list of conditions and the following disclaimer in
277 the documentation and/or other materials provided with the
278 distribution.
279
2803. All advertising materials mentioning features or use of this
281 software must display the following acknowledgment:
282 "This product includes software developed by the OpenSSL Project
283 for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
284
2854. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
286 endorse or promote products derived from this software without
287 prior written permission. For written permission, please contact
288 openssl-core@openssl.org.
289
2905. Products derived from this software may not be called "OpenSSL"
291 nor may "OpenSSL" appear in their names without prior written
292 permission of the OpenSSL Project.
293
2946. Redistributions of any form whatsoever must retain the following
295 acknowledgment:
296 "This product includes software developed by the OpenSSL Project
297 for use in the OpenSSL Toolkit (http://www.openssl.org/)"
298
299THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
300EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
301IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
302PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
303ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
304SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
305NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
306LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
307HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
308STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
309ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
310OF THE POSSIBILITY OF SUCH DAMAGE.
311====================================================================
312
313This product includes cryptographic software written by Eric Young
314(eay@cryptsoft.com). This product includes software written by Tim
315Hudson (tjh@cryptsoft.com).
316
317
318
319=======================
320Original SSLeay License
321=======================
322
323Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
324All rights reserved.
325
326This package is an SSL implementation written
327by Eric Young (eay@cryptsoft.com).
328The implementation was written so as to conform with Netscapes SSL.
329
330This library is free for commercial and non-commercial use as long as
331the following conditions are aheared to. The following conditions
332apply to all code found in this distribution, be it the RC4, RSA,
333lhash, DES, etc., code; not just the SSL code. The SSL documentation
334included with this distribution is covered by the same copyright terms
335except that the holder is Tim Hudson (tjh@cryptsoft.com).
336
337Copyright remains Eric Young's, and as such any Copyright notices in
338the code are not to be removed.
339If this package is used in a product, Eric Young should be given attribution
340as the author of the parts of the library used.
341This can be in the form of a textual message at program startup or
342in documentation (online or textual) provided with the package.
343
344Redistribution and use in source and binary forms, with or without
345modification, are permitted provided that the following conditions
346are met:
3471. Redistributions of source code must retain the copyright
348 notice, this list of conditions and the following disclaimer.
3492. Redistributions in binary form must reproduce the above copyright
350 notice, this list of conditions and the following disclaimer in the
351 documentation and/or other materials provided with the distribution.
3523. All advertising materials mentioning features or use of this software
353 must display the following acknowledgement:
354 "This product includes cryptographic software written by
355 Eric Young (eay@cryptsoft.com)"
356 The word 'cryptographic' can be left out if the rouines from the library
357 being used are not cryptographic related :-).
3584. If you include any Windows specific code (or a derivative thereof) from
359 the apps directory (application code) you must include an acknowledgement:
360 "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
361
362THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
363ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
364IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
365ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
366FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
367DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
368OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
369HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
370LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
371OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
372SUCH DAMAGE.
373
374The licence and distribution terms for any publically available version or
375derivative of this code cannot be changed. i.e. this code cannot simply be
376copied and put under another distribution licence
377[including the GNU Public Licence.]
378
379
380==================
381xmlrpc-epi License
382==================
383
384Copyright 2000 Epinions, Inc.
385
386Subject to the following 3 conditions, Epinions, Inc. permits you, free of charge, to (a) use, copy, distribute, modify, perform and display this software and associated documentation files (the "Software"), and (b) permit others to whom the Software is furnished to do so as well.
387
3881) The above copyright notice and this permission notice shall be included without modification in all copies or substantial portions of the Software.
389
3902) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
391
3923) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH DAMAGES.
393
394
395============
396zlib License
397============
398
399'zlib' general purpose compression library version 1.1.4, March 11th, 2002
400
401Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
402
403This software is provided 'as-is', without any express or implied warranty.
404In no event will the authors be held liable for any damages arising from the
405use of this software.
406
407Permission is granted to anyone to use this software for any purpose,
408including commercial applications, and to alter it and redistribute it
409freely, subject to the following restrictions:
410
411The origin of this software must not be misrepresented; you must not claim
412that you wrote the original software. If you use this software in a product,
413an acknowledgment in the product documentation would be appreciated but is
414not required.
415
416Altered source versions must be plainly marked as such, and must not be
417misrepresented as being the original software.
418
419This notice may not be removed or altered from any source distribution.
420
421Jean-loup Gailly
422jloup@gzip.org
423
424Mark Adler
425madler@alumni.caltech.edu
426
427==============
428libpng license
429==============
430
431COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
432
433If you modify libpng you may insert additional notices immediately following
434this sentence.
435
436libpng versions 1.2.6, August 15, 2004, through 1.2.18, May 15, 2007, are
437Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
438distributed according to the same disclaimer and license as libpng-1.2.5
439with the following individual added to the list of Contributing Authors:
440
441 Cosmin Truta
442
443libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
444Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
445distributed according to the same disclaimer and license as libpng-1.0.6
446with the following individuals added to the list of Contributing Authors:
447
448 Simon-Pierre Cadieux
449 Eric S. Raymond
450 Gilles Vollant
451
452and with the following additions to the disclaimer:
453
454 There is no warranty against interference with your enjoyment of the
455 library or against infringement. There is no warranty that our
456 efforts or the library will fulfill any of your particular purposes
457 or needs. This library is provided with all faults, and the entire
458 risk of satisfactory quality, performance, accuracy, and effort is with
459 the user.
460
461libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
462Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
463distributed according to the same disclaimer and license as libpng-0.96,
464with the following individuals added to the list of Contributing Authors:
465
466 Tom Lane
467 Glenn Randers-Pehrson
468 Willem van Schaik
469
470libpng versions 0.89, June 1996, through 0.96, May 1997, are
471Copyright (c) 1996, 1997 Andreas Dilger
472Distributed according to the same disclaimer and license as libpng-0.88,
473with the following individuals added to the list of Contributing Authors:
474
475 John Bowler
476 Kevin Bracey
477 Sam Bushell
478 Magnus Holmgren
479 Greg Roelofs
480 Tom Tanner
481
482libpng versions 0.5, May 1995, through 0.88, January 1996, are
483Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
484
485For the purposes of this copyright and license, "Contributing Authors"
486is defined as the following set of individuals:
487
488 Andreas Dilger
489 Dave Martindale
490 Guy Eric Schalnat
491 Paul Schmidt
492 Tim Wegner
493
494The PNG Reference Library is supplied "AS IS". The Contributing Authors
495and Group 42, Inc. disclaim all warranties, expressed or implied,
496including, without limitation, the warranties of merchantability and of
497fitness for any purpose. The Contributing Authors and Group 42, Inc.
498assume no liability for direct, indirect, incidental, special, exemplary,
499or consequential damages, which may result from the use of the PNG
500Reference Library, even if advised of the possibility of such damage.
501
502Permission is hereby granted to use, copy, modify, and distribute this
503source code, or portions hereof, for any purpose, without fee, subject
504to the following restrictions:
505
5061. The origin of this source code must not be misrepresented.
507
5082. Altered versions must be plainly marked as such and
509must not be misrepresented as being the original source.
510
5113. This Copyright notice may not be removed or altered from
512 any source or altered source distribution.
513
514The Contributing Authors and Group 42, Inc. specifically permit, without
515fee, and encourage the use of this source code as a component to
516supporting the PNG file format in commercial products. If you use this
517source code in a product, acknowledgment is not required but would be
518appreciated.
519
520=================
521Vivox SDK License
522=================
523
524RSA Data Security, Inc. MD5 Message-Digest Algorithm
525
526Audio coding: Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C)
527
528Open Source Software Licensing
529Each open source software component utilized by this product is subject to its own copyright and licensing terms, as listed below.
530
531
532*************************************************************
533*************************************************************
534
535/**
536 * OpenAL cross platform audio library
537 * Copyright (C) 1999-2000 by authors.
538 * This library is free software; you can redistribute it and/or
539 * modify it under the terms of the GNU Library General Public
540 * License as published by the Free Software Foundation; either
541 * version 2 of the License, or (at your option) any later version.
542 *
543 * This library is distributed in the hope that it will be useful,
544 * but WITHOUT ANY WARRANTY; without even the implied warranty of
545 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
546 * Library General Public License for more details.
547 *
548 * You should have received a copy of the GNU Library General Public
549 * License along with this library; if not, write to the
550 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
551 * Boston, MA 02111-1307, USA.
552 * Or go to http://www.gnu.org/copyleft/lgpl.html
553 */
554
555*************************************************************
556*************************************************************
557RTP code under Lesser General Public License
558
559/*
560 The oRTP library is an RTP (Realtime Transport Protocol - rfc3550) stack.
561 Copyright (C) 2001 Simon MORLAT simon.morlat@linphone.org
562
563 This library is free software; you can redistribute it and/or
564 modify it under the terms of the GNU Lesser General Public
565 License as published by the Free Software Foundation; either
566 version 2.1 of the License, or (at your option) any later version.
567
568 This library is distributed in the hope that it will be useful,
569 but WITHOUT ANY WARRANTY; without even the implied warranty of
570 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
571 Lesser General Public License for more details.
572
573 You should have received a copy of the GNU Lesser General Public
574 License along with this library; if not, write to the Free Software
575 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
576*/
577
578************************************************************
579*************************************************************
580
581/*
582 * The Vovida Software License, Version 1.0
583 *
584 * Copyright (c) 2000 Vovida Networks, Inc. All rights reserved.
585 *
586 * Redistribution and use in source and binary forms, with or without
587 * modification, are permitted provided that the following conditions
588 * are met:
589 *
590 * 1. Redistributions of source code must retain the above copyright
591 * notice, this list of conditions and the following disclaimer.
592 *
593 * 2. Redistributions in binary form must reproduce the above copyright
594 * notice, this list of conditions and the following disclaimer in
595 * the documentation and/or other materials provided with the
596 * distribution.
597 *
598 * 3. The names "VOCAL", "Vovida Open Communication Application Library",
599 * and "Vovida Open Communication Application Library (VOCAL)" must
600 * not be used to endorse or promote products derived from this
601 * software without prior written permission. For written
602 * permission, please contact vocal@vovida.org.
603 *
604 * 4. Products derived from this software may not be called "VOCAL", nor
605 * may "VOCAL" appear in their name, without prior written
606 * permission of Vovida Networks, Inc.
607 *
608 * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
609 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
610 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
611 * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL VOVIDA
612 * NETWORKS, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT DAMAGES
613 * IN EXCESS OF $1,000, NOR FOR ANY INDIRECT, INCIDENTAL, SPECIAL,
614 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
615 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
616 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
617 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
618 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
619 * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
620 * DAMAGE.
621 *
622 *
623 * This software consists of voluntary contributions made by Vovida
624 * Networks, Inc. and many individuals on behalf of Vovida Networks,
625 * Inc. For more information on Vovida Networks, Inc., please see
626 *
627 *
628 */
629*************************************************************
630*************************************************************
631
632Internet Software Consortium code
633
634/* This is from the BIND 4.9.4 release, modified to compile by itself */
635/* Copyright (c) 1996 by Internet Software Consortium.
636 *
637 * Permission to use, copy, modify, and distribute this software for any
638 * purpose with or without fee is hereby granted, provided that the above
639 * copyright notice and this permission notice appear in all copies.
640 *
641 * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
642 * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
643 * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
644 * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
645 * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
646 * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
647 * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
648 * SOFTWARE.
649 */
650
651*************************************************************
652
653*************************************************************
654
655************************************************************
656
657http://tinyxpath.sourceforge.net/
658
659TinyXPath is covered by the zlib license :
660
661 www.sourceforge.net/projects/tinyxpath
662 Copyright (c) 2002-2006 Yves Berquin (yvesb@users.sourceforge.net)
663
664 This software is provided 'as-is', without any express or implied
665 warranty. In no event will the authors be held liable for any
666 damages arising from the use of this software.
667
668 Permission is granted to anyone to use this software for any
669 purpose, including commercial applications, and to alter it and
670 redistribute it freely, subject to the following restrictions:
671
672 1. The origin of this software must not be misrepresented; you must
673 not claim that you wrote the original software. If you use this
674 software in a product, an acknowledgment in the product documentation
675 would be appreciated but is not required.
676
677 2. Altered source versions must be plainly marked as such, and
678 must not be misrepresented as being the original software.
679
680 3. This notice may not be removed or altered from any source distribution.
681
682
683************************************************************
684************************************************************
685
686THE FREE SOFTWARE FOUNDATION
687
688Any customer may request the source code for all open source portions of this product which are covered by the Free Software Foundation's General Public License (GPL), for a period of three years from purchase. Please contact the vendor from whom you obtained this product for instructions. A fee equivalent to the cost of making the code available may be charged. Alternatively, customers may choose to download desired GPL components directly from their original vendors. Specifically, this product contains the following GPL-licensed components:
689
690
691From Vivox:
692 - Assorted software components. To request source, contact Vivox at:
693 Vivox, Inc.
694 Attn: customer support
695 40 Speen Street Suite 402
696 Framingham, MA 01701
diff --git a/linden/LICENSE-libraries-win32.txt b/linden/LICENSE-libraries-win32.txt
new file mode 100644
index 0000000..eb441e0
--- /dev/null
+++ b/linden/LICENSE-libraries-win32.txt
@@ -0,0 +1,737 @@
1===========
2Logitech License
3===========
4
5End-User License Agreement for Logitech LCD SDK
6
7This End-User License Agreement for Logitech LCD SDK ( “Agreement”) is a legal agreement between you, either an individual or legal entity (“You” or “you”) and Logitech Inc. (“Logitech”) for use of the Logitech LCD software development kit, which includes computer software and related media and documentation (hereinafter “LCD SDK”). By using this LCD SDK, you are agreeing to be bound by the terms and conditions of this Agreement. If you do not agree to the terms and conditions of this Agreement, promptly return the LCD SDK and other items that are part of this product in their original package with your sales receipt to your point of purchase for a full refund, or if you have downloaded this software from a Logitech web site, then you must stop using the software and destroy any copies of the software in your possession or control.
8
91 Grant of License and Restrictions.
10This Agreement grants You the following rights provided that You comply with all terms and conditions of this Agreement.
11(a) Logitech grants You a limited, non-exclusive, nontransferable license to install and use an unlimited number of copies of the LCD SDK on computers . All other rights are reserved to Logitech.
12(b) You shall not reverse engineer, decompile or disassemble any portion of the LCD SDK, except and only to the extent that this limitation is expressly prohibited by applicable law.
13(c) At your option, you may provide reasonable feedback to Logitech, including but not limited to usability, bug reports and test results, with respect to the LCD SDK. All bug reports, test results and other feedback provided to Logitech by You shall be the property of Logitech and may be used by Logitech for any purpose.
14(d) In the event Logitech, in its sole discretion, elects to provide copies of the LCD SDK to more than one individual employed by You (if You are not a single individual), each such individual shall be entitled to exercise the rights granted in this Agreement and shall be bound by the terms and conditions herein.
15
162 Updates.
17Logitech is not obligated to provide technical support or updates to You for the LCD SDK provided to You pursuant to this Agreement. However, Logitech may, in its sole discretion, provide further pre-release versions, technical support, updates and/or supplements (“Updates”) to You, in which case such Updates shall be deemed to be included in the “LCD SDK” and shall be governed by this Agreement, unless other terms of use are provided in writing by Logitech with such Updates.
18
193 Intellectual Property Rights.
20The LCD SDK is licensed, not sold, to You for use only under the terms and conditions of this Agreement. Logitech and its suppliers retain title to the LCD SDK and all intellectual property rights therein. The LCD SDK is protected by intellectual property laws and international treaties, including U.S. copyright law and international copyright treaties. All rights not expressly granted by Logitech are reserved.
21
224 Disclaimer of Warranty.
23TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, LOGITECH AND ITS SUPPLIERS PROVIDE THE LCD SDK AND OTHER LOGITECH PRODUCTS AND SERVICES (IF ANY) AS IS AND WITHOUT WARRANTY OF ANY KIND. LOGITECH AND ITS SUPPLIERS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD-PARTY RIGHTS WITH RESPECT TO THE LCD SDK AND ANY WARRANTIES OF NON-INTERFERENCE OR ACCURACY OF INFORMATIONAL CONTENT. NO LOGITECH DEALER, AGENT, OR EMPLOYEE IS AUTHORIZED TO MAKE ANY MODIFICATION, EXTENSION, OR ADDITION TO THIS WARRANTY. Some jurisdictions do not allow limitations on how long an implied warranty lasts, so the above limitation may not apply to you.
24
255 Limitation of Liability.
26IN NO EVENT WILL LOGITECH OR ITS SUPPLIERS BE LIABLE FOR ANY COSTS OF PROCUREMENT OF SUBSTITUTE PRODUCTS OR SERVICES, LOST PROFITS, LOSS OF INFORMATION OR DATA, OR ANY OTHER SPECIAL, INDIRECT, CONSEQUENTIAL, OR INCIDENTAL DAMAGES ARISING IN ANY WAY OUT OF THE SALE OF, USE OF, OR INABILITY TO USE THE LCD SDK OR ANY LOGITECH PRODUCT OR SERVICE, EVEN IF LOGITECH HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN NO CASE SHALL LOGITECH'S AND ITS SUPPLIERS’ TOTAL LIABILITY EXCEED THE ACTUAL MONEY PAID FOR THE LOGITECH PRODUCT OR SERVICE GIVING RISE TO THE LIABILITY. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so the above limitation or exclusion may not apply to you. The above limitations will not apply in case of personal injury where and to the extent that applicable law requires such liability.
27
286 U.S. Government Rights.
29Use, duplication, or disclosure of the software contained in the LCD SDK by the U.S. Government is subject to restrictions set forth in this Agreement and as provided in DFARS 227.7202-1(a) and 227.7202-3(a) (1995), DFARS 252.227-7013(c)(1)(ii) (OCT 1988) FAR 12.212(a) (1995), FAR 52.227-19, or FAR 52.227-14 (ALT III), as applicable. Logitech Inc. 6505 Kaiser Drive, Fremont, CA 94555.
30
317 Export Law Assurances.
32You agree and certify that neither the LCD SDK nor any other technical data received from Logitech will be exported outside the United States except as authorized and as permitted by the laws and regulations of the United States. If you have rightfully obtained the LCD SDK outside of the United States, you agree that you will not re-export the LCD SDK nor any other technical data received from Logitech, except as permitted by the laws and regulations of the United States and the laws and regulations of the jurisdiction in which you obtained the LCD SDK.
33
348 Termination:
35This Agreement is effective until terminated. Upon any violation of any of the provisions of this Agreement, rights to use the LCD SDK shall automatically terminate and the LCD SDK must be returned to Logitech or all copies of the LCD SDK destroyed. You may also terminate this Agreement at any time by destroying all copies of the LCD SDK in your possession or control. If Logitech makes a request via public announcement or press release to stop using the copies of the LCD SDK, you will comply immediately with this request. The provisions of paragraphs 3, 7, 8 and 12 will survive any termination of this Agreement.
36
379 General Terms and Conditions.
38If You are an individual signing this Agreement on behalf of a company, then You represent that You have authority to execute this Agreement on behalf of such company. This Agreement will be governed by and construed in accordance with the laws of the United States and the State of California, without regard to or application of its choice of law rules or principles. If for any reason a court of competent jurisdiction finds any provision of this Agreement, or portion thereof, to be unenforceable, that provision of the Agreement shall be enforced to the maximum extent permissible so as to affect the intent of the parties, and the remainder of this Agreement shall continue in full force and effect. This Agreement constitutes the entire agreement between You and Logitech respect to the use of the LCD SDK and supersedes all prior or contemporaneous understandings, communications or agreements, written or oral, regarding such subject matter.
39
40===========
41APR License
42===========
43
44Copyright 2000-2004 The Apache Software Foundation
45
46Licensed under the Apache License, Version 2.0 (the "License");
47you may not use this file except in compliance with the License.
48You may obtain a copy of the License at
49
50 http://www.apache.org/licenses/LICENSE-2.0
51
52Unless required by applicable law or agreed to in writing, software
53distributed under the License is distributed on an "AS IS" BASIS,
54WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
55See the License for the specific language governing permissions and
56limitations under the License.
57
58==============
59Base32 License
60==============
61
62 * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de>
63 * All rights reserved.
64 *
65 * Redistribution and use in source and binary forms, with or without
66 * modification, are permitted provided that the following conditions
67 * are met:
68 *
69 * 1. Redistributions of source code must retain the above copyright
70 * notice, this list of conditions and the following disclaimer.
71 * 2. Redistributions in binary form must reproduce the above copyright
72 * notice, this list of conditions and the following disclaimer in the
73 * documentation and/or other materials provided with the distribution.
74 * 3. Neither the name of the authors nor the names of its contributors
75 * may be used to endorse or promote products derived from this software
76 * without specific prior written permission.
77 *
78 * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
79 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
80 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
81 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
82 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
83 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
84 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
85 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
86 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
87 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
88 * SUCH DAMAGE.
89
90============
91cURL License
92============
93
94COPYRIGHT AND PERMISSION NOTICE
95
96Copyright (c) 1996 - 2002, Daniel Stenberg, <daniel@haxx.se>.
97
98All rights reserved.
99
100Permission to use, copy, modify, and distribute this software for any purpose
101with or without fee is hereby granted, provided that the above copyright
102notice and this permission notice appear in all copies.
103
104THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
105IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
106FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
107NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
108DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
109OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
110OR OTHER DEALINGS IN THE SOFTWARE.
111
112Except as contained in this notice, the name of a copyright holder shall not
113be used in advertising or otherwise to promote the sale, use or other dealings
114in this Software without prior written authorization of the copyright holder.
115
116
117=============
118expat License
119=============
120
121Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
122
123Permission is hereby granted, free of charge, to any person obtaining
124a copy of this software and associated documentation files (the
125"Software"), to deal in the Software without restriction, including
126without limitation the rights to use, copy, modify, merge, publish,
127distribute, sublicense, and/or sell copies of the Software, and to
128permit persons to whom the Software is furnished to do so, subject to
129the following conditions:
130
131The above copyright notice and this permission notice shall be included
132in all copies or substantial portions of the Software.
133
134THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
135EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
136MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
137IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
138CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
139TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
140SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
141
142================
143FreeType License
144================
145
146Portions of this software are copyright (c) 2003 The FreeType
147Project (www.freetype.org). All rights reserved.
148
149==========================
150FSI FontShop International
151==========================
152
153Certain of the fonts in the Meta family of copyrighted typefaces are
154used in Second Life under license from FSI FontShop
155International. Copies of such Meta fonts that are included in the
156Viewer are not themselves open source and are not available under the
157GPL license, and they may not be copied. Developers may use those
158fonts solely to the extent necessary to use or customize the Linden
159Software in Second Life and to develop and distribute content solely
160for use in the Second Life environment, and for no other purposes.
161Second Life developers who wish to make other uses of Meta fonts must
162obtain a license from FSI FontShop International at www.fontfont.com.
163
164==========
165GL License
166==========
167
168Mesa 3-D graphics library
169Version: 6.2
170
171Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
172
173Permission is hereby granted, free of charge, to any person obtaining a
174copy of this software and associated documentation files (the "Software"),
175to deal in the Software without restriction, including without limitation
176the rights to use, copy, modify, merge, publish, distribute, sublicense,
177and/or sell copies of the Software, and to permit persons to whom the
178Software is furnished to do so, subject to the following conditions:
179
180The above copyright notice and this permission notice shall be included
181in all copies or substantial portions of the Software.
182
183THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
184OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
185FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
186BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
187AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
188CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
189
190
191=========================
192glh OpenGL helper library
193=========================
194
195glh - is a platform-indepenedent C++ OpenGL helper library
196
197
198Copyright (c) 2000 Cass Everitt
199 Copyright (c) 2000 NVIDIA Corporation
200All rights reserved.
201
202Redistribution and use in source and binary forms, with or
203 without modification, are permitted provided that the following
204 conditions are met:
205
206 * Redistributions of source code must retain the above
207 copyright notice, this list of conditions and the following
208 disclaimer.
209
210 * Redistributions in binary form must reproduce the above
211 copyright notice, this list of conditions and the following
212 disclaimer in the documentation and/or other materials
213 provided with the distribution.
214
215 * The names of contributors to this software may not be used
216 to endorse or promote products derived from this software
217 without specific prior written permission.
218
219 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
220 `AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
221 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
222 FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
223 REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
224 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
225 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
226 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
227 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
228 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
229 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
230 POSSIBILITY OF SUCH DAMAGE.
231
232
233Cass Everitt - cass@r3.nu
234
235=======================
236JPEG Library 6b License
237=======================
238
239This software is based in part on the work of the Independent JPEG Group
240
241================
242JPEG2000 License
243================
244
245Copyright 2001, David Taubman, The University of New South Wales (UNSW)
246The copyright owner is Unisearch Ltd, Australia (commercial arm of UNSW)
247Neither this copyright statement, nor the licensing details below
248may be removed from this file or dissociated from its contents.
249
250Licensee: Linden Research, Inc.
251License number: 00024
252The licensee has been granted a COMMERCIAL license to the contents of
253this source file. A brief summary of this license appears below. This
254summary is not to be relied upon in preference to the full text of the
255license agreement, accepted at purchase of the license.
2561. The Licensee has the right to Commercial Use of the Kakadu software,
257 including distribution of one or more Applications built using the
258 software.
2592. The Licensee has the right to Internal Use of the Kakadu software,
260 including use by employees of the Licensee or an Affiliate for the
261 purpose of performing services on behalf of the Licensee or Affiliate,
262 or in the performance of services for Third Parties who engage Licensee
263 or an Affiliate for such services.
2643. The Licensee has the right to distribute Reusable Code (including
265 source code and dynamically or statically linked libraries) to a Third
266 Party, provided the Third Party possesses a license to use the Kakadu
267 software.
268
269==================
270ogg/vorbis License
271==================
272
273Copyright (c) 2001, Xiphophorus
274
275Redistribution and use in source and binary forms, with or without
276modification, are permitted provided that the following conditions
277are met:
278
279- Redistributions of source code must retain the above copyright
280notice, this list of conditions and the following disclaimer.
281
282- Redistributions in binary form must reproduce the above copyright
283notice, this list of conditions and the following disclaimer in the
284documentation and/or other materials provided with the distribution.
285
286- Neither the name of the Xiphophorus nor the names of its contributors
287may be used to endorse or promote products derived from this software
288without specific prior written permission.
289
290THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
291``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
292LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
293A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
294CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
295EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
296PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
297PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
298LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
299NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
300SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
301
302
303===============
304OpenSSL License
305===============
306
307Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
308
309Redistribution and use in source and binary forms, with or without
310modification, are permitted provided that the following conditions
311are met:
312
3131. Redistributions of source code must retain the above copyright
314 notice, this list of conditions and the following disclaimer.
315
3162. Redistributions in binary form must reproduce the above copyright
317 notice, this list of conditions and the following disclaimer in
318 the documentation and/or other materials provided with the
319 distribution.
320
3213. All advertising materials mentioning features or use of this
322 software must display the following acknowledgment:
323 "This product includes software developed by the OpenSSL Project
324 for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
325
3264. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
327 endorse or promote products derived from this software without
328 prior written permission. For written permission, please contact
329 openssl-core@openssl.org.
330
3315. Products derived from this software may not be called "OpenSSL"
332 nor may "OpenSSL" appear in their names without prior written
333 permission of the OpenSSL Project.
334
3356. Redistributions of any form whatsoever must retain the following
336 acknowledgment:
337 "This product includes software developed by the OpenSSL Project
338 for use in the OpenSSL Toolkit (http://www.openssl.org/)"
339
340THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
341EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
342IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
343PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
344ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
345SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
346NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
347LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
348HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
349STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
350ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
351OF THE POSSIBILITY OF SUCH DAMAGE.
352====================================================================
353
354This product includes cryptographic software written by Eric Young
355(eay@cryptsoft.com). This product includes software written by Tim
356Hudson (tjh@cryptsoft.com).
357
358
359
360=======================
361Original SSLeay License
362=======================
363
364Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
365All rights reserved.
366
367This package is an SSL implementation written
368by Eric Young (eay@cryptsoft.com).
369The implementation was written so as to conform with Netscapes SSL.
370
371This library is free for commercial and non-commercial use as long as
372the following conditions are aheared to. The following conditions
373apply to all code found in this distribution, be it the RC4, RSA,
374lhash, DES, etc., code; not just the SSL code. The SSL documentation
375included with this distribution is covered by the same copyright terms
376except that the holder is Tim Hudson (tjh@cryptsoft.com).
377
378Copyright remains Eric Young's, and as such any Copyright notices in
379the code are not to be removed.
380If this package is used in a product, Eric Young should be given attribution
381as the author of the parts of the library used.
382This can be in the form of a textual message at program startup or
383in documentation (online or textual) provided with the package.
384
385Redistribution and use in source and binary forms, with or without
386modification, are permitted provided that the following conditions
387are met:
3881. Redistributions of source code must retain the copyright
389 notice, this list of conditions and the following disclaimer.
3902. Redistributions in binary form must reproduce the above copyright
391 notice, this list of conditions and the following disclaimer in the
392 documentation and/or other materials provided with the distribution.
3933. All advertising materials mentioning features or use of this software
394 must display the following acknowledgement:
395 "This product includes cryptographic software written by
396 Eric Young (eay@cryptsoft.com)"
397 The word 'cryptographic' can be left out if the rouines from the library
398 being used are not cryptographic related :-).
3994. If you include any Windows specific code (or a derivative thereof) from
400 the apps directory (application code) you must include an acknowledgement:
401 "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
402
403THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
404ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
405IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
406ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
407FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
408DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
409OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
410HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
411LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
412OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
413SUCH DAMAGE.
414
415The licence and distribution terms for any publically available version or
416derivative of this code cannot be changed. i.e. this code cannot simply be
417copied and put under another distribution licence
418[including the GNU Public Licence.]
419
420
421==================
422xmlrpc-epi License
423==================
424
425Copyright 2000 Epinions, Inc.
426
427Subject to the following 3 conditions, Epinions, Inc. permits you, free of charge, to (a) use, copy, distribute, modify, perform and display this software and associated documentation files (the "Software"), and (b) permit others to whom the Software is furnished to do so as well.
428
4291) The above copyright notice and this permission notice shall be included without modification in all copies or substantial portions of the Software.
430
4312) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
432
4333) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH DAMAGES.
434
435
436============
437zlib License
438============
439
440'zlib' general purpose compression library version 1.1.4, March 11th, 2002
441
442Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
443
444This software is provided 'as-is', without any express or implied warranty.
445In no event will the authors be held liable for any damages arising from the
446use of this software.
447
448Permission is granted to anyone to use this software for any purpose,
449including commercial applications, and to alter it and redistribute it
450freely, subject to the following restrictions:
451
452The origin of this software must not be misrepresented; you must not claim
453that you wrote the original software. If you use this software in a product,
454an acknowledgment in the product documentation would be appreciated but is
455not required.
456
457Altered source versions must be plainly marked as such, and must not be
458misrepresented as being the original software.
459
460This notice may not be removed or altered from any source distribution.
461
462Jean-loup Gailly
463jloup@gzip.org
464
465Mark Adler
466madler@alumni.caltech.edu
467
468==============
469libpng license
470==============
471
472COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
473
474If you modify libpng you may insert additional notices immediately following
475this sentence.
476
477libpng versions 1.2.6, August 15, 2004, through 1.2.18, May 15, 2007, are
478Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
479distributed according to the same disclaimer and license as libpng-1.2.5
480with the following individual added to the list of Contributing Authors:
481
482 Cosmin Truta
483
484libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
485Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
486distributed according to the same disclaimer and license as libpng-1.0.6
487with the following individuals added to the list of Contributing Authors:
488
489 Simon-Pierre Cadieux
490 Eric S. Raymond
491 Gilles Vollant
492
493and with the following additions to the disclaimer:
494
495 There is no warranty against interference with your enjoyment of the
496 library or against infringement. There is no warranty that our
497 efforts or the library will fulfill any of your particular purposes
498 or needs. This library is provided with all faults, and the entire
499 risk of satisfactory quality, performance, accuracy, and effort is with
500 the user.
501
502libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
503Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
504distributed according to the same disclaimer and license as libpng-0.96,
505with the following individuals added to the list of Contributing Authors:
506
507 Tom Lane
508 Glenn Randers-Pehrson
509 Willem van Schaik
510
511libpng versions 0.89, June 1996, through 0.96, May 1997, are
512Copyright (c) 1996, 1997 Andreas Dilger
513Distributed according to the same disclaimer and license as libpng-0.88,
514with the following individuals added to the list of Contributing Authors:
515
516 John Bowler
517 Kevin Bracey
518 Sam Bushell
519 Magnus Holmgren
520 Greg Roelofs
521 Tom Tanner
522
523libpng versions 0.5, May 1995, through 0.88, January 1996, are
524Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
525
526For the purposes of this copyright and license, "Contributing Authors"
527is defined as the following set of individuals:
528
529 Andreas Dilger
530 Dave Martindale
531 Guy Eric Schalnat
532 Paul Schmidt
533 Tim Wegner
534
535The PNG Reference Library is supplied "AS IS". The Contributing Authors
536and Group 42, Inc. disclaim all warranties, expressed or implied,
537including, without limitation, the warranties of merchantability and of
538fitness for any purpose. The Contributing Authors and Group 42, Inc.
539assume no liability for direct, indirect, incidental, special, exemplary,
540or consequential damages, which may result from the use of the PNG
541Reference Library, even if advised of the possibility of such damage.
542
543Permission is hereby granted to use, copy, modify, and distribute this
544source code, or portions hereof, for any purpose, without fee, subject
545to the following restrictions:
546
5471. The origin of this source code must not be misrepresented.
548
5492. Altered versions must be plainly marked as such and
550must not be misrepresented as being the original source.
551
5523. This Copyright notice may not be removed or altered from
553 any source or altered source distribution.
554
555The Contributing Authors and Group 42, Inc. specifically permit, without
556fee, and encourage the use of this source code as a component to
557supporting the PNG file format in commercial products. If you use this
558source code in a product, acknowledgment is not required but would be
559appreciated.
560
561=================
562Vivox SDK License
563=================
564
565RSA Data Security, Inc. MD5 Message-Digest Algorithm
566
567Audio coding: Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C)
568
569Open Source Software Licensing
570Each open source software component utilized by this product is subject to its own copyright and licensing terms, as listed below.
571
572
573*************************************************************
574*************************************************************
575
576/**
577 * OpenAL cross platform audio library
578 * Copyright (C) 1999-2000 by authors.
579 * This library is free software; you can redistribute it and/or
580 * modify it under the terms of the GNU Library General Public
581 * License as published by the Free Software Foundation; either
582 * version 2 of the License, or (at your option) any later version.
583 *
584 * This library is distributed in the hope that it will be useful,
585 * but WITHOUT ANY WARRANTY; without even the implied warranty of
586 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
587 * Library General Public License for more details.
588 *
589 * You should have received a copy of the GNU Library General Public
590 * License along with this library; if not, write to the
591 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
592 * Boston, MA 02111-1307, USA.
593 * Or go to http://www.gnu.org/copyleft/lgpl.html
594 */
595
596*************************************************************
597*************************************************************
598RTP code under Lesser General Public License
599
600/*
601 The oRTP library is an RTP (Realtime Transport Protocol - rfc3550) stack.
602 Copyright (C) 2001 Simon MORLAT simon.morlat@linphone.org
603
604 This library is free software; you can redistribute it and/or
605 modify it under the terms of the GNU Lesser General Public
606 License as published by the Free Software Foundation; either
607 version 2.1 of the License, or (at your option) any later version.
608
609 This library is distributed in the hope that it will be useful,
610 but WITHOUT ANY WARRANTY; without even the implied warranty of
611 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
612 Lesser General Public License for more details.
613
614 You should have received a copy of the GNU Lesser General Public
615 License along with this library; if not, write to the Free Software
616 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
617*/
618
619************************************************************
620*************************************************************
621
622/*
623 * The Vovida Software License, Version 1.0
624 *
625 * Copyright (c) 2000 Vovida Networks, Inc. All rights reserved.
626 *
627 * Redistribution and use in source and binary forms, with or without
628 * modification, are permitted provided that the following conditions
629 * are met:
630 *
631 * 1. Redistributions of source code must retain the above copyright
632 * notice, this list of conditions and the following disclaimer.
633 *
634 * 2. Redistributions in binary form must reproduce the above copyright
635 * notice, this list of conditions and the following disclaimer in
636 * the documentation and/or other materials provided with the
637 * distribution.
638 *
639 * 3. The names "VOCAL", "Vovida Open Communication Application Library",
640 * and "Vovida Open Communication Application Library (VOCAL)" must
641 * not be used to endorse or promote products derived from this
642 * software without prior written permission. For written
643 * permission, please contact vocal@vovida.org.
644 *
645 * 4. Products derived from this software may not be called "VOCAL", nor
646 * may "VOCAL" appear in their name, without prior written
647 * permission of Vovida Networks, Inc.
648 *
649 * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
650 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
651 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
652 * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL VOVIDA
653 * NETWORKS, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT DAMAGES
654 * IN EXCESS OF $1,000, NOR FOR ANY INDIRECT, INCIDENTAL, SPECIAL,
655 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
656 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
657 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
658 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
659 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
660 * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
661 * DAMAGE.
662 *
663 *
664 * This software consists of voluntary contributions made by Vovida
665 * Networks, Inc. and many individuals on behalf of Vovida Networks,
666 * Inc. For more information on Vovida Networks, Inc., please see
667 *
668 *
669 */
670*************************************************************
671*************************************************************
672
673Internet Software Consortium code
674
675/* This is from the BIND 4.9.4 release, modified to compile by itself */
676/* Copyright (c) 1996 by Internet Software Consortium.
677 *
678 * Permission to use, copy, modify, and distribute this software for any
679 * purpose with or without fee is hereby granted, provided that the above
680 * copyright notice and this permission notice appear in all copies.
681 *
682 * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
683 * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
684 * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
685 * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
686 * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
687 * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
688 * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
689 * SOFTWARE.
690 */
691
692*************************************************************
693
694*************************************************************
695
696************************************************************
697
698http://tinyxpath.sourceforge.net/
699
700TinyXPath is covered by the zlib license :
701
702 www.sourceforge.net/projects/tinyxpath
703 Copyright (c) 2002-2006 Yves Berquin (yvesb@users.sourceforge.net)
704
705 This software is provided 'as-is', without any express or implied
706 warranty. In no event will the authors be held liable for any
707 damages arising from the use of this software.
708
709 Permission is granted to anyone to use this software for any
710 purpose, including commercial applications, and to alter it and
711 redistribute it freely, subject to the following restrictions:
712
713 1. The origin of this software must not be misrepresented; you must
714 not claim that you wrote the original software. If you use this
715 software in a product, an acknowledgment in the product documentation
716 would be appreciated but is not required.
717
718 2. Altered source versions must be plainly marked as such, and
719 must not be misrepresented as being the original software.
720
721 3. This notice may not be removed or altered from any source distribution.
722
723
724************************************************************
725************************************************************
726
727THE FREE SOFTWARE FOUNDATION
728
729Any customer may request the source code for all open source portions of this product which are covered by the Free Software Foundation's General Public License (GPL), for a period of three years from purchase. Please contact the vendor from whom you obtained this product for instructions. A fee equivalent to the cost of making the code available may be charged. Alternatively, customers may choose to download desired GPL components directly from their original vendors. Specifically, this product contains the following GPL-licensed components:
730
731
732From Vivox:
733 - Assorted software components. To request source, contact Vivox at:
734 Vivox, Inc.
735 Attn: customer support
736 40 Speen Street Suite 402
737 Framingham, MA 01701
diff --git a/linden/LICENSE-logos.txt b/linden/LICENSE-logos.txt
new file mode 100644
index 0000000..e63c48e
--- /dev/null
+++ b/linden/LICENSE-logos.txt
@@ -0,0 +1,23 @@
1COPYRIGHT AND PERMISSION NOTICE
2
3Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc.
4
5Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer
6artwork and other works in the files distributed with this Notice under
7the Creative Commons Attribution-Share Alike 3.0 License, available at
8http://creativecommons.org/licenses/by-sa/3.0/legalcode. For the license
9summary, see http://creativecommons.org/licenses/by-sa/3.0/.
10
11Notwithstanding the foregoing, all of Linden Lab's trademarks, including
12but not limited to the Second Life brand name and Second Life Eye-in-Hand
13logo, are subject to our trademark policy at
14http://secondlife.com/corporate/trademark/.
15
16If you distribute any copies or adaptations of the Second Life viewer
17artwork or any other works in these files, you must include this Notice
18and clearly identify any changes made to the original works. Include
19this Notice and information where copyright notices are usually included,
20for example, after your own copyright notice acknowledging your use of
21the Second Life viewer artwork, in a text file distributed with your
22program, in your application's About window, or on a credits page for
23your work.
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 346aba5..48c1429 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -13,6 +13,7 @@ Adam Marker
13 VWR-2755 13 VWR-2755
14Aimee Trescothick 14Aimee Trescothick
15 VWR-3903 15 VWR-3903
16 VWR-3336
16 VWR-4083 17 VWR-4083
17 VWR-8341 18 VWR-8341
18 VWR-8430 19 VWR-8430
diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp
index ee478fe..b006a6a 100644
--- a/linden/indra/llcommon/llsecondlifeurls.cpp
+++ b/linden/indra/llcommon/llsecondlifeurls.cpp
@@ -84,4 +84,4 @@ const std::string SL_KB_URL (
84 "http://secondlife.com/knowledgebase/"); 84 "http://secondlife.com/knowledgebase/");
85 85
86const std::string RELEASE_NOTES_BASE_URL ( 86const std::string RELEASE_NOTES_BASE_URL (
87 "http://secondlife.com/app/releasenotes/"); 87 "http://imprudenceviewer.org/wiki/Release_Notes/");
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index bc42359..4032c5b 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -43,7 +43,8 @@ const char * const LL_VIEWER_NAME = "Second Life";
43const char * const IMP_VIEWER_NAME = "Imprudence"; 43const char * const IMP_VIEWER_NAME = "Imprudence";
44 44
45const S32 IMP_VERSION_MAJOR = 1; 45const S32 IMP_VERSION_MAJOR = 1;
46const S32 IMP_VERSION_MINOR = 0; 46const S32 IMP_VERSION_MINOR = 1;
47const S32 IMP_VERSION_PATCH = 0; 47const S32 IMP_VERSION_PATCH = 0;
48const char * const IMP_VERSION_TEST = "alpha";
48 49
49#endif 50#endif
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 1d2da46..ca3dd81 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -664,27 +664,38 @@
664 <integer>0</integer> 664 <integer>0</integer>
665 </array> 665 </array>
666 </map> 666 </map>
667 <key>BeaconAlwaysOn</key> 667 <key>BeaconsEnabled</key>
668 <map> 668 <map>
669 <key>Comment</key> 669 <key>Comment</key>
670 <string>Beacons / highlighting always on</string> 670 <string>Beacons / highlighting always on</string>
671 <key>Persist</key> 671 <key>Persist</key>
672 <integer>1</integer> 672 <integer>0</integer>
673 <key>Type</key> 673 <key>Type</key>
674 <string>Boolean</string> 674 <string>Boolean</string>
675 <key>Value</key> 675 <key>Value</key>
676 <integer>0</integer> 676 <integer>0</integer>
677 </map> 677 </map>
678 <key>BrowserHomePage</key> 678 <key>BrowserHome</key>
679 <map> 679 <map>
680 <key>Comment</key> 680 <key>Comment</key>
681 <string>[NOT USED]</string> 681 <string>Inworld browser home page</string>
682 <key>Persist</key> 682 <key>Persist</key>
683 <integer>1</integer> 683 <integer>1</integer>
684 <key>Type</key> 684 <key>Type</key>
685 <string>String</string> 685 <string>String</string>
686 <key>Value</key> 686 <key>Value</key>
687 <string>http://www.secondlife.com</string> 687 <string>http://www.imprudenceviewer.org</string>
688 </map>
689 <key>BrowserLastVisited</key>
690 <map>
691 <key>Comment</key>
692 <string>Last visited page</string>
693 <key>Persist</key>
694 <integer>0</integer>
695 <key>Type</key>
696 <string>String</string>
697 <key>Value</key>
698 <string></string>
688 </map> 699 </map>
689 <key>BlockAvatarAppearanceMessages</key> 700 <key>BlockAvatarAppearanceMessages</key>
690 <map> 701 <map>
@@ -6676,6 +6687,17 @@
6676 <key>Value</key> 6687 <key>Value</key>
6677 <integer>0</integer> 6688 <integer>0</integer>
6678 </map> 6689 </map>
6690 <key>SelectCopyableOnly</key>
6691 <map>
6692 <key>Comment</key>
6693 <string>Select only objects you can copy</string>
6694 <key>Persist</key>
6695 <integer>1</integer>
6696 <key>Type</key>
6697 <string>Boolean</string>
6698 <key>Value</key>
6699 <integer>0</integer>
6700 </map>
6679 <key>SelectOwnedOnly</key> 6701 <key>SelectOwnedOnly</key>
6680 <map> 6702 <map>
6681 <key>Comment</key> 6703 <key>Comment</key>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 243a9d8..14214b5 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -602,11 +602,12 @@ bool LLAppViewer::init()
602 writeSystemInfo(); 602 writeSystemInfo();
603 603
604 // Build a string representing the current version number. 604 // Build a string representing the current version number.
605 gCurrentVersion = llformat("%s %d.%d.%d / %s %d.%d.%d.%d", 605 gCurrentVersion = llformat("%s %d.%d.%d %s / %s %d.%d.%d.%d",
606 gSavedSettings.getString("VersionChannelName").c_str(), 606 gSavedSettings.getString("VersionChannelName").c_str(),
607 IMP_VERSION_MAJOR, 607 IMP_VERSION_MAJOR,
608 IMP_VERSION_MINOR, 608 IMP_VERSION_MINOR,
609 IMP_VERSION_PATCH, 609 IMP_VERSION_PATCH,
610 IMP_VERSION_TEST,
610 LL_VIEWER_NAME, 611 LL_VIEWER_NAME,
611 LL_VERSION_MAJOR, 612 LL_VERSION_MAJOR,
612 LL_VERSION_MINOR, 613 LL_VERSION_MINOR,
@@ -2247,6 +2248,7 @@ void LLAppViewer::writeSystemInfo()
2247 gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR; 2248 gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
2248 gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR; 2249 gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
2249 gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH; 2250 gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
2251 gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
2250 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR; 2252 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
2251 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR; 2253 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
2252 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH; 2254 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
@@ -2330,6 +2332,7 @@ void LLAppViewer::handleViewerCrash()
2330 gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR; 2332 gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
2331 gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR; 2333 gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
2332 gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH; 2334 gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
2335 gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
2333 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR; 2336 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
2334 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR; 2337 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
2335 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH; 2338 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
diff --git a/linden/indra/newview/llcolorscheme.cpp b/linden/indra/newview/llcolorscheme.cpp
index ef8b4a8..460f1a2 100644
--- a/linden/indra/newview/llcolorscheme.cpp
+++ b/linden/indra/newview/llcolorscheme.cpp
@@ -37,8 +37,6 @@
37 37
38LLColor4 gTrackColor; 38LLColor4 gTrackColor;
39LLColor4 gSelfMapColor; 39LLColor4 gSelfMapColor;
40LLColor4 gAvatarMapColor;
41LLColor4 gFriendMapColor;
42LLColor4 gLandmarkMapColor; 40LLColor4 gLandmarkMapColor;
43LLColor4 gLocationMapColor; 41LLColor4 gLocationMapColor;
44LLColor4 gTelehubMapColor; 42LLColor4 gTelehubMapColor;
@@ -56,8 +54,7 @@ void init_colors()
56 gDisabledTrackColor.setVec( 0.5f, 0.f, 0.f, 1.f ); 54 gDisabledTrackColor.setVec( 0.5f, 0.f, 0.f, 1.f );
57 55
58 gSelfMapColor = LLColor4::white; 56 gSelfMapColor = LLColor4::white;
59 gAvatarMapColor = LLColor4::green; 57
60 gFriendMapColor = LLColor4::yellow;
61 // fleshy color 58 // fleshy color
62 //gAvatarMapColor.setVec( 255.f/255.f, 223.f/255.f, 170.f/255.f, 1.f); 59 //gAvatarMapColor.setVec( 255.f/255.f, 223.f/255.f, 170.f/255.f, 1.f);
63 60
diff --git a/linden/indra/newview/llcolorscheme.h b/linden/indra/newview/llcolorscheme.h
index e772b11..bf1e053 100644
--- a/linden/indra/newview/llcolorscheme.h
+++ b/linden/indra/newview/llcolorscheme.h
@@ -36,8 +36,6 @@
36 36
37extern LLColor4 gTrackColor; 37extern LLColor4 gTrackColor;
38extern LLColor4 gSelfMapColor; 38extern LLColor4 gSelfMapColor;
39extern LLColor4 gAvatarMapColor;
40extern LLColor4 gFriendMapColor;
41extern LLColor4 gLandmarkMapColor; 39extern LLColor4 gLandmarkMapColor;
42extern LLColor4 gLocationMapColor; 40extern LLColor4 gLocationMapColor;
43extern LLColor4 gTelehubMapColor; 41extern LLColor4 gTelehubMapColor;
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 4704c5b..af436c5 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -110,9 +110,9 @@ LLFloaterAbout::LLFloaterAbout()
110 110
111 // Version string 111 // Version string
112 std::string version = llformat( 112 std::string version = llformat(
113 "%s %d.%d.%d / %s %d.%d.%d (%d), %s %s\n", 113 "%s %d.%d.%d %s / %s %d.%d.%d (%d), %s %s\n",
114 IMP_VIEWER_NAME, 114 IMP_VIEWER_NAME,
115 IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH, 115 IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH, IMP_VERSION_TEST,
116 LL_VIEWER_NAME, 116 LL_VIEWER_NAME,
117 LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD, 117 LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
118 __DATE__, __TIME__); 118 __DATE__, __TIME__);
@@ -262,17 +262,16 @@ void LLFloaterAbout::show(void*)
262static std::string get_viewer_release_notes_url() 262static std::string get_viewer_release_notes_url()
263{ 263{
264 std::ostringstream version; 264 std::ostringstream version;
265 version << LL_VERSION_MAJOR << "." 265 version << IMP_VERSION_MAJOR << "."
266 << LL_VERSION_MINOR << "." 266 << IMP_VERSION_MINOR << "."
267 << LL_VERSION_PATCH << "." 267 << IMP_VERSION_PATCH;
268 << LL_VERSION_BUILD;
269 268
270 LLSD query; 269 // Append the test version if it's not empty
271 query["channel"] = gSavedSettings.getString("VersionChannelName"); 270 if( strcmp(IMP_VERSION_TEST, "") != 0 )
272 query["version"] = version.str(); 271 version << "-" << IMP_VERSION_TEST;
273 272
274 std::ostringstream url; 273 std::ostringstream url;
275 url << RELEASE_NOTES_BASE_URL << LLURI::mapToQueryString(query); 274 url << RELEASE_NOTES_BASE_URL << version.str();
276 275
277 return url.str(); 276 return url.str();
278} 277}
diff --git a/linden/indra/newview/llfloatergroupinvite.cpp b/linden/indra/newview/llfloatergroupinvite.cpp
index 643abf7..1644050 100644
--- a/linden/indra/newview/llfloatergroupinvite.cpp
+++ b/linden/indra/newview/llfloatergroupinvite.cpp
@@ -34,7 +34,7 @@
34#include "llfloatergroupinvite.h" 34#include "llfloatergroupinvite.h"
35#include "llpanelgroupinvite.h" 35#include "llpanelgroupinvite.h"
36 36
37const char FLOATER_TITLE[] = "Group Invitation"; 37const char FLOATER_TITLE[] = "Invite to ";
38const LLRect FGI_RECT(0, 380, 210, 0); 38const LLRect FGI_RECT(0, 380, 210, 0);
39 39
40class LLFloaterGroupInvite::impl 40class LLFloaterGroupInvite::impl
@@ -132,6 +132,11 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
132 group_id); 132 group_id);
133 133
134 impl::sInstances[group_id] = fgi; 134 impl::sInstances[group_id] = fgi;
135
136 // Look up the group name.
137 // The callback will insert it into the title.
138 const BOOL is_group = TRUE;
139 gCacheName->get(group_id, is_group, callbackLoadGroupName, NULL);
135 140
136 fgi->mImpl->mInvitePanelp->clear(); 141 fgi->mImpl->mInvitePanelp->clear();
137 } 142 }
@@ -145,3 +150,16 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
145 fgi->open(); /*Flawfinder: ignore*/ 150 fgi->open(); /*Flawfinder: ignore*/
146 fgi->mImpl->mInvitePanelp->update(); 151 fgi->mImpl->mInvitePanelp->update();
147} 152}
153
154void LLFloaterGroupInvite::callbackLoadGroupName(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data)
155{
156 LLFloaterGroupInvite *fgi = get_if_there(impl::sInstances, id, (LLFloaterGroupInvite*)NULL);
157
158 if (fgi)
159 {
160 // Build a new title including the group name.
161 std::ostringstream title;
162 title << FLOATER_TITLE << first;
163 fgi->setTitle(title.str());
164 }
165}
diff --git a/linden/indra/newview/llfloatergroupinvite.h b/linden/indra/newview/llfloatergroupinvite.h
index 621b5dd..96b9161 100644
--- a/linden/indra/newview/llfloatergroupinvite.h
+++ b/linden/indra/newview/llfloatergroupinvite.h
@@ -52,6 +52,12 @@ protected:
52 52
53 class impl; 53 class impl;
54 impl* mImpl; 54 impl* mImpl;
55private:
56 static void callbackLoadGroupName(const LLUUID& id,
57 const std::string& first,
58 const std::string& last,
59 BOOL is_group,
60 void* data);
55}; 61};
56 62
57#endif 63#endif
diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index d6d249e..7fe4d59 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -58,7 +58,9 @@ LLFloaterMediaBrowser::LLFloaterMediaBrowser(const LLSD& media_data)
58 58
59void LLFloaterMediaBrowser::draw() 59void LLFloaterMediaBrowser::draw()
60{ 60{
61 childSetEnabled("go", !mAddressCombo->getValue().asString().empty()); 61 BOOL url_exists = !mAddressCombo->getValue().asString().empty();
62 childSetEnabled("go", url_exists);
63 childSetEnabled("set_home", url_exists);
62 LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); 64 LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
63 if(parcel) 65 if(parcel)
64 { 66 {
@@ -84,6 +86,8 @@ BOOL LLFloaterMediaBrowser::postBuild()
84 childSetAction("close", onClickClose, this); 86 childSetAction("close", onClickClose, this);
85 childSetAction("open_browser", onClickOpenWebBrowser, this); 87 childSetAction("open_browser", onClickOpenWebBrowser, this);
86 childSetAction("assign", onClickAssign, this); 88 childSetAction("assign", onClickAssign, this);
89 childSetAction("home", onClickHome, this);
90 childSetAction("set_home", onClickSetHome, this);
87 91
88 buildURLHistory(); 92 buildURLHistory();
89 return TRUE; 93 return TRUE;
@@ -146,6 +150,7 @@ void LLFloaterMediaBrowser::onLocationChange( const EventType& eventIn )
146 childSetEnabled("back", mBrowser->canNavigateBack()); 150 childSetEnabled("back", mBrowser->canNavigateBack());
147 childSetEnabled("forward", mBrowser->canNavigateForward()); 151 childSetEnabled("forward", mBrowser->canNavigateForward());
148 childSetEnabled("reload", TRUE); 152 childSetEnabled("reload", TRUE);
153 gSavedSettings.setString("BrowserLastVisited", truncated_url);
149} 154}
150 155
151LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url) 156LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url)
@@ -156,6 +161,14 @@ LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url
156 return floaterp; 161 return floaterp;
157} 162}
158 163
164void LLFloaterMediaBrowser::show()
165{
166 //Show home url if new session, last visited if not
167 std::string last_url = gSavedSettings.getString("BrowserLastVisited");
168 if(last_url.empty())
169 last_url = gSavedSettings.getString("BrowserHome");
170 showInstance(last_url);
171}
159//static 172//static
160void LLFloaterMediaBrowser::onEnterAddress(LLUICtrl* ctrl, void* user_data) 173void LLFloaterMediaBrowser::onEnterAddress(LLUICtrl* ctrl, void* user_data)
161{ 174{
@@ -238,6 +251,29 @@ void LLFloaterMediaBrowser::onClickAssign(void* user_data)
238 251
239} 252}
240 253
254void LLFloaterMediaBrowser::onClickHome(void* user_data)
255{
256 LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
257 if (self)
258 {
259 if (self->mBrowser)
260 {
261 std::string home_url = gSavedSettings.getString("BrowserHome");
262 self->mBrowser->navigateTo(home_url);
263 }
264 }
265}
266
267void LLFloaterMediaBrowser::onClickSetHome(void* user_data)
268{
269 LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
270 std::string url = self->mCurrentURL;
271 if(!url.empty())
272 {
273 gSavedSettings.setString("BrowserHome", url);
274 }
275}
276
241void LLFloaterMediaBrowser::openMedia(const std::string& media_url) 277void LLFloaterMediaBrowser::openMedia(const std::string& media_url)
242{ 278{
243 mBrowser->setHomePageUrl(media_url); 279 mBrowser->setHomePageUrl(media_url);
diff --git a/linden/indra/newview/llfloaterhtmlhelp.h b/linden/indra/newview/llfloaterhtmlhelp.h
index 7257566..d726b77 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.h
+++ b/linden/indra/newview/llfloaterhtmlhelp.h
@@ -65,6 +65,7 @@ public:
65 void buildURLHistory(); 65 void buildURLHistory();
66 66
67 static LLFloaterMediaBrowser* showInstance(const LLSD& id); 67 static LLFloaterMediaBrowser* showInstance(const LLSD& id);
68 static void show();
68 static void onEnterAddress(LLUICtrl* ctrl, void* user_data); 69 static void onEnterAddress(LLUICtrl* ctrl, void* user_data);
69 static void onClickRefresh(void* user_data); 70 static void onClickRefresh(void* user_data);
70 static void onClickBack(void* user_data); 71 static void onClickBack(void* user_data);
@@ -73,6 +74,8 @@ public:
73 static void onClickClose(void* user_data); 74 static void onClickClose(void* user_data);
74 static void onClickOpenWebBrowser(void* user_data); 75 static void onClickOpenWebBrowser(void* user_data);
75 static void onClickAssign(void* user_data); 76 static void onClickAssign(void* user_data);
77 static void onClickHome(void* user_data);
78 static void onClickSetHome(void* user_data);
76 79
77private: 80private:
78 LLWebBrowserCtrl* mBrowser; 81 LLWebBrowserCtrl* mBrowser;
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index d308210..8a665b5 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -206,8 +206,9 @@ void LLFloaterInspect::refresh()
206 mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE); 206 mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE);
207 //List all transient objects, then all linked objects 207 //List all transient objects, then all linked objects
208 208
209 for (LLObjectSelection::iterator iter = mObjectSelection->begin(); 209 //Crash fix for VWR-10823
210 iter != mObjectSelection->end(); iter++) 210 for (LLObjectSelection::valid_iterator iter = mObjectSelection->valid_begin();
211 iter != mObjectSelection->valid_end(); iter++)
211 { 212 {
212 LLSelectNode* obj = *iter; 213 LLSelectNode* obj = *iter;
213 LLSD row; 214 LLSD row;
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index b277998..22dee9d 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -69,7 +69,7 @@
69 69
70#include "llglheaders.h" 70#include "llglheaders.h"
71 71
72const F32 MAP_SCALE_MIN = 64; 72const F32 MAP_SCALE_MIN = 32;
73const F32 MAP_SCALE_MID = 172; 73const F32 MAP_SCALE_MID = 172;
74const F32 MAP_SCALE_MAX = 512; 74const F32 MAP_SCALE_MAX = 512;
75const F32 MAP_SCALE_INCREMENT = 16; 75const F32 MAP_SCALE_INCREMENT = 16;
@@ -97,6 +97,9 @@ LLNetMap::LLNetMap(
97 mPixelsPerMeter = gMiniMapScale / REGION_WIDTH_METERS; 97 mPixelsPerMeter = gMiniMapScale / REGION_WIDTH_METERS;
98 98
99 LLNetMap::sRotateMap = gSavedSettings.getBOOL( "MiniMapRotate" ); 99 LLNetMap::sRotateMap = gSavedSettings.getBOOL( "MiniMapRotate" );
100
101 glyph_color_avatar = gColors.getColor("NetMapGlyphColorAvatar");
102 glyph_color_friend = gColors.getColor("NetMapGlyphColorFriend");
100 103
101 // Surface texture is dynamically generated/updated. 104 // Surface texture is dynamically generated/updated.
102// createObjectImage(); 105// createObjectImage();
@@ -411,7 +414,7 @@ void LLNetMap::draw()
411 } 414 }
412 LLWorldMapView::drawAvatar( 415 LLWorldMapView::drawAvatar(
413 pos_map.mV[VX], pos_map.mV[VY], 416 pos_map.mV[VX], pos_map.mV[VY],
414 show_as_friend ? gFriendMapColor : gAvatarMapColor, 417 show_as_friend ? glyph_color_friend : glyph_color_avatar,
415 pos_map.mV[VZ]); 418 pos_map.mV[VZ]);
416 } 419 }
417 } 420 }
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index 3fb20cc..91027c5 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -84,7 +84,10 @@ protected:
84 84
85public: 85public:
86 LLHandle<LLView> mPopupMenuHandle; 86 LLHandle<LLView> mPopupMenuHandle;
87
87 LLColor4 mBackgroundColor; 88 LLColor4 mBackgroundColor;
89 LLColor4 glyph_color_avatar;
90 LLColor4 glyph_color_friend;
88 91
89 F32 mScale; // Size of a region in pixels 92 F32 mScale; // Size of a region in pixels
90 F32 mPixelsPerMeter; // world meters to map pixels 93 F32 mPixelsPerMeter; // world meters to map pixels
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 09e2cee..a495516 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -360,10 +360,11 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
360 // childSetAction("quit_btn", onClickQuit, this); 360 // childSetAction("quit_btn", onClickQuit, this);
361 361
362 std::string imp_channel = gSavedSettings.getString("VersionChannelName"); 362 std::string imp_channel = gSavedSettings.getString("VersionChannelName");
363 std::string imp_version = llformat("%d.%d.%d", 363 std::string imp_version = llformat("%d.%d.%d %s",
364 IMP_VERSION_MAJOR, 364 IMP_VERSION_MAJOR,
365 IMP_VERSION_MINOR, 365 IMP_VERSION_MINOR,
366 IMP_VERSION_PATCH ); 366 IMP_VERSION_PATCH,
367 IMP_VERSION_TEST );
367 368
368 std::string ll_channel = LL_VIEWER_NAME; 369 std::string ll_channel = LL_VIEWER_NAME;
369 std::string ll_version = llformat("%d.%d.%d (%d)", 370 std::string ll_version = llformat("%d.%d.%d (%d)",
@@ -711,6 +712,14 @@ void LLPanelLogin::addServer(const std::string& server, S32 domain_name)
711 combo->setCurrentByIndex(0); 712 combo->setCurrentByIndex(0);
712} 713}
713 714
715
716// static
717void LLPanelLogin::setServer(S32 domain_name)
718{
719 LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
720 combo->setCurrentByIndex(domain_name);
721}
722
714// static 723// static
715void LLPanelLogin::getFields(std::string &firstname, std::string &lastname, std::string &password, 724void LLPanelLogin::getFields(std::string &firstname, std::string &lastname, std::string &password,
716 BOOL &remember) 725 BOOL &remember)
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 539997b..78b0a22 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -87,6 +87,7 @@ public:
87 const std::string& password, BOOL remember); 87 const std::string& password, BOOL remember);
88 88
89 static void addServer(const std::string& server, S32 domain_name); 89 static void addServer(const std::string& server, S32 domain_name);
90 static void setServer(S32 domain_name);
90 static void refreshLocation( bool force_visible ); 91 static void refreshLocation( bool force_visible );
91 92
92 static void getFields(std::string& firstname, std::string& lastname, 93 static void getFields(std::string& firstname, std::string& lastname,
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 2e4983c..7547dd2 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -5499,6 +5499,10 @@ void LLSelectMgr::updateSelectionCenter()
5499 5499
5500 std::vector < LLViewerObject *> jointed_objects; 5500 std::vector < LLViewerObject *> jointed_objects;
5501 5501
5502 // Initialize the bounding box to the root prim, so the BBox orientation
5503 // matches the root prim's (affecting the orientation of the manipulators).
5504 bbox.addBBoxAgent( (mSelectedObjects->getFirstRootObject(TRUE))->getBoundingBoxAgent() );
5505
5502 for (LLObjectSelection::iterator iter = mSelectedObjects->begin(); 5506 for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
5503 iter != mSelectedObjects->end(); iter++) 5507 iter != mSelectedObjects->end(); iter++)
5504 { 5508 {
@@ -5745,7 +5749,8 @@ BOOL LLSelectMgr::canSelectObject(LLViewerObject* object)
5745 } 5749 }
5746 5750
5747 if ((gSavedSettings.getBOOL("SelectOwnedOnly") && !object->permYouOwner()) || 5751 if ((gSavedSettings.getBOOL("SelectOwnedOnly") && !object->permYouOwner()) ||
5748 (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove())) 5752 (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()) ||
5753 (gSavedSettings.getBOOL("SelectCopyableOnly") && !object->permCopy()))
5749 { 5754 {
5750 // only select my own objects 5755 // only select my own objects
5751 return FALSE; 5756 return FALSE;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 625b1d8..6371f2b 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2458,14 +2458,14 @@ void login_show()
2458 // UI textures have been previously loaded in doPreloadImages() 2458 // UI textures have been previously loaded in doPreloadImages()
2459 2459
2460 LL_DEBUGS("AppInit") << "Setting Servers" << LL_ENDL; 2460 LL_DEBUGS("AppInit") << "Setting Servers" << LL_ENDL;
2461 2461 LL_INFOS("AppInit") << "getGridChoice is " << LLViewerLogin::getInstance()->getGridChoice() << LL_ENDL;
2462 LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice());
2463 2462
2464 LLViewerLogin* vl = LLViewerLogin::getInstance(); 2463 LLViewerLogin* vl = LLViewerLogin::getInstance();
2465 for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index) 2464 for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index)
2466 { 2465 {
2467 LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index); 2466 LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index);
2468 } 2467 }
2468 LLPanelLogin::setServer(LLViewerLogin::getInstance()->getGridChoice()-1);
2469} 2469}
2470 2470
2471// Callback for when login screen is closed. Option 0 = connect, option 1 = quit. 2471// Callback for when login screen is closed. Option 0 = connect, option 1 = quit.
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index ac3fa93..c10add4 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -72,9 +72,17 @@ bool LLURLHistory::loadFile(const std::string& filename)
72 72
73// static 73// static
74bool LLURLHistory::saveFile(const std::string& filename) 74bool LLURLHistory::saveFile(const std::string& filename)
75{ 75{
76 std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter(); 76 std::string temp_str = gDirUtilp->getLindenUserDir();
77 llofstream out((temp_str + filename)); 77 if( temp_str.empty() )
78 {
79 llwarns << "Can't save " << filename
80 << ": No user directory set." << llendl;
81 return false;
82 }
83
84 temp_str += gDirUtilp->getDirDelimiter() + filename;
85 llofstream out(temp_str);
78 if (!out.good()) 86 if (!out.good())
79 { 87 {
80 llwarns << "Unable to open " << filename << " for output." << llendl; 88 llwarns << "Unable to open " << filename << " for output." << llendl;
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 5e67712..3bf390e 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -5305,6 +5305,10 @@ class LLShowFloater : public view_listener_t
5305 { 5305 {
5306 LLFloaterActiveSpeakers::toggleInstance(LLSD()); 5306 LLFloaterActiveSpeakers::toggleInstance(LLSD());
5307 } 5307 }
5308 else if (floater_name == "inworld browser")
5309 {
5310 LLFloaterMediaBrowser::show();
5311 }
5308 return true; 5312 return true;
5309 } 5313 }
5310}; 5314};
@@ -6714,6 +6718,18 @@ class LLToolsSelectOnlyMovableObjects : public view_listener_t
6714 } 6718 }
6715}; 6719};
6716 6720
6721class LLToolsSelectOnlyCopyableObjects : public view_listener_t
6722{
6723 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
6724 {
6725 BOOL cur_val = gSavedSettings.getBOOL("SelectCopyableOnly");
6726
6727 gSavedSettings.setBOOL("SelectCopyableOnly", ! cur_val );
6728
6729 return true;
6730 }
6731};
6732
6717class LLToolsSelectBySurrounding : public view_listener_t 6733class LLToolsSelectBySurrounding : public view_listener_t
6718{ 6734{
6719 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) 6735 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9829,6 +9845,7 @@ void initialize_menus()
9829 addMenu(new LLToolsSelectTool(), "Tools.SelectTool"); 9845 addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
9830 addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects"); 9846 addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects");
9831 addMenu(new LLToolsSelectOnlyMovableObjects(), "Tools.SelectOnlyMovableObjects"); 9847 addMenu(new LLToolsSelectOnlyMovableObjects(), "Tools.SelectOnlyMovableObjects");
9848 addMenu(new LLToolsSelectOnlyCopyableObjects(), "Tools.SelectOnlyCopyableObjects");
9832 addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding"); 9849 addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding");
9833 addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection"); 9850 addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection");
9834 addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius"); 9851 addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius");
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index c8cffcf..9019b88 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -110,34 +110,34 @@ void LLViewerLogin::setGridChoice(const std::string& grid_name)
110 // The string can be: 110 // The string can be:
111 // - a grid label from the gGridInfo table 111 // - a grid label from the gGridInfo table
112 // - an ip address 112 // - an ip address
113 if(!grid_name.empty()) 113 if(!grid_name.empty())
114 { 114 {
115 // find the grid choice from the user setting. 115 // find the grid choice from the user setting.
116 int grid_index = GRID_INFO_NONE; 116 int grid_index = GRID_INFO_NONE;
117 for(;grid_index < GRID_INFO_OTHER; ++grid_index) 117 for(;grid_index < GRID_INFO_OTHER; ++grid_index)
118 { 118 {
119 if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name)) 119 if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name))
120 { 120 {
121 // Founding a matching label in the list... 121 // Founding a matching label in the list...
122 setGridChoice((EGridInfo)grid_index); 122 setGridChoice((EGridInfo)grid_index);
123 break; 123 break;
124 } 124 }
125 } 125 }
126 126
127 if(GRID_INFO_OTHER == grid_index) 127 if(GRID_INFO_OTHER == grid_index)
128 { 128 {
129 // *FIX:MEP Can and should we validate that this is an IP address? 129 // *FIX:MEP Can and should we validate that this is an IP address?
130 mGridChoice = GRID_INFO_OTHER; 130 mGridChoice = GRID_INFO_OTHER;
131 mGridName = grid_name; 131 mGridName = grid_name;
132 gSavedSettings.setS32("ServerChoice", mGridChoice); 132 gSavedSettings.setS32("ServerChoice", mGridChoice);
133 gSavedSettings.setString("CustomServer", mGridName); 133 gSavedSettings.setString("CustomServer", mGridName);
134 } 134 }
135 } 135 }
136} 136}
137 137
138void LLViewerLogin::resetURIs() 138void LLViewerLogin::resetURIs()
139{ 139{
140 // Clear URIs when picking a new server 140 // Clear URIs when picking a new server
141 gSavedSettings.setValue("CmdLineLoginURI", LLSD::emptyArray()); 141 gSavedSettings.setValue("CmdLineLoginURI", LLSD::emptyArray());
142 gSavedSettings.setString("CmdLineHelperURI", ""); 142 gSavedSettings.setString("CmdLineHelperURI", "");
143} 143}
@@ -163,7 +163,8 @@ std::string LLViewerLogin::getGridLabel() const
163 163
164std::string LLViewerLogin::getGridCodeName() const 164std::string LLViewerLogin::getGridCodeName() const
165{ 165{
166 if( gGridInfo[mGridChoice].mCodeName == "" ) 166 // Fall back to grid label if code name is empty.
167 if( strcmp(gGridInfo[mGridChoice].mCodeName, "") == 0 )
167 { 168 {
168 return getGridLabel(); 169 return getGridLabel();
169 } 170 }
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 08dc979..2944d9d 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -1022,6 +1022,8 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
1022 U8 z_pos = 0; 1022 U8 z_pos = 0;
1023 1023
1024 U32 pos = 0x0; 1024 U32 pos = 0x0;
1025
1026 LLUUID agent_id = LLUUID::null;
1025 1027
1026 S16 agent_index; 1028 S16 agent_index;
1027 S16 target_index; 1029 S16 target_index;
@@ -1034,6 +1036,7 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
1034 msg->getU8Fast(_PREHASH_Location, _PREHASH_X, x_pos, i); 1036 msg->getU8Fast(_PREHASH_Location, _PREHASH_X, x_pos, i);
1035 msg->getU8Fast(_PREHASH_Location, _PREHASH_Y, y_pos, i); 1037 msg->getU8Fast(_PREHASH_Location, _PREHASH_Y, y_pos, i);
1036 msg->getU8Fast(_PREHASH_Location, _PREHASH_Z, z_pos, i); 1038 msg->getU8Fast(_PREHASH_Location, _PREHASH_Z, z_pos, i);
1039 msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id, i);
1037 1040
1038 //llinfos << " object X: " << (S32)x_pos << " Y: " << (S32)y_pos 1041 //llinfos << " object X: " << (S32)x_pos << " Y: " << (S32)y_pos
1039 // << " Z: " << (S32)(z_pos * 4) 1042 // << " Z: " << (S32)(z_pos * 4)
@@ -1059,6 +1062,7 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
1059 pos <<= 8; 1062 pos <<= 8;
1060 pos |= z_pos; 1063 pos |= z_pos;
1061 mMapAvatars.put(pos); 1064 mMapAvatars.put(pos);
1065 mMapAvatarIDs.put(agent_id);
1062 } 1066 }
1063 } 1067 }
1064} 1068}
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 64c042a..2e77316 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -470,7 +470,7 @@ public:
470 ypos += y_inc; 470 ypos += y_inc;
471 } 471 }
472 // only display these messages if we are actually rendering beacons at this moment 472 // only display these messages if we are actually rendering beacons at this moment
473 if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconAlwaysOn")) 473 if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconsEnabled"))
474 { 474 {
475 if (LLPipeline::getRenderParticleBeacons(NULL)) 475 if (LLPipeline::getRenderParticleBeacons(NULL))
476 { 476 {
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 66c4068..4dee103 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -365,9 +365,14 @@ LLVector3d LLWorld::clipToVisibleRegions(const LLVector3d &start_pos, const LLVe
365 clip_factor = (region_coord.mV[VY] - region_width) / delta_pos_abs.mdV[VY]; 365 clip_factor = (region_coord.mV[VY] - region_width) / delta_pos_abs.mdV[VY];
366 } 366 }
367 367
368 // clamp to < 256 to stay in sim 368 // clamp to within region dimensions
369 LLVector3d final_region_pos = LLVector3d(region_coord) - (delta_pos * clip_factor); 369 LLVector3d final_region_pos = LLVector3d(region_coord) - (delta_pos * clip_factor);
370 final_region_pos.clamp(0.0, 255.999); 370 final_region_pos.mdV[VX] = llclamp(final_region_pos.mdV[VX], 0.0,
371 (F64)(region_width - F_ALMOST_ZERO));
372 final_region_pos.mdV[VY] = llclamp(final_region_pos.mdV[VY], 0.0,
373 (F64)(region_width - F_ALMOST_ZERO));
374 final_region_pos.mdV[VZ] = llclamp(final_region_pos.mdV[VZ], 0.0,
375 (F64)(LLWorld::getInstance()->getRegionMaxHeight()));
371 return regionp->getPosGlobalFromRegion(LLVector3(final_region_pos)); 376 return regionp->getPosGlobalFromRegion(LLVector3(final_region_pos));
372} 377}
373 378
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 92d9588..0d266dd 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -208,6 +208,8 @@ LLWorldMapView::LLWorldMapView(const std::string& name, const LLRect& rect )
208 mTextBoxNorthWest = new LLTextBox( std::string("NW"), minor_dir_rect ); 208 mTextBoxNorthWest = new LLTextBox( std::string("NW"), minor_dir_rect );
209 mTextBoxNorthWest->setColor( minor_color ); 209 mTextBoxNorthWest->setColor( minor_color );
210 addChild( mTextBoxNorthWest ); 210 addChild( mTextBoxNorthWest );
211
212 glyph_color_avatar = gColors.getColor("NetMapGlyphColorAvatar");
211} 213}
212 214
213 215
@@ -886,8 +888,8 @@ void LLWorldMapView::drawAgents()
886 S32 agent_count = info.mExtra; 888 S32 agent_count = info.mExtra;
887 sim_agent_count += info.mExtra; 889 sim_agent_count += info.mExtra;
888 // Here's how we'd choose the color if info.mID were available but it's not being sent: 890 // Here's how we'd choose the color if info.mID were available but it's not being sent:
889 //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? gFriendMapColor : gAvatarMapColor; 891 //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? glyph_color_friend : glyph_color_avatar;
890 drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, gAvatarMapColor); 892 drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, glyph_color_avatar);
891 } 893 }
892 LLWorldMap::getInstance()->mNumAgents[handle] = sim_agent_count; // override mNumAgents for this sim 894 LLWorldMap::getInstance()->mNumAgents[handle] = sim_agent_count; // override mNumAgents for this sim
893 } 895 }
@@ -902,7 +904,7 @@ void LLWorldMapView::drawAgents()
902 region_center[VY] += REGION_WIDTH_METERS / 2; 904 region_center[VY] += REGION_WIDTH_METERS / 2;
903 // Reduce the stack size as you zoom out - always display at lease one agent where there is one or more 905 // Reduce the stack size as you zoom out - always display at lease one agent where there is one or more
904 S32 agent_count = (S32)(((num_agents-1) * agents_scale + (num_agents-1) * 0.1f)+.1f) + 1; 906 S32 agent_count = (S32)(((num_agents-1) * agents_scale + (num_agents-1) * 0.1f)+.1f) + 1;
905 drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, gAvatarMapColor); 907 drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, glyph_color_avatar);
906 } 908 }
907 } 909 }
908 } 910 }
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h
index 915a196..53f0bdd 100644
--- a/linden/indra/newview/llworldmapview.h
+++ b/linden/indra/newview/llworldmapview.h
@@ -189,6 +189,8 @@ public:
189 handle_list_t mVisibleRegions; // set every frame 189 handle_list_t mVisibleRegions; // set every frame
190 190
191 static std::map<std::string,std::string> sStringsMap; 191 static std::map<std::string,std::string> sStringsMap;
192
193 LLColor4 glyph_color_avatar;
192}; 194};
193 195
194#endif 196#endif
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index f232fdf..3523635 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -2101,7 +2101,7 @@ void LLPipeline::postSort(LLCamera& camera)
2101 } 2101 }
2102 2102
2103 // only render if the flag is set. The flag is only set if we are in edit mode or the toggle is set in the menus 2103 // only render if the flag is set. The flag is only set if we are in edit mode or the toggle is set in the menus
2104 if (gSavedSettings.getBOOL("BeaconAlwaysOn")) 2104 if (gSavedSettings.getBOOL("BeaconsEnabled"))
2105 { 2105 {
2106 if (sRenderScriptedTouchBeacons) 2106 if (sRenderScriptedTouchBeacons)
2107 { 2107 {
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 3b85efa..ff3d53e 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -1,146 +1,180 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<settings version = "101"> 2<settings version = "101">
3 3<!-- Additional comments by McCabe Maxsted -->
4
4<!-- WINDOWS --> 5<!-- WINDOWS -->
5<TitleBarFocusColor value="255, 255, 255, 30" /> <!-- Focused window title bar highlight, no equivalent for unfocused windows --> 6<TitleBarFocusColor value="255, 255, 255, 30" /> <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
6<FloaterFocusBorderColor value="0, 0, 0, 80" /> 7<FloaterFocusBorderColor value="0, 0, 0, 80" /> <!-- Focused window border color -->
7<FloaterUnfocusBorderColor value="0, 0, 0, 80" /> 8<FloaterUnfocusBorderColor value="0, 0, 0, 80" /> <!-- Unfocused window border color -->
8<FocusBackgroundColor value="62, 62, 62, 255" /> <!-- Background color of focused floaters --> 9<FocusBackgroundColor value="62, 62, 62, 255" /> <!-- Background color of focused windows -->
9<DefaultBackgroundColor value="62, 62, 62, 140" /> <!-- Background color for unfocused floaters --> 10<DefaultBackgroundColor value="62, 62, 62, 140" /> <!-- Background color for unfocused windows -->
10<ColorDropShadow value="0, 0, 0, 200" /> <!-- The drop shadow behind windows and menus --> 11<ColorDropShadow value="0, 0, 0, 200" /> <!-- The drop shadow behind windows and menus -->
11<DefaultHighlightDark value="26, 26, 26, 255" /> 12<DefaultHighlightDark value="26, 26, 26, 255" />
12<DefaultHighlightLight value="115, 132, 155, 255" /> 13<DefaultHighlightLight value="115, 132, 155, 255" /> <!-- Unfocused border, bottom portion -->
13<DefaultShadowDark value="26, 26, 26, 255" /> 14<DefaultShadowDark value="26, 26, 26, 255" /> <!-- Unfocused border, top portion -->
14<DefaultShadowLight value="0, 0, 0, 255" /> 15<DefaultShadowLight value="0, 0, 0, 255" /> <!-- Tab area border for IMs -->
15 16
16<!-- LABELS --> 17<!-- WINDOW LABELS -->
17<LabelDisabledColor value="147, 169, 213, 77" /> 18<LabelDisabledColor value="147, 169, 213, 77" /> <!-- Color for unfocused window titles -->
18<LabelSelectedColor value="255, 255, 255, 255" /> 19<LabelSelectedColor value="255, 255, 255, 255" /> <!-- Color for mouseovered clickable labels, e.g. version info on the login screen -->
19<LabelSelectedDisabledColor value="164, 190, 237, 128" /> 20<LabelSelectedDisabledColor value="164, 190, 237, 128" />
20<LabelTextColor value="147, 169, 213, 255" /> 21<LabelTextColor value="147, 169, 213, 255" /> <!-- Color for window labels and titles -->
21 22
22<!-- LOGIN --> 23<!-- LOGIN -->
23<LoginProgressBarBgColor value="255, 255, 255, 255" /> 24<LoginProgressBarBgColor value="255, 255, 255, 255" /> <!-- Login progress bar background -->
24<LoginProgressBarFgColor value="255, 255, 255, 255" /> 25<LoginProgressBarFgColor value="255, 255, 255, 255" /> <!-- Login progress bar -->
25<LoginProgressBoxBorderColor value="0, 30, 60, 0" /> 26<LoginProgressBoxBorderColor value="0, 30, 60, 0" /> <!-- Login progress box border -->
26<LoginProgressBoxCenterColor value="0, 0, 0, 200" /> 27<LoginProgressBoxCenterColor value="0, 0, 0, 200" /> <!-- Login progress box background -->
27<LoginProgressBoxShadowColor value="0, 0, 0, 200" /> 28<LoginProgressBoxShadowColor value="0, 0, 0, 200" /> <!-- Login progress box shadow -->
28<LoginProgressBoxTextColor value="255, 255, 255, 255"/> 29<LoginProgressBoxTextColor value="255, 255, 255, 255"/> <!-- Login progress text -->
29 30
30<!-- BUTTONS --> 31<!-- BUTTONS -->
31<ButtonLabelColor value="220, 220, 220, 255" /> <!-- Text labels for buttons, like the "OK" text --> 32<ButtonLabelColor value="220, 220, 220, 255" /> <!-- Label text color for buttons, like the "OK" text -->
32<ButtonLabelSelectedColor value="220, 220, 220, 255" /> 33<ButtonLabelSelectedColor value="220, 220, 220, 255" /> <!-- Label text color when button selected -->
33<ButtonLabelDisabledColor value="147, 169, 213, 200" /> 34<ButtonLabelDisabledColor value="147, 169, 213, 200" /> <!-- Label text color when button disabled -->
34<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200" /> 35<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200" /> <!-- Label text color when button disabled but selected -->
35<ButtonSelectedBgColor value="62, 62, 62, 255" /> 36<ButtonSelectedBgColor value="62, 62, 62, 255" /> <!-- Not used -->
36<ButtonSelectedColor value="255, 255, 255, 255" /> 37<ButtonSelectedColor value="255, 255, 255, 255" /> <!-- Not used -->
37<ButtonUnselectedBgColor value="62, 62, 62, 255" /> 38<ButtonUnselectedBgColor value="62, 62, 62, 255" /> <!-- Not used -->
38<ButtonUnselectedFgColor value="255, 255, 255, 255" /> 39<ButtonUnselectedFgColor value="255, 255, 255, 255" /> <!-- Not used -->
39<ButtonBorderColor value="239, 156, 0, 255" /> 40<ButtonBorderColor value="239, 156, 0, 255" /> <!-- Not used -->
40<ButtonFlashBgColor value="255, 190, 62, 127" /> 41<ButtonFlashBgColor value="255, 190, 62, 127" /> <!-- Color of tab flashing on incoming IM -->
41<ButtonColor value="255, 255, 255, 255" /> <!-- Blended with button art, usually left as opaque white --> 42<ButtonColor value="255, 255, 255, 255" /> <!-- Blended with button art, usually left as opaque white -->
42<ButtonImageColor value="255, 255, 255, 255" /> <!-- Blended with button art, usually left as opaque white --> 43<ButtonImageColor value="255, 255, 255, 255" /> <!-- Button color override (also checkboxes and scroll arrows).
43 44 Blended with button art, usually left as opaque white -->
44<!-- SLIDERS --> 45
45<SliderDisabledThumbColor value="0, 0, 0, 255" /> 46<!-- SLIDERS, single line -->
46<SliderThumbCenterColor value="200, 200, 200, 255" /> 47<SliderDisabledThumbColor value="0, 0, 0, 255" /> <!-- Not used -->
47<SliderThumbOutlineColor value="255, 255, 255, 255" /> 48<SliderThumbCenterColor value="200, 200, 200, 255" /> <!-- Unfocused slider thumb color -->
48<SliderTrackColor value="255, 255, 255, 255" /> 49<SliderThumbOutlineColor value="255, 255, 255, 255" /> <!-- Focused slider thumb color -->
49 50<SliderTrackColor value="255, 255, 255, 255" /> <!-- Not used -->
51
52<!-- SLIDERS, multi line (as in the sky editor) -->
53<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/> <!-- Not used -->
54<MultiSliderThumbCenterColor value="183, 184, 188, 255"/> <!-- Not used -->
55<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/> <!-- Not used -->
56<MultiSliderTrackColor value="30, 30, 30, 255"/> <!-- Not used -->
57<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> <!-- Not used -->
58<MultiSliderTriangleColor value="255, 255, 50, 255"/> <!-- Not used -->
59
50<!-- TEXTFIELDS --> 60<!-- TEXTFIELDS -->
51<TextBgFocusColor value="200, 209, 204, 255" /> <!-- Text field background when receiving input (focused) --> 61<TextBgFocusColor value="200, 209, 204, 255" /> <!-- Text field background when receiving input (focused) -->
52<TextBgReadOnlyColor value="62, 62, 62, 160" /> <!-- Text field background when read-only --> 62<TextBgReadOnlyColor value="62, 62, 62, 160" /> <!-- Text field background when read-only -->
53<TextBgWriteableColor value="200, 209, 204, 230" /> <!-- Text field background when not receiving input (unfocused) --> 63<TextBgWriteableColor value="200, 209, 204, 230" /> <!-- Text field background when not receiving input (unfocused) -->
54<TextCursorColor value="0, 0, 0, 255" /> 64<TextCursorColor value="0, 0, 0, 255" /> <!-- Cursor color in notecards and scripts only -->
55<TextFgColor value="0, 0, 0, 255" /> 65<TextFgColor value="0, 0, 0, 255" /> <!-- Text color for all text entry fields; cursor color for line editors -->
56<TextFgReadOnlyColor value="255, 255, 255, 200" /> 66<TextFgReadOnlyColor value="255, 255, 255, 200" /> <!-- Text color in read-only fields -->
57<TextFgTentativeColor value="0, 0, 0, 128" /> 67<TextFgTentativeColor value="0, 0, 0, 128" /> <!-- Initial entry in text entry fields, e.g. "Click here to chat." -->
58<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- i.e. About Land name that you don't own --> 68<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
59<TextEmbeddedItemColor value="0, 0, 128, 255" /> 69<TextEmbeddedItemColor value="0, 0, 128, 255" /> <!-- Text of items embedded in notecards -->
60<TextDefaultColor value="0, 20, 0, 255"/> 70<TextDefaultColor value="0, 20, 0, 255"/> <!-- Non-keyword text in the script editor -->
61 71<ScriptBgReadOnlyColor value="100, 100, 100, 255" /> <!-- Not used -->
72
62<!-- LISTBOXES --> 73<!-- LISTBOXES -->
63<ScrollBgReadOnlyColor value="200, 209, 204, 255" /> 74<ScrollBgReadOnlyColor value="200, 209, 204, 255" /> <!-- Background of read only lists -->
64<ScrollBgWriteableColor value="200, 209, 204, 255" /> 75<ScrollBgWriteableColor value="200, 209, 204, 255" /> <!-- Background of editable lists, e.g. groups-->
65<ScrollBGStripeColor value="100, 100, 100, 40" /> 76<ScrollBGStripeColor value="100, 100, 100, 40" /> <!-- Background stripes in sortable lists, e.g. Events Search -->
66<ScrollDisabledColor value="128, 128, 128, 204" /> 77<ScrollDisabledColor value="128, 128, 128, 204" />
67<ScrollSelectedBGColor value="100, 100, 188, 150" /> 78<ScrollSelectedBGColor value="100, 100, 188, 150" /> <!-- Selected item in a list highlight -->
68<ScrollSelectedFGColor value="0, 0, 0, 204" /> <!-- Text color --> 79<ScrollSelectedFGColor value="0, 0, 0, 204" /> <!-- Text color -->
69<ScrollUnselectedColor value="0, 0, 0, 204" /> <!-- Text color --> 80<ScrollUnselectedColor value="0, 0, 0, 204" /> <!-- Text color -->
70<ScrollHighlightedColor value="183, 184, 188, 128" /> <!-- Hover color --> 81<ScrollHighlightedColor value="183, 184, 188, 128" /> <!-- Hover color -->
71<ScrollbarThumbColor value="60, 76, 124, 255" /> <!-- Scroll bar--> 82<ScrollbarThumbColor value="60, 76, 124, 255" /> <!-- Scroll bar -->
72<ScrollbarTrackColor value="153, 154, 158, 255" /> <!-- Scroll bar background--> 83<ScrollbarTrackColor value="153, 154, 158, 255" /> <!-- Scroll bar background -->
73 84
74<!-- MENUS --> 85<!-- MENUS -->
75<MenuBarBgColor value="62, 62, 62, 255" /> 86<MenuBarBgColor value="62, 62, 62, 255" /> <!-- Menu bar background -->
76<MenuBarGodBgColor value="62, 128, 62, 255" /> 87<MenuBarGodBgColor value="62, 128, 62, 255" /> <!-- Menu bar background with God Mode enabled -->
77<MenuNonProductionGodBgColor value="0, 128, 0, 255" /> 88<MenuNonProductionGodBgColor value="0, 128, 0, 255" /> <!-- Beta viewer menu bar background -->
78<MenuNonProductionBgColor value="128, 0, 0, 255" /> 89<MenuNonProductionBgColor value="128, 0, 0, 255" /> <!-- Beta viewer menu bar background with God Mode enabled -->
79<MenuDefaultBgColor value="0, 0, 0, 255" /> 90<MenuDefaultBgColor value="0, 0, 0, 255" /> <!-- Menu background -->
80<MenuItemDisabledColor value="133, 133, 164, 128" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) --> 91<MenuItemDisabledColor value="133, 133, 164, 128" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
81<MenuItemEnabledColor value="255, 255, 255, 255" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) --> 92<MenuItemEnabledColor value="255, 255, 255, 255" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
82<MenuItemHighlightBgColor value="183, 184, 188, 100" /> 93<MenuItemHighlightBgColor value="183, 184, 188, 100" /> <!-- Highlighted menu item background color -->
83<MenuItemHighlightFgColor value="255, 255, 255, 255" /> <!-- Highlighted menu text color; also treeview node selection highlight --> 94<MenuItemHighlightFgColor value="255, 255, 255, 255" /> <!-- Highlighted menu item text color; also treeview node selection highlight -->
84<MenuPopupBgColor value="0, 0, 0, 255" /> 95<MenuPopupBgColor value="0, 0, 0, 255" /> <!-- Right-click menu background -->
85 96
86<!-- PIE MENUS --> 97<!-- PIE MENUS -->
87<PieMenuBgColor value="62, 62, 62, 150" /> 98<PieMenuBgColor value="62, 62, 62, 150" /> <!-- Color of pie menu -->
88<PieMenuLineColor value="0, 0, 0, 128" /> 99<PieMenuLineColor value="0, 0, 0, 128" /> <!-- Color of pie menu slice separators -->
89<PieMenuSelectedColor value="183, 184, 188, 77" /> 100<PieMenuSelectedColor value="183, 184, 188, 77" /> <!-- Color of pie menu slice when selected -->
90 101
102<!-- MENU BAR -->
103<ParcelTextColor value="144, 165, 208, 255" /> <!-- Parcel name on menu bar, normal state -->
104<ParcelHoverColor value="255, 255, 255, 255" /> <!-- Parcel name on menu bar, hover state -->
105<TimeTextColor value="255, 255, 255, 255" /> <!-- SL Time on menu bar -->
106<BalanceTextColor value="0, 255, 0, 255" /> <!-- Linden dollar balance on menu bar -->
107<HealthTextColor value="255, 255, 255, 255" /> <!-- Damage meter text on menu bar -->
108
91<!-- TOOLTIPS --> 109<!-- TOOLTIPS -->
92<ToolTipBgColor value="183, 184, 188, 200" /> 110<ToolTipBgColor value="183, 184, 188, 200" /> <!-- Tool tips, i.e. "Hover Tips" -->
93<ToolTipBorderColor value="171, 212, 245, 255" /> 111<ToolTipBorderColor value="171, 212, 245, 255" /> <!-- Not used -->
94<ToolTipTextColor value="0, 0, 0, 255" /> 112<ToolTipTextColor value="0, 0, 0, 255" /> <!-- Tool tips text color -->
95 113
96<!-- NOTIFICATION POP-UPS --> 114<!-- NOTIFICATION POP-UPS -->
97<NotifyBoxColor value="70, 170, 255, 255" /> 115<NotifyBoxColor value="70, 170, 255, 255" /> <!-- Notification background, i.e. tp requests -->
98<NotifyTextColor value="0, 0, 0, 255" /> 116<NotifyTextColor value="0, 0, 0, 255" /> <!-- Notification text -->
99<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts --> 117<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution permissions prompts -->
100<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts --> 118<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution permissions prompts -->
101<GroupNotifyBoxColor value="70, 170, 255, 255" /> 119<GroupNotifyBoxColor value="70, 170, 255, 255" /> <!-- Group notices background -->
102<GroupNotifyTextColor value="0, 30, 60, 255" /> 120<GroupNotifyTextColor value="0, 30, 60, 255" /> <!-- Group notices text -->
103 121
122<!-- ALERT BOX COLORS -->
123<AlertBoxColor value="62, 62, 62, 255" /> <!-- Alert floaters, like the warning before returning objects -->
124<AlertTextColor value="147, 169, 213, 255" /> <!-- Alert floater text -->
125<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
126<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
127
104<!-- CHAT AND IM HISTORY TEXTBOX COLORS --> 128<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
105<ChatHistoryBgColor value="0, 0, 0, 0" /> 129<ChatHistoryBgColor value="0, 0, 0, 0" /> <!-- Local Chat background -->
106<ChatHistoryTextColor value="255, 255, 255, 255" /> 130<ChatHistoryTextColor value="255, 255, 255, 255" /> <!-- Local Chat text -->
107<IMHistoryBgColor value="0, 30, 80, 200" /> 131<IMHistoryBgColor value="0, 30, 80, 200" /> <!-- Instant Message background -->
108<IMHistoryTextColor value="255, 255, 255, 255" /> 132<IMHistoryTextColor value="255, 255, 255, 255" /> <!-- Instant Message text -->
109 133
110<!-- IN-WORLD SELECTION --> 134<!-- IN-WORLD SELECTION -->
111<SilhouetteParentColor value="255, 255, 0, 255" /> 135<SilhouetteParentColor value="255, 255, 0, 255" /> <!-- Root prim selection outline -->
112<SilhouetteChildColor value="32, 106, 196, 255" /> 136<SilhouetteChildColor value="32, 106, 196, 255" /> <!-- Child prim selection outline -->
113<HighlightParentColor value="171, 212, 245, 255" /> 137<HighlightParentColor value="171, 212, 245, 255" />
114<HighlightChildColor value="171, 212, 245, 255" /> 138<HighlightChildColor value="171, 212, 245, 255" />
115<HighlightInspectColor value="255, 0, 255, 255" /> 139<HighlightInspectColor value="255, 0, 255, 255" /> <!-- Selection outline when inspecting -->
116 140
117<!-- EDIT MODE GRID --> 141<!-- EDIT MODE GRID -->
118<GridFocusPointColor value="255, 255, 255, 128" /> 142<GridFocusPointColor value="255, 255, 255, 128" /> <!-- Not used -->
119<GridlineColor value="255, 255, 255, 255" /> 143<GridlineColor value="255, 255, 255, 255" /> <!-- Grid color -->
120<GridlineBGColor value="235, 235, 255, 200" /> 144<GridlineBGColor value="235, 235, 255, 200" /> <!-- Grid background color -->
121<GridlineShadowColor value="0, 0, 0, 80" /> 145<GridlineShadowColor value="0, 0, 0, 80" /> <!-- Grid drop shadow -->
122 146
123<!-- PROPERTY LINES --> 147<!-- PROPERTY LINES -->
124<PropertyColorAvail value="0, 0, 0, 0" /> 148<PropertyColorAvail value="0, 0, 0, 0" />
125<PropertyColorGroup value="0, 184, 184, 102" /> 149<PropertyColorGroup value="0, 184, 184, 102" /> <!-- Property group owns -->
126<PropertyColorOther value="255, 0, 0, 102" /> 150<PropertyColorOther value="255, 0, 0, 102" /> <!-- Property others own -->
127<PropertyColorSelf value="0, 255, 0, 102" /> 151<PropertyColorSelf value="0, 255, 0, 102" /> <!-- Property you own -->
128<PropertyColorForSale value="255, 128, 0, 102" /> 152<PropertyColorForSale value="255, 128, 0, 102" /> <!-- Property for sale -->
129<PropertyColorAuction value="128, 0, 255, 102" /> <!-- Match the color on the world map --> 153<PropertyColorAuction value="128, 0, 255, 102" /> <!-- Match the color on the world map -->
130 154
131<!-- Icon Enable/Disable --> 155<!-- MEDIA ICONS -->
132<IconEnabledColor value="255, 255, 255, 255"/> 156<IconEnabledColor value="255, 255, 255, 255"/> <!-- Media/music icon enabled -->
133<IconDisabledColor value="147, 169, 213, 200"/> 157<IconDisabledColor value="147, 169, 213, 200"/> <!-- Media/music icon disabled -->
134 158
135<!-- MINI-MAP --> 159<!-- MINI-MAP -->
136<NetMapBackgroundColor value="0, 0, 0, 77" /> 160<NetMapBackgroundColor value="0, 0, 0, 77" /> <!-- Mini-map floater background -->
137<NetMapYouOwnAboveWater value="0, 255, 255, 255" /> 161<NetMapYouOwnAboveWater value="0, 255, 255, 255" /> <!-- Objects owned by you above water -->
138<NetMapYouOwnBelowWater value="0, 200, 200, 255" /> 162<NetMapYouOwnBelowWater value="0, 200, 200, 255" /> <!-- Objects owned by you below water -->
139<NetMapGroupOwnAboveWater value="255, 0, 255, 255" /> 163<NetMapGroupOwnAboveWater value="255, 0, 255, 255" /> <!-- Group owned objects above water -->
140<NetMapGroupOwnBelowWater value="200, 0, 200, 255" /> 164<NetMapGroupOwnBelowWater value="200, 0, 200, 255" /> <!-- Group owned objects below water -->
141<NetMapOtherOwnAboveWater value="60, 60, 60, 255" /> 165<NetMapOtherOwnAboveWater value="60, 60, 60, 255" /> <!-- Objects owned by others above water -->
142<NetMapOtherOwnBelowWater value="30, 30, 30, 255" /> 166<NetMapOtherOwnBelowWater value="30, 30, 30, 255" /> <!-- Objects owned by others below water -->
143 167<NetMapGlyphColorAvatar value="0, 255, 0, 255" /> <!-- Also the color of avatar glyphs on the map -->
168<NetMapGlyphColorFriend value="255, 255, 0, 255" />
169
170<!-- INVENTORY -->
171<InventoryBackgroundColor value="62, 62, 62, 80"/> <!-- Inventory floater background -->
172<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/> <!-- "loading..." -->
173<InventoryItemSuffixColor value="191, 216, 216, 255"/> <!-- "worn", "no modify", etc -->
174<FilterBackgroundColor value="0, 0, 20, 255" /> <!-- Inventory search background -->
175<FilterTextColor value="255, 200, 70, 255" /> <!-- Inventory search text -->
176<InventorySearchStatusColor value="255, 255, 255, 255" /> <!-- "Searching..." -->
177
144<!-- HELP WINDOW --> 178<!-- HELP WINDOW -->
145<HelpBgColor value="200, 209, 204, 255" /> 179<HelpBgColor value="200, 209, 204, 255" />
146<HelpFgColor value="0, 0, 0, 255" /> 180<HelpFgColor value="0, 0, 0, 255" />
@@ -150,40 +184,13 @@
150<HelpScrollShadowColor value="0, 0, 0, 255" /> 184<HelpScrollShadowColor value="0, 0, 0, 255" />
151 185
152<!-- MISC --> 186<!-- MISC -->
153<AvatarNameColor value="251, 175, 93, 255" /> <!-- Text color of avatar nametags --> 187<AvatarNameColor value="251, 175, 93, 255" /> <!-- Text color of avatar nametags -->
154<FocusColor value="239, 156, 0, 255" /> <!-- Color of the glow around UI controls with keyboard focus --> 188<FocusColor value="239, 156, 0, 255" /> <!-- Color of the glow around UI controls with keyboard focus -->
155<FloaterButtonImageColor value="239, 156, 0, 255" /> <!-- The floater buttons (like the close box) are white images that receive this color. --> 189<FloaterButtonImageColor value="239, 156, 0, 255" /> <!-- The floater buttons (like the close box) are white images that receive this color. -->
156<ButtonCautionImageColor value="255, 255, 255, 255" /> <!-- Match the caution dialog buttons to the default --> 190<ButtonCautionImageColor value="255, 255, 255, 255" /> <!-- Match the caution dialog buttons to the default -->
157<HealthTextColor value="255, 255, 255, 255" />
158<MapAutopilotColor value="255, 128, 0, 255" /> 191<MapAutopilotColor value="255, 128, 0, 255" />
159<ContextSilhouetteColor value="239, 156, 0, 255" /> <!-- For "context" highlighting, i.e. pie menu --> 192<ContextSilhouetteColor value="239, 156, 0, 255" /> <!-- For "context" highlighting, i.e. pie menu -->
160<ScriptBgReadOnlyColor value="100, 100, 100, 255" /> 193<GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window -->
161<ParcelTextColor value="144, 165, 208, 255" /> <!-- Parcel name on menu bar, normal state --> 194<ConsoleBackground value="0, 0, 0, 255" /> <!-- Background for inworld chat -->
162<ParcelHoverColor value="255, 255, 255, 255" /> <!-- Parcel name on menu bar, hover state --> 195
163<TimeTextColor value="255, 255, 255, 255" /> <!-- SL Time on menu bar -->
164<BalanceTextColor value="0, 255, 0, 255" /> <!-- Linden dollar balance on menu bar -->
165<HealthTextColor value="255, 255, 255, 255" /> <!-- Damage meter text on menu bar -->
166<GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window -->
167<FilterBackgroundColor value="0, 0, 20, 255" /> <!-- Matching region of Inventory search text -->
168<FilterTextColor value="255, 200, 70, 255" />
169<InventoryItemSuffixColor value="191, 216, 216, 255" /> <!-- "worn", "no modify", etc-->
170<InventorySearchStatusColor value="255, 255, 255, 255" />
171<ConsoleBackground value="0, 0, 0, 255" />
172<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/> <!-- "loading..." in the inv -->
173<InventoryBackgroundColor value="62, 62, 62, 80"/>
174
175<!-- Alert box colors -->
176<AlertBoxColor value="62, 62, 62, 255" /> <!-- Warnings floaters, like when returning objects -->
177<AlertTextColor value="147, 169, 213, 255" />
178<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
179<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
180
181<!-- Multi sliders, as in the sky animation setting -->
182<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
183<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
184<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
185<MultiSliderTrackColor value="30, 30, 30, 255"/>
186<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
187<MultiSliderTriangleColor value="255, 255, 50, 255"/>
188
189</settings> 196</settings>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index c3058c4..076598c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -36,9 +36,12 @@
36 </string> 36 </string>
37 <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5" 37 <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5"
38 name="profile_callee_btn" width="80" /> 38 name="profile_callee_btn" width="80" />
39 <button bottom_delta="0" follows="left|top" font="SansSerif"
40 halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
41 mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
39 <button bottom="-40" follows="left|top" halign="center" height="20" 42 <button bottom="-40" follows="left|top" halign="center" height="20"
40 image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" 43 image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
41 label="Call" left_delta="85" name="start_call_btn" width="100" /> 44 label="Call" left_delta="107" name="start_call_btn" width="100" />
42 <button bottom="-40" follows="left|top" halign="center" height="20" 45 <button bottom="-40" follows="left|top" halign="center" height="20"
43 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" 46 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
44 label="End Call" left_delta="0" name="end_call_btn" pad_right="10" 47 label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
@@ -51,9 +54,6 @@
51 image_unselected="icn_speaker_dark.tga" label="" left_delta="56" 54 image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
52 name="mute_btn" tool_tip="Mute voice" width="25" /> 55 name="mute_btn" tool_tip="Mute voice" width="25" />
53 </panel> 56 </panel>
54 <button bottom_delta="0" follows="right|top" font="SansSerif"
55 halign="center" bottom ="-40" height="20" label="Offer Teleport" right="-5"
56 mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
57 <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" 57 <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
58 bottom="30" embedded_items="false" enabled="false" 58 bottom="30" embedded_items="false" enabled="false"
59 follows="left|top|right|bottom" font="SansSerif" height="221" left="5" 59 follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 5b2d310..077ab23 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -12,9 +12,11 @@
12 <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload" 12 <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
13 left_delta="65" name="reload" width="70" /> 13 left_delta="65" name="reload" width="70" />
14 <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20" 14 <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
15 left_delta="75" max_chars="255" name="address" width="280" /> 15 left_delta="75" max_chars="235" name="address" width="225" />
16 <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go" 16 <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
17 left_delta="285" name="go" width="55" /> 17 left_delta="230" name="go" width="55" />
18 <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home"
19 left_delta="60" name="home" width="55" />
18 </layout_panel> 20 </layout_panel>
19 <layout_panel auto_resize="false" bottom="0" height="20" left="0" 21 <layout_panel auto_resize="false" bottom="0" height="20" left="0"
20 name="parcel_owner_controls" user_resize="false" width="540"> 22 name="parcel_owner_controls" user_resize="false" width="540">
@@ -30,6 +32,8 @@
30 <check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20" 32 <check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
31 label="Always open in my web browser" left_delta="190" name="open_always" 33 label="Always open in my web browser" left_delta="190" name="open_always"
32 width="200" /> 34 width="200" />
35 <button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set Home To Here"
36 left="-265" name="set_home" width="155" />
33 <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70" 37 <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
34 name="close" width="70" /> 38 name="close" width="70" />
35 </layout_panel> 39 </layout_panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index d7ff80b..8d06657 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -1,33 +1,33 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right" 2<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
3 height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true" 3 height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
4 tear_off="false" width="802"> 4 tear_off="false" width="802">
5 <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true" 5 <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
6 height="263" label="File" left="0" mouse_opaque="false" name="File" 6 height="263" label="File" left="0" mouse_opaque="false" name="File"
7 opaque="true" tear_off="false" width="243"> 7 opaque="true" tear_off="false" width="243">
8 <menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0" 8 <menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"
9 mouse_opaque="true" name="Quit" shortcut="control|Q" width="243"> 9 mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
10 <on_click function="File.Quit" userdata="" /> 10 <on_click function="File.Quit" userdata="" />
11 </menu_item_call> 11 </menu_item_call>
12 </menu> 12 </menu>
13 <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true" 13 <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
14 height="439" label="Edit" left="38" mouse_opaque="false" name="Edit" 14 height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
15 opaque="true" tear_off="false" width="153"> 15 opaque="true" tear_off="false" width="153">
16 <menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0" 16 <menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"
17 mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153"> 17 mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
18 <on_click function="ShowFloater" userdata="preferences" /> 18 <on_click function="ShowFloater" userdata="preferences" />
19 </menu_item_call> 19 </menu_item_call>
20 </menu> 20 </menu>
21 <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true" 21 <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
22 height="317" label="Help" left="80" mouse_opaque="false" name="Help" 22 height="317" label="Help" left="80" mouse_opaque="false" name="Help"
23 opaque="true" tear_off="false" width="166"> 23 opaque="true" tear_off="false" width="166">
24 <menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0" 24 <menu_item_call bottom="-29" enabled="true" height="19" label="Viewer Help" left="0"
25 mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166"> 25 mouse_opaque="true" name="Viewer Help" shortcut="F1" width="166">
26 <on_click function="ShowFloater" userdata="help f1" /> 26 <on_click function="ShowFloater" userdata="help f1" />
27 </menu_item_call> 27 </menu_item_call>
28 <menu_item_call bottom="-48" enabled="true" height="19" label="About Second Life..." left="0" 28 <menu_item_call bottom="-48" enabled="true" height="19" label="About Imprudence..." left="0"
29 mouse_opaque="true" name="About Second Life..." width="166"> 29 mouse_opaque="true" name="About Imprudence..." width="166">
30 <on_click function="ShowFloater" userdata="about" /> 30 <on_click function="ShowFloater" userdata="about" />
31 </menu_item_call> 31 </menu_item_call>
32 </menu> 32 </menu>
33</menu_bar> 33</menu_bar>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 71044a0..682acb9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -271,6 +271,11 @@
271 <on_enable function="View.EnableLastChatter" /> 271 <on_enable function="View.EnableLastChatter" />
272 </menu_item_call> 272 </menu_item_call>
273 <menu_item_separator /> 273 <menu_item_separator />
274 <menu_item_call name="Web Browser" label="Web Browser"
275 shortcut="control|B">
276 <on_click function="ShowFloater" userdata="inworld browser" />
277 </menu_item_call>
278 <menu_item_separator />
274 <menu_item_check name="Toolbar" label="Toolbar"> 279 <menu_item_check name="Toolbar" label="Toolbar">
275 <on_click function="ShowFloater" userdata="toolbar" /> 280 <on_click function="ShowFloater" userdata="toolbar" />
276 <on_check function="FloaterVisible" userdata="toolbar" /> 281 <on_check function="FloaterVisible" userdata="toolbar" />
@@ -360,9 +365,9 @@
360 <on_click function="View.HighlightTransparent" userdata="" /> 365 <on_click function="View.HighlightTransparent" userdata="" />
361 <on_check function="View.CheckHighlightTransparent" /> 366 <on_check function="View.CheckHighlightTransparent" />
362 </menu_item_check> 367 </menu_item_check>
363 <menu_item_check name="Beacons Always On" label="Beacons Always On"> 368 <menu_item_check name="Beacons Always On" label="Show Beacons">
364 <on_click function="ToggleControl" userdata="BeaconAlwaysOn" /> 369 <on_click function="ToggleControl" userdata="BeaconsEnabled" />
365 <on_check control="BeaconAlwaysOn" /> 370 <on_check control="BeaconsEnabled" />
366 </menu_item_check> 371 </menu_item_check>
367 <menu name="Beacons" create_jump_keys="true" label="Beacons" 372 <menu name="Beacons" create_jump_keys="true" label="Beacons"
368 opaque="true" tear_off="true"> 373 opaque="true" tear_off="true">
@@ -608,6 +613,12 @@
608 userdata="movable" /> 613 userdata="movable" />
609 <on_check control="SelectMovableOnly" /> 614 <on_check control="SelectMovableOnly" />
610 </menu_item_check> 615 </menu_item_check>
616 <menu_item_check name="Select Only Copyable Objects"
617 label="Select Only Copyable Objects">
618 <on_click function="Tools.SelectOnlyCopyableObjects"
619 userdata="copyable" />
620 <on_check control="SelectCopyableOnly" />
621 </menu_item_check>
611 <menu_item_check name="Select By Surrounding" 622 <menu_item_check name="Select By Surrounding"
612 label="Select By Surrounding"> 623 label="Select By Surrounding">
613 <on_click function="Tools.SelectBySurrounding" 624 <on_click function="Tools.SelectBySurrounding"
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 6af19ee..d207a74 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -579,6 +579,9 @@ to his or her location:
579 <option name="Decline"> 579 <option name="Decline">
580 Decline 580 Decline
581 </option> 581 </option>
582 <option name="Ignore">
583 Ignore
584 </option>
582 </notify> 585 </notify>
583 <notify name="OfferFriendshipNoMessage" tip="false"> 586 <notify name="OfferFriendshipNoMessage" tip="false">
584 <message name="message"> 587 <message name="message">
@@ -593,6 +596,9 @@ see each other&apos;s online status.)
593 <option name="Decline"> 596 <option name="Decline">
594 Decline 597 Decline
595 </option> 598 </option>
599 <option name="Ignore">
600 Ignore
601 </option>
596 </notify> 602 </notify>
597 <notify name="FriendshipAccepted" tip="false"> 603 <notify name="FriendshipAccepted" tip="false">
598 <message name="message"> 604 <message name="message">
@@ -616,6 +622,9 @@ so you can quickly IM this resident.
616 <option name="Decline"> 622 <option name="Decline">
617 Decline 623 Decline
618 </option> 624 </option>
625 <option name="Ignore">
626 Ignore
627 </option>
619 </notify> 628 </notify>
620 <notify name="RegionRestartMinutes" tip="false"> 629 <notify name="RegionRestartMinutes" tip="false">
621 <message name="message"> 630 <message name="message">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 6fa099e..c47985b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -25,15 +25,15 @@
25 label="IM/Call" left_delta="0" name="IM" 25 label="IM/Call" left_delta="0" name="IM"
26 tool_tip="Open Instant Message session" width="80" /> 26 tool_tip="Open Instant Message session" width="80" />
27 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 27 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
28 label="Info" name="Info" width="80" />
29 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
30 label="Activate" name="Activate" width="80" /> 28 label="Activate" name="Activate" width="80" />
31 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 29 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
32 label="Leave" name="Leave" width="80" /> 30 label="Invite..." name="Invite..." width="80" />
31 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
32 label="Info" name="Info" width="80" />
33 <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22" 33 <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
34 label="Create..." name="Create" width="80" /> 34 label="Create..." name="Create" width="80" />
35 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 35 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
36 label="Search..." name="Search..." width="80" /> 36 label="Search..." name="Search..." width="80" />
37 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 37 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
38 label="Invite..." name="Invite..." width="80" /> 38 label="Leave" name="Leave" width="80" />
39</panel> 39</panel>
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 19b6013..623b800 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -1,188 +1,196 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<settings version = "101"> 2<settings version = "101">
3 3<!-- Additional comments by McCabe Maxsted -->
4<!-- WINDOWS --> 4
5<TitleBarFocusColor value="50, 115, 185, 120" /> <!-- Focused window title bar highlight, no equivalent for unfocused windows --> 5<!-- WINDOWS -->
6<FloaterFocusBorderColor value="50, 115, 185, 75" /> 6<TitleBarFocusColor value="50, 115, 185, 120" /> <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
7<FloaterUnfocusBorderColor value="110, 110, 110, 60" /> 7<FloaterFocusBorderColor value="50, 115, 185, 75" /> <!-- Focused window border color -->
8<FocusBackgroundColor value="165, 180, 200, 245" /> <!-- Background color of focused floaters --> 8<FloaterUnfocusBorderColor value="110, 110, 110, 60" /> <!-- Unfocused window border color -->
9<DefaultBackgroundColor value="165, 180, 200, 128" /> <!-- Background color for unfocused floaters --> 9<FocusBackgroundColor value="165, 180, 200, 245" /> <!-- Background color of focused windows -->
10<ColorDropShadow value="0, 0, 0, 200" /> <!-- The drop shadow behind windows and menus --> 10<DefaultBackgroundColor value="165, 180, 200, 128" /> <!-- Background color for unfocused windows -->
11<DefaultHighlightDark value="50, 115, 185, 255" /> 11<ColorDropShadow value="0, 0, 0, 200" /> <!-- The drop shadow behind windows and menus -->
12<DefaultHighlightLight value="50, 115, 185, 255" /> 12<DefaultHighlightDark value="50, 115, 185, 255" />
13<DefaultShadowDark value="50, 115, 185, 255" /> 13<DefaultHighlightLight value="50, 115, 185, 255" /> <!-- Unfocused border, bottom portion -->
14<DefaultShadowLight value="50, 115, 185, 255" /> 14<DefaultShadowDark value="50, 115, 185, 255" /> <!-- Unfocused border, top portion -->
15 15<DefaultShadowLight value="50, 115, 185, 255" /> <!-- Tab area border for IMs -->
16<!-- LABELS --> 16
17<LabelDisabledColor value="0, 30, 60, 128" /> 17<!-- WINDOW LABELS -->
18<LabelSelectedColor value="255, 255, 255, 255" /> 18<LabelDisabledColor value="0, 30, 60, 128" /> <!-- Color for unfocused window titles -->
19<LabelSelectedDisabledColor value="164, 190, 237, 128" /> 19<LabelSelectedColor value="255, 255, 255, 255" /> <!-- Color for mouseovered clickable labels, e.g. version info on the login screen -->
20<LabelTextColor value="0, 30, 60, 255" /> 20<LabelSelectedDisabledColor value="164, 190, 237, 128" />
21 21<LabelTextColor value="0, 30, 60, 255" /> <!-- Color for window labels and titles -->
22<!-- LOGIN --> 22
23<LoginProgressBarBgColor value="255, 255, 255, 255" /> 23<!-- LOGIN -->
24<LoginProgressBarFgColor value="255, 255, 255, 255" /> 24<LoginProgressBarBgColor value="255, 255, 255, 255" /> <!-- Login progress bar background -->
25<LoginProgressBoxBorderColor value="0, 30, 60, 0" /> 25<LoginProgressBarFgColor value="255, 255, 255, 255" /> <!-- Login progress bar -->
26<LoginProgressBoxCenterColor value="0, 0, 0, 200" /> 26<LoginProgressBoxBorderColor value="0, 30, 60, 0" /> <!-- Login progress box border -->
27<LoginProgressBoxShadowColor value="0, 0, 0, 200" /> 27<LoginProgressBoxCenterColor value="0, 0, 0, 200" /> <!-- Login progress box background -->
28<LoginProgressBoxTextColor value="255, 255, 255, 255"/> 28<LoginProgressBoxShadowColor value="0, 0, 0, 200" /> <!-- Login progress box shadow -->
29 29<LoginProgressBoxTextColor value="255, 255, 255, 255"/> <!-- Login progress text -->
30<!-- BUTTONS --> 30
31<ButtonLabelColor value="0, 30, 60, 255" /> <!-- Text labels for buttons, like the "OK" text --> 31<!-- BUTTONS -->
32<ButtonLabelSelectedColor value="255, 255, 255, 255" /> 32<ButtonLabelColor value="0, 30, 60, 255" /> <!-- Label text color for buttons, like the "OK" text -->
33<ButtonLabelDisabledColor value="0, 30, 60, 128" /> 33<ButtonLabelSelectedColor value="255, 255, 255, 255" /> <!-- Label text color when button selected -->
34<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" /> 34<ButtonLabelDisabledColor value="0, 30, 60, 128" /> <!-- Label text color when button disabled -->
35<ButtonSelectedBgColor value="62, 62, 62, 255" /> 35<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" /> <!-- Label text color when button disabled but selected -->
36<ButtonSelectedColor value="255, 255, 255, 255" /> 36<ButtonSelectedBgColor value="62, 62, 62, 255" /> <!-- Not used -->
37<ButtonUnselectedBgColor value="62, 62, 62, 255" /> 37<ButtonSelectedColor value="255, 255, 255, 255" /> <!-- Not used -->
38<ButtonUnselectedFgColor value="255, 255, 255, 255" /> 38<ButtonUnselectedBgColor value="62, 62, 62, 255" /> <!-- Not used -->
39<ButtonBorderColor value="239, 156, 0, 255" /> 39<ButtonUnselectedFgColor value="255, 255, 255, 255" /> <!-- Not used -->
40<ButtonFlashBgColor value="255, 190, 62, 127" /> 40<ButtonBorderColor value="239, 156, 0, 255" /> <!-- Not used -->
41<ButtonColor value="255, 255, 255, 255" /> <!-- Blended with button art, usually left as opaque white --> 41<ButtonFlashBgColor value="255, 190, 62, 127" /> <!-- Color of tab flashing on incoming IM -->
42<ButtonImageColor value="255, 255, 255, 255" /> <!-- Blended with button art, usually left as opaque white --> 42<ButtonColor value="255, 255, 255, 255" /> <!-- Blended with button art, usually left as opaque white -->
43 43<ButtonImageColor value="255, 255, 255, 255" /> <!-- Button color override (also checkboxes and scroll arrows).
44<!-- SLIDERS --> 44 Blended with button art, usually left as opaque white -->
45<SliderDisabledThumbColor value="0, 0, 0, 255" /> 45
46<SliderThumbCenterColor value="255, 255, 255, 255" /> 46<!-- SLIDERS, single line -->
47<SliderThumbOutlineColor value="37, 64, 99, 255" /> 47<SliderDisabledThumbColor value="0, 0, 0, 255" /> <!-- Not used -->
48<SliderTrackColor value="37, 64, 99, 255" /> 48<SliderThumbCenterColor value="255, 255, 255, 255" /> <!-- Unfocused slider thumb color -->
49 49<SliderThumbOutlineColor value="37, 64, 99, 255" /> <!-- Focused slider thumb color -->
50<!-- TEXTFIELDS --> 50<SliderTrackColor value="37, 64, 99, 255" /> <!-- Not used -->
51<TextBgFocusColor value="255, 255, 255, 255" /> <!-- Text field background when receiving input (focused) --> 51
52<TextBgReadOnlyColor value="255, 255, 255, 140" /> <!-- Text field background when read-only --> 52<!-- SLIDERS, multi line (as in the sky editor) -->
53<TextBgWriteableColor value="255, 255, 255, 255" /> <!-- Text field background when not receiving input (unfocused) --> 53<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/> <!-- Not used -->
54<TextCursorColor value="0, 0, 0, 255" /> 54<MultiSliderThumbCenterColor value="183, 184, 188, 255"/> <!-- Not used -->
55<TextFgColor value="45, 48, 45, 255" /> 55<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/> <!-- Not used -->
56<TextFgReadOnlyColor value="0, 0, 0, 200" /> 56<MultiSliderTrackColor value="30, 30, 30, 255"/> <!-- Not used -->
57<TextFgTentativeColor value="0, 0, 0, 128" /> 57<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> <!-- Not used -->
58<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- i.e. About Land name that you don't own --> 58<MultiSliderTriangleColor value="255, 255, 50, 255"/> <!-- Not used -->
59<TextEmbeddedItemColor value="0, 0, 128, 255" /> 59
60<TextDefaultColor value="0, 20, 0, 255"/> 60<!-- TEXTFIELDS -->
61 61<TextBgFocusColor value="255, 255, 255, 255" /> <!-- Text field background when receiving input (focused) -->
62<!-- LISTBOXES --> 62<TextBgReadOnlyColor value="255, 255, 255, 140" /> <!-- Text field background when read-only -->
63<ScrollBgReadOnlyColor value="255, 255, 255, 140" /> 63<TextBgWriteableColor value="255, 255, 255, 255" /> <!-- Text field background when not receiving input (unfocused) -->
64<ScrollBgWriteableColor value="255, 255, 255, 140" /> 64<TextCursorColor value="0, 0, 0, 255" /> <!-- Cursor color in notecards and scripts only -->
65<ScrollBGStripeColor value="145, 180, 220, 60" /> 65<TextFgColor value="48, 48, 45, 255" /> <!-- Text color for all text entry fields; cursor color for line editors -->
66<ScrollDisabledColor value="128, 128, 128, 204" /> 66<TextFgReadOnlyColor value="0, 0, 0, 200" /> <!-- Text color in read-only fields -->
67<ScrollSelectedBGColor value="50, 115, 185, 150" /> 67<TextFgTentativeColor value="0, 0, 0, 128" /> <!-- Initial entry in text entry fields, e.g. "Click here to chat." -->
68<ScrollSelectedFGColor value="0, 30, 60, 255" /> <!-- Text color --> 68<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
69<ScrollUnselectedColor value="0, 30, 60, 255" /> <!-- Text color --> 69<TextEmbeddedItemColor value="0, 0, 128, 255" /> <!-- Text of items embedded in notecards -->
70<ScrollHighlightedColor value="145, 180, 220, 128" /> <!-- Hover color --> 70<TextDefaultColor value="0, 20, 0, 255"/> <!-- Non-keyword text in the script editor -->
71<ScrollbarThumbColor value="120, 160, 200, 255" /> 71<ScriptBgReadOnlyColor value="180, 180, 180, 255" /> <!-- Not used -->
72<ScrollbarTrackColor value="183, 202, 220, 255" /> 72
73 73<!-- LISTBOXES -->
74<!-- MENUS --> 74<ScrollBgReadOnlyColor value="255, 255, 255, 140" /> <!-- Background of read only lists -->
75<MenuBarBgColor value="185, 200, 220, 230" /> 75<ScrollBgWriteableColor value="255, 255, 255, 140" /> <!-- Background of editable lists, e.g. groups-->
76<MenuBarGodBgColor value="100, 200, 130, 230" /> 76<ScrollBGStripeColor value="145, 180, 220, 60" /> <!-- Background stripes in sortable lists, e.g. Events Search -->
77<MenuNonProductionGodBgColor value="100, 200, 130, 230" /> 77<ScrollDisabledColor value="128, 128, 128, 204" />
78<MenuNonProductionBgColor value="230, 70, 70, 230" /> 78<ScrollSelectedBGColor value="50, 115, 185, 150" /> <!-- Selected item in a list highlight -->
79<MenuDefaultBgColor value="210, 220, 230, 245" /> 79<ScrollSelectedFGColor value="0, 30, 60, 255" /> <!-- Text color -->
80<MenuItemDisabledColor value="0, 30, 60, 128" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) --> 80<ScrollUnselectedColor value="0, 30, 60, 255" /> <!-- Text color -->
81<MenuItemEnabledColor value="0, 30, 60, 255" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) --> 81<ScrollHighlightedColor value="145, 180, 220, 128" /> <!-- Hover color -->
82<MenuItemHighlightBgColor value="50, 115, 185, 100" /> 82<ScrollbarThumbColor value="120, 160, 200, 255" /> <!-- Scroll bar -->
83<MenuItemHighlightFgColor value="0, 30, 60, 255" /> <!-- Highlighted menu text color; also treeview node selection highlight --> 83<ScrollbarTrackColor value="183, 202, 220, 255" /> <!-- Scroll bar background -->
84<MenuPopupBgColor value="197, 217, 234, 240" /> 84
85 85<!-- MENUS -->
86<!-- PIE MENUS --> 86<MenuBarBgColor value="185, 200, 220, 230" /> <!-- Menu bar background -->
87<PieMenuBgColor value="118, 156, 201, 230" /> 87<MenuBarGodBgColor value="100, 200, 130, 230" /> <!-- Menu bar background with God Mode enabled -->
88<PieMenuLineColor value="255, 255, 255, 60" /> 88<MenuNonProductionGodBgColor value="100, 200, 130, 230" /> <!-- Beta viewer menu bar background -->
89<PieMenuSelectedColor value="185, 200, 220, 120" /> 89<MenuNonProductionBgColor value="230, 70, 70, 230" /> <!-- Beta viewer menu bar background with God Mode enabled -->
90 90<MenuDefaultBgColor value="210, 220, 230, 245" /> <!-- Menu background -->
91<!-- TOOLTIPS --> 91<MenuItemDisabledColor value="0, 30, 60, 128" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
92<ToolTipBgColor value="250, 255, 225, 230" /> 92<MenuItemEnabledColor value="0, 30, 60, 255" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
93<ToolTipBorderColor value="171, 212, 245, 255" /> 93<MenuItemHighlightBgColor value="50, 115, 185, 100" /> <!-- Highlighted menu item background color -->
94<ToolTipTextColor value="0, 0, 0, 255" /> 94<MenuItemHighlightFgColor value="0, 30, 60, 255" /> <!-- Highlighted menu item text color; also treeview node selection highlight -->
95 95<MenuPopupBgColor value="197, 217, 234, 240" /> <!-- Right-click menu background -->
96<!-- NOTIFICATION POP-UPS --> 96
97<NotifyBoxColor value="170, 210, 255, 240" /> 97<!-- PIE MENUS -->
98<NotifyTextColor value="0, 30, 60, 255" /> 98<PieMenuBgColor value="118, 156, 201, 230" /> <!-- Color of pie menu -->
99<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts --> 99<PieMenuLineColor value="255, 255, 255, 60" /> <!-- Color of pie menu slice separators -->
100<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts --> 100<PieMenuSelectedColor value="185, 200, 220, 120" /> <!-- Color of pie menu slice when selected -->
101<GroupNotifyBoxColor value="170, 210, 255, 240" /> 101
102<GroupNotifyTextColor value="0, 30, 60, 255" /> 102<!-- MENU BAR -->
103 103<ParcelTextColor value="40, 40, 90, 255" /> <!-- Parcel name on menu bar, normal state -->
104<!-- CHAT AND IM HISTORY TEXTBOX COLORS --> 104<ParcelHoverColor value="70, 70, 100, 255" /> <!-- Parcel name on menu bar, hover state -->
105<ChatHistoryBgColor value="0, 30, 80, 200" /> 105<TimeTextColor value="0, 30, 60, 255" /> <!-- SL Time on menu bar -->
106<ChatHistoryTextColor value="255, 255, 255, 255" /> 106<BalanceTextColor value="0, 100, 40, 255" /> <!-- Linden dollar balance on menu bar -->
107<IMHistoryBgColor value="0, 30, 80, 200" /> 107<HealthTextColor value="110, 15, 15, 255" /> <!-- Damage meter text on menu bar -->
108<IMHistoryTextColor value="255, 255, 255, 255" /> 108
109 109<!-- TOOLTIPS -->
110<!-- IN-WORLD SELECTION --> 110<ToolTipBgColor value="250, 255, 225, 230" /> <!-- Tool tips, i.e. "Hover Tips" -->
111<SilhouetteParentColor value="255, 255, 0, 255" /> 111<ToolTipBorderColor value="171, 212, 245, 255" /> <!-- Not used -->
112<SilhouetteChildColor value="32, 106, 196, 255" /> 112<ToolTipTextColor value="0, 0, 0, 255" /> <!-- Tool tips text color -->
113<HighlightParentColor value="171, 212, 245, 255" /> 113
114<HighlightChildColor value="171, 212, 245, 255" /> 114<!-- NOTIFICATION POP-UPS -->
115<HighlightInspectColor value="255, 0, 255, 255" /> 115<NotifyBoxColor value="170, 210, 255, 240" /> <!-- Notification background, i.e. tp requests -->
116 116<NotifyTextColor value="0, 30, 60, 255" /> <!-- Notification text -->
117<!-- EDIT MODE GRID --> 117<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution permissions prompts -->
118<GridFocusPointColor value="255, 255, 255, 128" /> 118<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution permissions prompts -->
119<GridlineColor value="255, 255, 255, 255" /> 119<GroupNotifyBoxColor value="170, 210, 255, 240" /> <!-- Group notices background -->
120<GridlineBGColor value="235, 235, 255, 200" /> 120<GroupNotifyTextColor value="0, 30, 60, 255" /> <!-- Group notices text -->
121<GridlineShadowColor value="0, 0, 0, 80" /> 121
122 122<!-- ALERT BOX COLORS -->
123<!-- PROPERTY LINES --> 123<AlertBoxColor value="165, 180, 200, 245" /> <!-- Alert floaters, like the warning before returning objects -->
124<PropertyColorAvail value="0, 0, 0, 0" /> 124<AlertTextColor value="0, 30, 60, 255" /> <!-- Alert floater text -->
125<PropertyColorGroup value="0, 184, 184, 102" /> 125<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
126<PropertyColorOther value="255, 0, 0, 102" /> 126<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
127<PropertyColorSelf value="0, 255, 0, 102" /> 127
128<PropertyColorForSale value="255, 128, 0, 102" /> 128<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
129<PropertyColorAuction value="128, 0, 255, 102" /> <!-- Match the color on the world map --> 129<ChatHistoryBgColor value="0, 30, 80, 200" /> <!-- Local Chat background -->
130 130<ChatHistoryTextColor value="255, 255, 255, 255" /> <!-- Local Chat text -->
131<!-- Icon Enable/Disable --> 131<IMHistoryBgColor value="0, 30, 80, 200" /> <!-- Instant Message background -->
132<IconEnabledColor value="255, 255, 255, 255"/> 132<IMHistoryTextColor value="255, 255, 255, 255" /> <!-- Instant Message text -->
133<IconDisabledColor value="147, 169, 213, 200"/> 133
134 134<!-- IN-WORLD SELECTION -->
135<!-- MINI-MAP --> 135<SilhouetteParentColor value="255, 255, 0, 255" /> <!-- Root prim selection outline -->
136<NetMapBackgroundColor value="0, 0, 0, 77" /> 136<SilhouetteChildColor value="32, 106, 196, 255" /> <!-- Child prim selection outline -->
137<NetMapYouOwnAboveWater value="0, 255, 255, 255" /> 137<HighlightParentColor value="171, 212, 245, 255" />
138<NetMapYouOwnBelowWater value="0, 200, 200, 255" /> 138<HighlightChildColor value="171, 212, 245, 255" />
139<NetMapGroupOwnAboveWater value="255, 0, 255, 255" /> 139<HighlightInspectColor value="255, 0, 255, 255" /> <!-- Selection outline when inspecting -->
140<NetMapGroupOwnBelowWater value="200, 0, 200, 255" /> 140
141<NetMapOtherOwnAboveWater value="60, 60, 60, 255" /> 141<!-- EDIT MODE GRID -->
142<NetMapOtherOwnBelowWater value="30, 30, 30, 255" /> 142<GridFocusPointColor value="255, 255, 255, 128" /> <!-- Not used -->
143 143<GridlineColor value="255, 255, 255, 255" /> <!-- Grid color -->
144<!-- HELP WINDOW --> 144<GridlineBGColor value="235, 235, 255, 200" /> <!-- Grid background color -->
145<HelpBgColor value="200, 209, 204, 255" /> 145<GridlineShadowColor value="0, 0, 0, 80" /> <!-- Grid drop shadow -->
146<HelpFgColor value="0, 0, 0, 255" /> 146
147<HelpScrollTrackColor value="0, 0, 0, 255" /> 147<!-- PROPERTY LINES -->
148<HelpScrollThumbColor value="255, 255, 255, 255" /> 148<PropertyColorAvail value="0, 0, 0, 0" />
149<HelpScrollHighlightColor value="115, 132, 155, 255" /> 149<PropertyColorGroup value="0, 184, 184, 102" /> <!-- Property group owns -->
150<HelpScrollShadowColor value="0, 0, 0, 255" /> 150<PropertyColorOther value="255, 0, 0, 102" /> <!-- Property others own -->
151 151<PropertyColorSelf value="0, 255, 0, 102" /> <!-- Property you own -->
152<!-- MISC --> 152<PropertyColorForSale value="255, 128, 0, 102" /> <!-- Property for sale -->
153<AvatarNameColor value="251, 175, 93, 255" /> <!-- Text color of avatar nametags --> 153<PropertyColorAuction value="128, 0, 255, 102" /> <!-- Match the color on the world map -->
154<FocusColor value="239, 156, 0, 255" /> <!-- Color of the glow around UI controls with keyboard focus --> 154
155<FloaterButtonImageColor value="255, 255, 255, 255" /> <!-- The floater buttons (like the close box) are white images that receive this color. --> 155<!-- MEDIA ICONS -->
156<ButtonCautionImageColor value="255, 255, 255, 255" /> <!-- Match the caution dialog buttons to the default --> 156<IconEnabledColor value="255, 255, 255, 255"/> <!-- Media/music icon enabled -->
157<HealthTextColor value="255, 255, 255, 255" /> 157<IconDisabledColor value="147, 169, 213, 200"/> <!-- Media/music icon disabled -->
158<MapAutopilotColor value="255, 128, 0, 255" /> 158
159<ContextSilhouetteColor value="239, 156, 0, 255" /> <!-- For "context" highlighting, i.e. pie menu --> 159<!-- MINI-MAP -->
160<ScriptBgReadOnlyColor value="180, 180, 180, 255" /> 160<NetMapBackgroundColor value="0, 0, 0, 77" /> <!-- Mini-map floater background -->
161<ParcelTextColor value="40, 40, 90, 255" /> <!-- Parcel name on menu bar, normal state --> 161<NetMapYouOwnAboveWater value="0, 255, 255, 255" /> <!-- Objects owned by you above water -->
162<ParcelHoverColor value="70, 70, 100, 255" /> <!-- Parcel name on menu bar, hover state --> 162<NetMapYouOwnBelowWater value="0, 200, 200, 255" /> <!-- Objects owned by you below water -->
163<TimeTextColor value="0, 30, 60, 255" /> <!-- SL Time on menu bar --> 163<NetMapGroupOwnAboveWater value="255, 0, 255, 255" /> <!-- Group owned objects above water -->
164<BalanceTextColor value="0, 100, 40, 255" /> <!-- Linden dollar balance on menu bar --> 164<NetMapGroupOwnBelowWater value="200, 0, 200, 255" /> <!-- Group owned objects below water -->
165<HealthTextColor value="110, 15, 15, 255" /> <!-- Damage meter text on menu bar --> 165<NetMapOtherOwnAboveWater value="60, 60, 60, 255" /> <!-- Objects owned by others above water -->
166<GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window --> 166<NetMapOtherOwnBelowWater value="30, 30, 30, 255" /> <!-- Objects owned by others below water -->
167<FilterBackgroundColor value="75, 75, 150, 180" /> <!-- Matching region of Inventory search text --> 167<NetMapGlyphColorAvatar value="0, 255, 0, 255" /> <!-- Also the color of avatar glyphs on the map -->
168<FilterTextColor value="255, 200, 70, 255" /> 168<NetMapGlyphColorFriend value="255, 255, 0, 255" />
169<InventoryItemSuffixColor value="120, 70, 55, 255"/> 169
170<InventorySearchStatusColor value="0, 0, 0, 255" /> 170<!-- INVENTORY -->
171<ConsoleBackground value="0, 0, 0, 255" /> 171<InventoryBackgroundColor value="255, 255, 255, 80"/> <!-- Inventory floater background -->
172<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/> 172<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/> <!-- "loading..." -->
173<InventoryBackgroundColor value="255, 255, 255, 80"/> 173<InventoryItemSuffixColor value="120, 70, 55, 255"/> <!-- "worn", "no modify", etc -->
174 174<FilterBackgroundColor value="75, 75, 150, 180" /> <!-- Inventory search background -->
175 <!-- Alert box colors --> 175<FilterTextColor value="255, 200, 70, 255" /> <!-- Inventory search text -->
176<AlertBoxColor value="165, 180, 200, 245"/> 176<InventorySearchStatusColor value="0, 0, 0, 255" /> <!-- "Searching..." -->
177<AlertTextColor value="0, 30, 60, 255"/> 177
178<AlertCautionBoxColor value="254, 209, 118, 255"/> <!-- Background color of caution alerts --> 178<!-- HELP WINDOW -->
179<AlertCautionTextColor value="0, 0, 0, 255"/> <!-- Foreground color of the special title text in caution alerts --> 179<HelpBgColor value="200, 209, 204, 255" />
180 180<HelpFgColor value="0, 0, 0, 255" />
181<!-- Multi sliders, as in the sky animation setting --> 181<HelpScrollTrackColor value="0, 0, 0, 255" />
182<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/> 182<HelpScrollThumbColor value="255, 255, 255, 255" />
183<MultiSliderThumbCenterColor value="183, 184, 188, 255"/> 183<HelpScrollHighlightColor value="115, 132, 155, 255" />
184<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/> 184<HelpScrollShadowColor value="0, 0, 0, 255" />
185<MultiSliderTrackColor value="30, 30, 30, 255"/> 185
186<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> 186<!-- MISC -->
187<MultiSliderTriangleColor value="255, 255, 50, 255"/> 187<AvatarNameColor value="251, 175, 93, 255" /> <!-- Text color of avatar nametags -->
188</settings> 188<FocusColor value="239, 156, 0, 255" /> <!-- Color of the glow around UI controls with keyboard focus -->
189<FloaterButtonImageColor value="255, 255, 255, 255" /> <!-- The floater buttons (like the close box) are white images that receive this color. -->
190<ButtonCautionImageColor value="255, 255, 255, 255" /> <!-- Match the caution dialog buttons to the default -->
191<MapAutopilotColor value="255, 128, 0, 255" />
192<ContextSilhouetteColor value="239, 156, 0, 255" /> <!-- For "context" highlighting, i.e. pie menu -->
193<GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window -->
194<ConsoleBackground value="0, 0, 0, 255" /> <!-- Background for inworld chat -->
195
196</settings>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index be28809..62c9537 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -75,30 +75,60 @@ class ViewerManifest(LLManifest):
75 self.path("*.txt") 75 self.path("*.txt")
76 self.end_prefix("fonts") 76 self.end_prefix("fonts")
77 77
78 # skins 78 # skins
79 if self.prefix(src="skins"): 79 if self.prefix(src="skins"):
80 self.path("paths.xml") 80 self.path("paths.xml")
81 # include the entire textures directory recursively 81
82 if self.prefix(src="*/textures"): 82 # include the entire textures directory recursively
83 self.path("*.tga") 83 if self.prefix(src="*/textures"):
84 self.path("*.j2c") 84 self.path("*.tga")
85 self.path("*.jpg") 85 self.path("*.j2c")
86 self.path("*.png") 86 self.path("*.jpg")
87 self.path("textures.xml") 87 self.path("*.png")
88 self.end_prefix("*/textures") 88 self.path("textures.xml")
89 self.path("*/xui/*/*.xml") 89 self.end_prefix("*/textures")
90 self.path("*/*.xml") 90
91 91 self.path("*/xui/*/*.xml")
92 # Local HTML files (e.g. loading screen) 92 self.path("*/*.xml")
93 if self.prefix(src="*/html"): 93
94 self.path("*.png") 94 # Local HTML files (e.g. loading screen)
95 self.path("*/*/*.html") 95 if self.prefix(src="*/html"):
96 self.path("*/*/*.gif") 96 self.path("*.png")
97 self.end_prefix("*/html") 97 self.path("*/*/*.html")
98 self.end_prefix("skins") 98 self.path("*/*/*.gif")
99 self.end_prefix("*/html")
100
101 self.end_prefix("skins")
102
99 self.path("lsl_guide.html") 103 self.path("lsl_guide.html")
100 self.path("gpu_table.txt") 104 self.path("gpu_table.txt")
101 105
106
107 # Gather up the README file, etc.
108 def gather_documents(self):
109 # From the top level directory (imprudence)
110 if self.prefix("../../..", dst=""):
111 self.path("README.txt")
112 self.path("MANIFESTO.txt")
113 self.path("CONTRIBUTE.txt")
114 self.path("RELEASE_NOTES.txt")
115 self.path("ChangeLog.txt")
116 self.end_prefix("../../..")
117
118 # From the linden directory
119 if self.prefix("../..", dst="doc"):
120 self.path("LICENSE-source.txt")
121 self.path("LICENSE-logos.txt", "LICENSE-artwork.txt")
122 self.end_prefix("../..")
123
124 # From the linden/doc directory
125 if self.prefix("../../doc", dst="doc"):
126 self.path("contributions.txt")
127 self.path("GPL-license.txt", "GPL.txt")
128 self.path("FLOSS-exception.txt")
129 self.end_prefix("../../doc")
130
131
102 def login_channel(self): 132 def login_channel(self):
103 """Channel reported for login and upgrade purposes ONLY; 133 """Channel reported for login and upgrade purposes ONLY;
104 used for A/B testing""" 134 used for A/B testing"""
@@ -161,7 +191,13 @@ class WindowsManifest(ViewerManifest):
161 #'../llkdu/relwithdebinfo/llkdu.dll', 191 #'../llkdu/relwithdebinfo/llkdu.dll',
162 #'../../libraries/i686-win32/lib/release/llkdu.dll'), 192 #'../../libraries/i686-win32/lib/release/llkdu.dll'),
163 # dst='llkdu.dll') 193 # dst='llkdu.dll')
164 self.path(src="licenses-win32.txt", dst="licenses.txt") 194
195 self.gather_documents()
196
197 if self.prefix("../..", dst="doc"):
198 self.path("LICENSE-libraries-win32.txt")
199 self.end_prefix("../..")
200
165 201
166 self.path("featuretable.txt") 202 self.path("featuretable.txt")
167 203
@@ -386,7 +422,13 @@ class DarwinManifest(ViewerManifest):
386 self.path("*.tif") 422 self.path("*.tif")
387 self.end_prefix("cursors_mac") 423 self.end_prefix("cursors_mac")
388 424
389 self.path("licenses-mac.txt", dst="licenses.txt") 425 # From the linden directory
426 if self.prefix("../..", dst="doc"):
427 self.path("LICENSE-libraries-mac.txt")
428 self.end_prefix("../..")
429
430 self.gather_documents()
431
390 self.path("featuretable_mac.txt") 432 self.path("featuretable_mac.txt")
391 self.path("SecondLife.nib") 433 self.path("SecondLife.nib")
392 434
@@ -525,16 +567,23 @@ class DarwinManifest(ViewerManifest):
525class LinuxManifest(ViewerManifest): 567class LinuxManifest(ViewerManifest):
526 def construct(self): 568 def construct(self):
527 super(LinuxManifest, self).construct() 569 super(LinuxManifest, self).construct()
528 self.path("licenses-linux.txt","licenses.txt") 570
529 self.path("res/imprudence_icon.png","imprudence_icon.png") 571 self.path("res/imprudence_icon.png","imprudence_icon.png")
530 if self.prefix("linux_tools", dst=""): 572 if self.prefix("linux_tools", dst=""):
531 self.path("client-readme.txt","README-linux.txt") 573 #self.path("client-readme.txt","README-linux.txt")
532 #self.path("client-readme-voice.txt","README-linux-voice.txt") 574 #self.path("client-readme-voice.txt","README-linux-voice.txt")
533 self.path("wrapper.sh","imprudence") 575 self.path("wrapper.sh","imprudence")
534 self.path("handle_secondlifeprotocol.sh") 576 self.path("handle_secondlifeprotocol.sh")
535 self.path("register_secondlifeprotocol.sh") 577 self.path("register_secondlifeprotocol.sh")
536 self.end_prefix("linux_tools") 578 self.end_prefix("linux_tools")
537 579
580 self.gather_documents()
581
582 # From the linden directory
583 if self.prefix("../..", dst="doc"):
584 self.path("LICENSE-libraries-linux.txt")
585 self.end_prefix("../..")
586
538 # Create an appropriate gridargs.dat for this package, denoting required grid. 587 # Create an appropriate gridargs.dat for this package, denoting required grid.
539 self.put_in_file(self.flags_list(), 'gridargs.dat') 588 self.put_in_file(self.flags_list(), 'gridargs.dat')
540 589
diff --git a/linden/install.xml b/linden/install.xml
index 0326b24..a6270be 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -875,9 +875,9 @@ anguage Infrstructure (CLI) international standard</string>
875 <key>windows</key> 875 <key>windows</key>
876 <map> 876 <map>
877 <key>md5sum</key> 877 <key>md5sum</key>
878 <string>33ceb9232a59c0399ef4d239373c3e42</string> 878 <string>8913f8ace065b14792cb0ec889a5f99a</string>
879 <key>url</key> 879 <key>url</key>
880 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-windows-20080613.tar.bz2</uri> 880 <uri>https://imprudence.s3.amazonaws.com/extras/openjpeg-1.3-windows-20081211.tar.bz2</uri>
881 </map> 881 </map>
882 </map> 882 </map>
883 </map> 883 </map>
diff --git a/linden/scripts/build_version.py b/linden/scripts/build_version.py
index 46587e8..3d66a65 100755
--- a/linden/scripts/build_version.py
+++ b/linden/scripts/build_version.py
@@ -26,8 +26,10 @@ def get_version(filename):
26 vals['minor'] = m.group(1) 26 vals['minor'] = m.group(1)
27 m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data) 27 m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data)
28 vals['patch'] = m.group(1) 28 vals['patch'] = m.group(1)
29 m = re.search('const char \* const IMP_VERSION_TEST = "(.+)";', data)
30 vals['test'] = m.group(1)
29 31
30 return "%(major)s.%(minor)s.%(patch)s" % vals 32 return "%(major)s.%(minor)s.%(patch)s-%(test)s" % vals
31 33
32if __name__ == '__main__': 34if __name__ == '__main__':
33 import sys 35 import sys