Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
288 commits
Select commit Hold shift + click to select a range
db79d81
Fix tab/space issues in viewer_manifest.py
robincornelius Oct 9, 2010
13e0e20
Use all those cores for compile
robincornelius Oct 9, 2010
f001c10
Let the gstreamer plugin build on windows
robincornelius Oct 10, 2010
1d3e052
Force mime_types.xml to use gstreamer as default
robincornelius Oct 10, 2010
b5f6f89
Thickbrick Sleaford, Soft Linden: STORM-164 make gcc-4.4 happy about …
Sep 24, 2010
c0034c5
Merge branch 'mccabe-plugins' into plugins_merge
robincornelius Oct 10, 2010
b3b3028
Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging …
robincornelius Oct 10, 2010
f90beef
Don't try to fetch http-textures past end of file
thickbrick Oct 12, 2010
202deea
More robust handling of http texture responses.
thickbrick Oct 14, 2010
4d9f3db
Work around for buggy range responses in OpenSim
thickbrick Oct 14, 2010
7b0ce8e
Fix typo in buggy OpenSim version detection.
thickbrick Oct 14, 2010
67f55ba
RED-595: Manual merge with weekly-webkit.
AlericInglewood Oct 15, 2010
0bf2f0a
Add missing semi-colon.
AlericInglewood Oct 15, 2010
8a62086
Comment out code to make it compile at all (with the latest llqtwebkit).
AlericInglewood Oct 15, 2010
b2d616b
Rename LLRect::isNull to LLRect::isEmpty (a random thing I picked up …
AlericInglewood Oct 15, 2010
f994628
Fix the fix - bad logic for failed http requests
thickbrick Oct 16, 2010
ee23c25
Port of SNOW-802: Use UDP for baked textures.
thickbrick Oct 16, 2010
e6148fc
Fix windows mime types and gstreamer plugin name.
AlericInglewood Oct 16, 2010
0297f5d
More SNOW-802: disable http for bakes earlier.
thickbrick Oct 16, 2010
fa2df9d
Add LLQTWEBKIT_INCLUDE_DIR to indra/llplugin/CMakeLists.txt
AlericInglewood Oct 16, 2010
13dc732
Find Qt4 with find_package on STANDALONE.
AlericInglewood Oct 17, 2010
ccf5b66
Ask for at least 512^2 pixels of local texture before bake
thickbrick Oct 17, 2010
dab62a3
Changed default compile settings for Mac. Now SSE3 and SSE4 are enabl…
elektrahesse Oct 18, 2010
18e79cb
Updated the Info.plist file on Mac to reflect the actual build date o…
elektrahesse Oct 18, 2010
beb04d0
Forgot QtWebKit and Qt plugins in last commit.
AlericInglewood Oct 18, 2010
cea604c
Fixed the Vivox license prompt appearing when connecting to non-SL gr…
mccabe Oct 18, 2010
6f52903
Sync LLViewerMediaImpl::newSourceFromMediaType with SG2
AlericInglewood Oct 19, 2010
b7a4a4c
Update WebKit Version in About floater.
AlericInglewood Oct 19, 2010
2f4e17a
LindenUserDir fixes.
AlericInglewood Oct 20, 2010
b65b0ec
Add support for PluginAttachDebuggerToPlugins for linux
AlericInglewood Oct 20, 2010
5af5d29
Fixed the Preferences > Communication tab options not enabling (happe…
mccabe Oct 20, 2010
f8add3c
Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly
elektrahesse Oct 21, 2010
de1ece9
LindenUserDir fixes, part 2.
AlericInglewood Oct 21, 2010
4e65935
Merge branch 'weekly' into webkit_plugins
AlericInglewood Oct 22, 2010
5cc7263
Fix the errors "QCursor: Cannot create bitmap cursor; invalid bitmap(…
AlericInglewood Oct 22, 2010
66302fb
WhiteStar Magic: update the lscript_library to match OpenSim 0.7
Oct 22, 2010
36d557f
Fixed #629: Freeze Frame snapshot option breaks the UI.
jacek Oct 22, 2010
b41717b
Added FontSizeMultiplier and FontSizeRounding settings.
jacek Oct 22, 2010
22df58b
Added FontSizeMultiplier and FontSizeRounding controls to Font prefs.
jacek Oct 22, 2010
421f337
Changed Small font size back to 8.5.
jacek Oct 22, 2010
f82ccee
Merge branch 'weekly' into webkit_plugins
AlericInglewood Oct 23, 2010
1724c21
Fixed copy_win_libs by removing glib dlls
mccabe Oct 23, 2010
a705ea5
Merge remote branch 'origin/webkit_plugins' into webkit_plugins
mccabe Oct 23, 2010
df41e47
Merge branch 'weekly' into webkit_plugins
AlericInglewood Oct 23, 2010
54a6488
Fixed the Advanced preferences panel not appearing last in the prefer…
mccabe Oct 24, 2010
2533c56
Merge remote branch 'elektra/weekly' into weekly
mccabe Oct 24, 2010
ef23208
Merge remote branch 'armin/weekly' into weekly
mccabe Oct 24, 2010
17b5d96
Merge remote branch 'aleric/weekly' into weekly
mccabe Oct 24, 2010
cd14d97
Changed several Preferences modal alerts to notifications.
jacek Oct 24, 2010
856fc5f
Merge remote branch 'jacek/weekly' into weekly
mccabe Oct 24, 2010
36c25f0
Prim alignment tool by Qarl, backported by Jacek.
jacek Oct 22, 2010
898a2c7
Fixed Windows compile errors in qtoolalign.cpp (Qarl's align patch)
mccabe Oct 24, 2010
a02b7f5
Fixed Windows compile error in impprefsfonts.cpp (unsafe mix of type …
mccabe Oct 24, 2010
217abd5
Fixed the link number label overwriting the selected objects when mor…
mccabe Oct 24, 2010
6f81d6f
Updated the Align tool's label with info about Pack
mccabe Oct 24, 2010
ca2a768
Merge remote branch 'thickbrick/http_texture_experiment' into weekly
mccabe Oct 24, 2010
9b21385
Added the fifth and sixth batch of German translation updates from Eryn
mccabe Oct 24, 2010
27df1e9
Changed version to Experimental 2010.10.23
mccabe Oct 24, 2010
7b589ed
Fixed xml files from the German translation missing from the repo
mccabe Oct 24, 2010
06bbe1b
#637: teleport target location in local chat, ported from Phoenix by …
mccabe Oct 24, 2010
d1dff54
Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly
elektrahesse Oct 24, 2010
acc8af5
Updated Info.plist for 2010.10.23 release date
elektrahesse Oct 24, 2010
c6aac7d
Added missing textures to artwork.
AlericInglewood Oct 25, 2010
6075fc0
Merge branch 'weekly' into webkit_plugins
AlericInglewood Oct 25, 2010
48a30bf
Merge branch 'weekly' into webkit_plugins
AlericInglewood Oct 25, 2010
164e5c2
New Japanese UI translations from Hiroshi Kumaki.
jacek Oct 25, 2010
150a190
Cleaned up the ugly Phoenix code for #637 and made it translatable
mccabe Oct 26, 2010
209535f
IMP-670: Uninstall packages that are renewed
AlericInglewood Oct 26, 2010
d670f93
Merge branch 'weekly' into webkit_plugins
AlericInglewood Oct 26, 2010
534779c
Add missing skin thumbnail to artwork and move them to the right dire…
AlericInglewood Oct 26, 2010
70907fe
Removed duplicate 'BulkChangeIncludeAnimations' in settings.xml.
jacek Oct 27, 2010
fff44ef
Removed getvoice.sh for Linux. It's no longer needed.
jacek Oct 27, 2010
447b85d
Set LL_GSTREAMER010_ENABLED to true for Linux-only until gstreamer lo…
mccabe Oct 27, 2010
45438a8
Fixed media plugin test not compiling
mccabe Oct 27, 2010
0ce8368
Merge remote branch 'origin/webkit_plugins' into webkit_plugins
mccabe Oct 27, 2010
74749fc
Fixed mime_types.xml not being copied on Windows (also fixes plugin d…
mccabe Oct 27, 2010
d2a3064
Use quicktime instead of gstreamer on Windows
mccabe Oct 27, 2010
d3ecf0f
Remove the need for qglobal.h on non-standalone.
AlericInglewood Oct 27, 2010
190bd7d
Load mime_types_windows.xml instead of mime_types.xml so we can fallb…
mccabe Oct 27, 2010
16921b8
Merge remote branch 'origin/webkit_plugins' into webkit_plugins
mccabe Oct 27, 2010
6f2faa6
Load prebuilt glib when needed. Don't compile gstreamer plugin on win…
AlericInglewood Oct 27, 2010
686f5fd
Only initialize WebCore resource(s) on linux.
AlericInglewood Oct 27, 2010
0b3d87a
Merge branch 'weekly' of http://github.com/imprudence/imprudence into…
AlericInglewood Oct 28, 2010
c0547c3
Merge branch 'weekly' into webkit_plugins
AlericInglewood Oct 28, 2010
230a5e1
Remove explicit dependency of windows on media_plugin_gstreamer010
AlericInglewood Oct 28, 2010
694e64d
Fix Bug #671 (aka VWR-1603): Duckwalk is too fast
thickbrick Oct 29, 2010
34a5639
Fix bug #672: Failed bake uploads don't retry
thickbrick Oct 30, 2010
c1f62ea
Merge remote branch 'jacek/weekly' into weekly
mccabe Nov 1, 2010
ed6c990
Merge remote branch 'aleric/weekly' into weekly
mccabe Nov 1, 2010
2700f2f
Merge remote branch 'thickbrick/weekly' into weekly
mccabe Nov 1, 2010
af6877f
Finishes the OpenRegionSettings module, adds a new panel to Region/Es…
RevolutionSmythe Oct 20, 2010
72c4d73
Merges the Message log and Message builder from Inertia in.
RevolutionSmythe Oct 24, 2010
8f9e76c
Bug fixes for earlier commits. Adds cut to the inventory panel along …
RevolutionSmythe Oct 26, 2010
b94ba21
Fixed a bunch of problems with images uploads on mac, including trans…
elektrahesse Nov 2, 2010
1851199
Fixes a missing help button, adds ability to edit trees like normal o…
RevolutionSmythe Oct 30, 2010
451d7cf
Merge remote branch 'elektra/weekly' into weekly
mccabe Nov 2, 2010
ff9351c
Fixed message builder files missing from CMake
mccabe Nov 2, 2010
8905d32
Adds missing .xml files.
RevolutionSmythe Nov 2, 2010
3875eba
Don't show the open region settings panel in the Estate window when t…
mccabe Nov 2, 2010
a6854ec
Added missing cloud settings to settings.xml
mccabe Nov 2, 2010
037d0e3
Load default grid list url from new GridUpdateList setting
mccabe Nov 2, 2010
5df8067
Don't allow setting draw distance below 0 in the openregionsettings
mccabe Nov 2, 2010
b9867ca
Fixed crash when logging into an Aurora sim without the region/estate…
mccabe Nov 2, 2010
0c4a202
Use the right name for the Aurora capability
mccabe Nov 2, 2010
76ef871
Revert "Fix Bug #671 (aka VWR-1603): Duckwalk is too fast"
thickbrick Nov 2, 2010
f10af89
Added conversion function for plugin EState to string info
mccabe Oct 30, 2010
c07d436
RED-595 was renamed to IMP-595
AlericInglewood Oct 29, 2010
1fd8a0b
Delete piece of code that is redundant.
AlericInglewood Oct 29, 2010
7e6a6ef
Make LLStringUtilBase<T>::null a constant.
AlericInglewood Oct 30, 2010
27cd378
Fix llqtwebkit version incompatibility.
AlericInglewood Oct 31, 2010
920cf31
Install qtxmlpatterns4.dll on windows.
AlericInglewood Oct 31, 2010
166d8af
Add headers from libdbus-1-dev_1.2.1-5+lenny1_i386.deb to dbusglib li…
AlericInglewood Oct 31, 2010
9962635
Added missing qtxmlpatterns4.dll to CopyWinLibs.cmake
mccabe Oct 31, 2010
7ed48e0
Deleted OPENAL.cmake.imp file
mccabe Nov 2, 2010
24a25e5
Fixed streaming video on Windows by updating mime_types_window.xml to…
mccabe Nov 2, 2010
14dc068
Uploaded the linux64 libraries created by Aleric to imprudenceviewer.org
mccabe Nov 2, 2010
b5074f1
Merged webkit_plugins into weekly. Huzzah! The weekly branch now has …
mccabe Nov 3, 2010
3f7f854
Rename hippo* files to lower case (PART 1 OF 2)
AlericInglewood Nov 3, 2010
30cf280
Rename hippo* files to lower case (PART 2 OF 2)
AlericInglewood Nov 3, 2010
e868c08
Center the "loading..." text on the login page.
AlericInglewood Nov 3, 2010
b22f87e
IMP-592: Extend login screen menu bar till the top of the window.
AlericInglewood Nov 5, 2010
e8e2de0
Update of gtk-etc prebuilt for linux 32bit.
AlericInglewood Nov 5, 2010
e99e8b5
Fixed missing UseLocalChatWithBubbles control introduced in af6877fb …
mccabe Nov 5, 2010
65bab48
Applied patch by Nicky Perian for #680: commented out unused referenc…
mccabe Nov 5, 2010
d13d991
Applied patch by Ansariel Hiller for #675: Keywords update to reflect…
mccabe Nov 5, 2010
1039429
Rename hippo* files to lower case (PART 1 OF 2)
AlericInglewood Nov 3, 2010
b0446b9
Rename hippo* files to lower case (PART 2 OF 2)
AlericInglewood Nov 3, 2010
58a00b0
Center the "loading..." text on the login page.
AlericInglewood Nov 3, 2010
7744469
IMP-592: Extend login screen menu bar till the top of the window.
AlericInglewood Nov 5, 2010
adbffe7
Created new preferences panel to handle chat colors and name highligh…
mccabe Nov 6, 2010
9a72dc9
Renamed several preferences panels:
mccabe Nov 6, 2010
cff602e
Changed the order of the chat/im/voice preferences panels to include …
mccabe Nov 6, 2010
1d56536
Rebranded 'Help' button in preferences to 'Support' and made it point…
mccabe Nov 6, 2010
e9a57e6
Removed unused 'remember password' option that snuck into the Prefs >…
mccabe Nov 6, 2010
f3128be
Fixed option in Prefs > General overlapping (all this layout still ne…
mccabe Nov 6, 2010
fcaa1ae
Changed nickname highlight nick settings from 'nick#' to 'HighlightNi…
mccabe Nov 6, 2010
9710954
fix: don't use untested libraries
Nov 6, 2010
50105f8
Bug #681: About Land->Audio doesn't do anything
thickbrick Nov 6, 2010
c250b93
Set can_edit_text attribute to true for draw distance, particle count…
mccabe Nov 6, 2010
2ca7741
Set can_edit_text attribute to true for the radar distance slider, fi…
mccabe Nov 6, 2010
85f9e62
Merge remote branch 'armin/weekly' into weekly
mccabe Nov 6, 2010
a3c9b13
Removed 640x480 resolution from preferences since the UI doesn't fit …
mccabe Nov 6, 2010
f023761
Added three new resolutions:
mccabe Nov 6, 2010
73d5efc
Merge remote branch 'thickbrick/weekly' into weekly
mccabe Nov 6, 2010
a0e23ee
Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly
thickbrick Nov 6, 2010
d92c819
Merge branch 'weekly' of https://github.com/AlericInglewood/imprudenc…
thickbrick Nov 6, 2010
c84c7fa
Applied patch by Qarl Fizz to allow drag selection on plants. See htt…
mccabe Nov 6, 2010
6eeb3a5
This replaces the libcairo package with a self-compiled one that does…
AlericInglewood Nov 6, 2010
6d89be7
Merge branch 'weekly' of https://github.com/AlericInglewood/imprudenc…
thickbrick Nov 6, 2010
e2699d2
Add missing gdkconfig.h.
AlericInglewood Nov 6, 2010
40b31a3
Merge branch 'weekly' of https://github.com/AlericInglewood/imprudenc…
thickbrick Nov 6, 2010
ee3a9b5
Merge remote branch 'mccabe/weekly' into weekly
AlericInglewood Nov 6, 2010
9d26172
IMP-688: ERROR: getString: Invalid string control nick01
AlericInglewood Nov 6, 2010
1e2effb
IMP-688: ERROR: getString: Invalid string control nick01
AlericInglewood Nov 6, 2010
1dc8a33
Merge remote branch 'mccabe/weekly' into weekly
AlericInglewood Nov 7, 2010
5b4356c
IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins
AlericInglewood Nov 7, 2010
38d4ef2
IMP-692: SNOW-713: Fixed compile bug fixes.
AlericInglewood Nov 7, 2010
a23a8d2
Use the LGPL version of the quicktime media plugin. This allows us to…
mccabe Nov 7, 2010
a6f08b6
Ported media_plugin_webkit changes from Snowglobe2, which are identic…
mccabe Nov 7, 2010
022227e
Use apr_suite-1.3.8 for windows in order to get the dll version of li…
robincornelius Nov 7, 2010
eeb08e9
IMP-692: SNOW-713: Removed isHexString again, since it is not defined…
AlericInglewood Nov 7, 2010
346e887
Correctly stage libhunspell.dll in viewer_manifest.py
robincornelius Nov 7, 2010
c722768
As we currently do not build the gstreamer plugin for windows, do not…
robincornelius Nov 7, 2010
a88b751
Merge remote branch 'robin/SNOW-713' into SNOW-713
AlericInglewood Nov 7, 2010
0e1b83f
Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly
thickbrick Nov 7, 2010
4ccc243
Merge remote branch 'aleric/weekly' into weekly
jacek Nov 8, 2010
4f471ff
Transferred the new linux32 gtk-etc package to our server.
jacek Nov 8, 2010
6ae81ea
Correctly stage libhunspell.dll in viewer_manifest.py
robincornelius Nov 7, 2010
257a706
As we currently do not build the gstreamer plugin for windows, do not…
robincornelius Nov 7, 2010
2f08879
IMP-692: SNOW-713: Merge branch 'weekly' into SNOW-713
AlericInglewood Nov 9, 2010
b305d2f
Install unstripped binary in packaged when --type=Debug
AlericInglewood Nov 9, 2010
cf44892
Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly
thickbrick Nov 9, 2010
2573283
Merge branch 'weekly' of https://github.com/AlericInglewood/imprudenc…
thickbrick Nov 9, 2010
44c07eb
feature: add a tiny context menu to areasearch scroll list items
Nov 8, 2010
88df6cc
fix: add missing settings for logging into Aurora Sim
Nov 9, 2010
1e88050
fix: add missing AllowEditingOfTrees setting
Nov 9, 2010
52c9b51
Merge remote branch 'aleric/weekly' into weekly
mccabe Nov 10, 2010
c96a895
llstring.h directly depends on #include <map>.
jacek Nov 10, 2010
a5ee390
Merge branch 'weekly' into SNOW-713
AlericInglewood Nov 10, 2010
5c18152
Fix #699: Can't drag prims with translate manipulator
thickbrick Nov 10, 2010
7b5e0f2
Fix #700: View -> Web Browser does nothing
thickbrick Nov 10, 2010
37aca80
More #700: remove llfloaterhtmlhelp.cpp
thickbrick Nov 10, 2010
a99afc2
Added missing 'Plugin' entry in logcontrol.xml
mccabe Nov 11, 2010
e8e1ea5
Merge remote branch 'thickbrick/weekly' into weekly
mccabe Nov 11, 2010
9720f46
contributions
NickyPerian Nov 12, 2010
3660a16
tabs required in contributions.txt
NickyPerian Nov 12, 2010
86c2b6f
Add support for using ld.gold on linux.
AlericInglewood Nov 12, 2010
8016517
Merge branch 'weekly' into SNOW-713
AlericInglewood Nov 12, 2010
46a23d4
Partial fix #614: wrong calculation of thread run time
thickbrick Nov 12, 2010
a5e3c86
Merge remote branch 'thickbrick/weekly' into weekly
mccabe Nov 13, 2010
3d33416
Merge remote branch 'jacek/SNOW-713' into weekly
mccabe Nov 13, 2010
673d39a
Merge remote branch 'aleric/SNOW-713' into weekly
mccabe Nov 13, 2010
1c30b68
Merge remote branch 'nickyp/weekly' into weekly
mccabe Nov 13, 2010
7ada43a
Fixed fontconfig library not being set for Linux-only
mccabe Nov 13, 2010
c5ae48b
Applied 8th batch of German translations from Eryn
mccabe Nov 13, 2010
740666a
Patch by Eryn: fixed the tools window not having enough room to displ…
mccabe Nov 13, 2010
9dec640
Fixed the align tool label not hiding when switching tabs in the tool…
mccabe Nov 13, 2010
ff01376
Fixed View > Web Browser sometimes loading the external browser and m…
mccabe Nov 13, 2010
7cb97df
Applied patch by Ansariel Hiller for #689: Optionally disable interna…
mccabe Nov 13, 2010
7c009fc
Added info to DisableInternalFlyUpAnimation to clarify it's local mac…
mccabe Nov 13, 2010
a2fe83a
Fixed command line window missing a name for translation (patch by Eryn)
mccabe Nov 13, 2010
d6357d0
Revert "Reduced the max width and height for the snapshot window to h…
mccabe Nov 13, 2010
00778fa
Added updated French translations for several preferences panels from…
mccabe Nov 13, 2010
b11fcc6
Added default_grids.xml to cmake
mccabe Nov 13, 2010
6ce31af
Applied patch by tx Oh for #647: loginuri of osgrid changed
mccabe Nov 13, 2010
cf368d0
Updated local copy of default_grids.xml with the latest osgrid regist…
mccabe Nov 13, 2010
2b8bfab
Changed version to Experimental 2010.11.13
mccabe Nov 13, 2010
bbf1f41
Added some status text for the new align tool
mccabe Nov 13, 2010
3c51d5f
Ported fix from Ascent: disable align tool controls if you can't move…
mccabe Nov 13, 2010
21d5c3e
Ported keyboard shortcut for align tool from Ascent, by Beeks. Has th…
mccabe Nov 13, 2010
0bd6027
Disable SSE4 on Mac (temporarily).
jacek Nov 13, 2010
43f6513
GStreamer010 plugin needs Carbon.h on Mac.
jacek Nov 13, 2010
99817b5
Use Quicktime plugin on Mac, not GStreamer.
jacek Nov 13, 2010
ecd5004
Ported some LLWindowMacOSX changes from Snowglobe 2.
jacek Nov 13, 2010
dfc585e
Roll back llqtwebkit package to 20100617 on Mac.
jacek Nov 14, 2010
385be94
Disable packaging of mac-updater.app.
jacek Nov 14, 2010
f179eb8
Commented out gstreamer libs from Mac manifest.
jacek Nov 14, 2010
ecec32d
Fixed path to Mac SLPlugin launcher.
jacek Nov 14, 2010
521ba06
Mac SLPlugin.app needs symlinks to some libs.
jacek Nov 14, 2010
8eff9a8
Use proper install_name for Mac libllcommon.
jacek Nov 14, 2010
e888b19
Simplified install of libllcommon in Mac manifest.
jacek Nov 14, 2010
adb6155
fetch pulseaudio headers also for linux64
Nov 14, 2010
90df159
IMP-577: Use the same string for FFSAVE_RAW as in strings.xml
AlericInglewood Nov 16, 2010
9ce7c1e
IMP-712: Add shortcut for the Groups tab.
AlericInglewood Nov 17, 2010
b66950b
IMP-590: Added a thread-safe and robust wrapper for APR pools.
AlericInglewood Nov 10, 2010
7bc679e
IMP-701: An API to wrap objects for thread-safe access.
AlericInglewood Nov 10, 2010
dd4630a
fix: Bug #721: Search lags
Nov 19, 2010
1d15c37
Fix #705 (SNOW-717): Prevent mouse cursor flicker
thickbrick Nov 20, 2010
0e81c17
Fix #724: Snap guides in scale manipulator not shown.
thickbrick Nov 20, 2010
04e9ce0
Revert "Ported fix for Apply button not working correctly when changi…
mccabe Nov 23, 2010
a17ac42
Fixed group list not updating when the group profile is changed (#644)
mccabe Nov 24, 2010
5860333
Merge remote branch 'armin/weekly' into weekly
mccabe Nov 24, 2010
b444445
Merge remote branch 'thickbrick/weekly' into weekly
mccabe Nov 24, 2010
04ef9fc
Merge remote branch 'aleric/weekly' into weekly
mccabe Nov 24, 2010
0d65410
Fixed Windows compile error introduced in fe9a3d2b. Also made sure wi…
mccabe Nov 24, 2010
8a3c070
IMP-734: SNOW-707: Start up crash of LLErrorThread due to corrupt map…
AlericInglewood Nov 26, 2010
508aff9
IMP-701: Added missing license header.
AlericInglewood Nov 26, 2010
3decbd0
More support for ld.gold in case a plugin uses threads.
AlericInglewood Dec 7, 2010
065ca3d
Make is_main_thread globally accessible.
AlericInglewood Dec 7, 2010
05143ba
Direct all webbrowser activity to the external browser.
AlericInglewood Jan 10, 2011
0fe77c7
Add 'CET Grid' and 'Avatrian Tokyo' to default_grids.xml
AlericInglewood Jan 11, 2011
e8b65bc
Disable ClientTags
AlericInglewood Jan 11, 2011
fbeb819
Removed certain menu items from the viewer GUI.
AlericInglewood Jan 12, 2011
eac7d20
Enable LightShare by default.
AlericInglewood Jan 12, 2011
b98937f
Disabled object pie menu's except Touch and Sit.
AlericInglewood Jan 12, 2011
0799339
Disable all buttons in the toolbar except Snapshot and Inventory
AlericInglewood Jan 12, 2011
cc15510
Status bar fixup
AlericInglewood Jan 12, 2011
d90b888
Change viewer name into "MoonWorld"
AlericInglewood Jan 12, 2011
371ca20
Fix up other pie menu's (land, avatar, attachment).
AlericInglewood Jan 14, 2011
d97f540
Disable automatic fly on Page Up
AlericInglewood Jan 14, 2011
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 23 additions & 0 deletions linden/doc/LICENSE-logos.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
COPYRIGHT AND PERMISSION NOTICE

Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc.

Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer
artwork and other works in the files distributed with this Notice under
the Creative Commons Attribution-Share Alike 3.0 License, available at
http://creativecommons.org/licenses/by-sa/3.0/legalcode. For the license
summary, see http://creativecommons.org/licenses/by-sa/3.0/.

Notwithstanding the foregoing, all of Linden Lab's trademarks, including
but not limited to the Second Life brand name and Second Life Eye-in-Hand
logo, are subject to our trademark policy at
http://secondlife.com/corporate/trademark/.

If you distribute any copies or adaptations of the Second Life viewer
artwork or any other works in these files, you must include this Notice
and clearly identify any changes made to the original works. Include
this Notice and information where copyright notices are usually included,
for example, after your own copyright notice acknowledging your use of
the Second Life viewer artwork, in a text file distributed with your
program, in your application's About window, or on a credits page for
your work.
17 changes: 17 additions & 0 deletions linden/doc/contributions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,21 @@ Aleric Inglewood
IMP-578
IMP-579
IMP-581
IMP-590
IMP-592
IMP-595
IMP-660
IMP-661
IMP-662
IMP-663
IMP-664
IMP-667
IMP-670
IMP-688
IMP-692
IMP-701
IMP-712
IMP-734
Alissa Sabre
VWR-81
VWR-83
Expand Down Expand Up @@ -334,6 +343,8 @@ Khyota Wulluf
Kunnis Basiat
VWR-82
VWR-102
Lance Corrimal
SNOW-717
Lisa Lowe
CT-218
CT-219
Expand Down Expand Up @@ -461,6 +472,9 @@ Nicholaz Beresford
VWR-2412
VWR-2682
VWR-2684
Nicky Perian
IMP-680
IMP-685
Nounouch Hapmouche
VWR-238
Patric Mills
Expand Down Expand Up @@ -518,6 +532,7 @@ Robin Cornelius
VWR-2488
VWR-9557
VWR-12838
IMP-595
Ryozu Kojima
VWR-53
VWR-287
Expand Down Expand Up @@ -598,6 +613,8 @@ TBBle Kurosawa
VWR-1892
Teardrops Fall
VWR-5366
Techwolf Lupindo
SNOW-334
tenebrous pau
VWR-247
Tharax Ferraris
Expand Down
26 changes: 25 additions & 1 deletion linden/etc/message.xml
Original file line number Diff line number Diff line change
Expand Up @@ -378,14 +378,38 @@
<boolean>true</boolean>
</map>

<key>ParcelVoiceInfo</key>
<key>WindLightSettingsUpdate</key>
<map>
<key>flavor</key>
<string>llsd</string>
<key>trusted-sender</key>
<boolean>true</boolean>
</map>

<key>ParcelVoiceInfo</key>
<map>
<key>flavor</key>
<string>llsd</string>
<key>trusted-sender</key>
<boolean>true</boolean>
</map>

<key>ParcelMediaURLFilter</key>
<map>
<key>flavor</key>
<string>llsd</string>
<key>trusted-sender</key>
<boolean>false</boolean>
</map>

<key>ParcelNavigateMedia</key>
<map>
<key>flavor</key>
<string>llsd</string>
<key>trusted-sender</key>
<boolean>false</boolean>
</map>

<key>ParcelObjectOwnersReply</key>
<map>
<key>flavor</key>
Expand Down
10 changes: 9 additions & 1 deletion linden/indra/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llimage)
add_subdirectory(${LIBS_OPEN_PREFIX}llimagej2coj)
add_subdirectory(${LIBS_OPEN_PREFIX}llinventory)
add_subdirectory(${LIBS_OPEN_PREFIX}llmath)
add_subdirectory(${LIBS_OPEN_PREFIX}llmedia)
add_subdirectory(${LIBS_OPEN_PREFIX}llmessage)
add_subdirectory(${LIBS_OPEN_PREFIX}llprimitive)
add_subdirectory(${LIBS_OPEN_PREFIX}llrender)
Expand All @@ -59,8 +58,17 @@ endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
add_custom_target(viewer)
if (VIEWER)
add_subdirectory(${LIBS_OPEN_PREFIX}llcrashlogger)
add_subdirectory(${LIBS_OPEN_PREFIX}llplugin)
add_subdirectory(${LIBS_OPEN_PREFIX}llui)

# viewer media plugins
add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)

# llplugin testbed code (is this the right way to include it?)
if (NOT LINUX)
add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest)
endif (NOT LINUX)

if (LINUX)
add_subdirectory(${VIEWER_PREFIX}linux_crash_logger)
add_dependencies(viewer linux-crash-logger-strip-target)
Expand Down
18 changes: 13 additions & 5 deletions linden/indra/cmake/00-Common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ include(Variables)

set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
set(CMAKE_CXX_FLAGS_RELEASE
"-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DNDEBUG")
"-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-DLL_RELEASE=1 -D_SECURE_SCL=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
"-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")


# Don't bother with a MinSizeRel build.
Expand All @@ -20,6 +20,14 @@ set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
"Supported build types." FORCE)


# Determine the number of bits of this processor

if(CMAKE_SIZEOF_VOID_P MATCHES 4)
set( HAVE_64_BIT 0 )
else(CMAKE_SIZEOF_VOID_P MATCHES 4)
set( HAVE_64_BIT 1 )
endif(CMAKE_SIZEOF_VOID_P MATCHES 4)

# Platform-specific compilation flags.

if (WINDOWS)
Expand Down Expand Up @@ -186,8 +194,8 @@ if (DARWIN)
add_definitions(-DLL_DARWIN=1)
set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch -msse3 -mssse3 -w")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch -msse3 -mssse3 -w")
# NOTE: it's critical that the optimization flag is put in front.
# NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
Expand All @@ -202,7 +210,7 @@ if (LINUX OR DARWIN)
set(GCC_WARNINGS "${GCC_WARNINGS} -Werror")
endif (NOT GCC_DISABLE_FATAL_WARNINGS)

set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor")
set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual")

set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}")
Expand Down
20 changes: 10 additions & 10 deletions linden/indra/cmake/APR.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@ else (STANDALONE)
use_prebuilt_binary(apr_suite)
if (WINDOWS)
set(APR_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.lib
)
set(APRICONV_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapriconv-1.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapriconv-1.lib
)
# Doesn't need to link with iconv.dll
set(APRICONV_LIBRARIES "")
set(APRUTIL_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib ${APRICONV_LIBRARIES}
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib ${APRICONV_LIBRARIES}
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.lib ${APRICONV_LIBRARIES}
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.lib ${APRICONV_LIBRARIES}
)
elseif (DARWIN)
set(APR_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.3.7.dylib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.3.7.dylib
)
set(APRUTIL_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.3.8.dylib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.3.8.dylib
)
set(APRICONV_LIBRARIES iconv)
else (WINDOWS)
Expand Down
7 changes: 6 additions & 1 deletion linden/indra/cmake/BerkeleyDB.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ set(DB_FIND_REQUIRED ON)
if (STANDALONE)
include(FindBerkeleyDB)
else (STANDALONE)
set(DB_LIBRARIES db-4.2)
if (LINUX)
# Need to add dependency pthread explicitely to support ld.gold.
set(DB_LIBRARIES db-4.2 pthread)
else (LINUX)
set(DB_LIBRARIES db-4.2)
endif (LINUX)
set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
endif (STANDALONE)
Loading