aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Use all those cores for compileRobin Cornelius2010-10-091-0/+1
|
* Fix tab/space issues in viewer_manifest.pyRobin Cornelius2010-10-091-11/+11
|
* Add a fall back to find NSIS on win64Robin Cornelius2010-10-091-2/+6
|
* Fix some STL errors highlighted by MSVC debugRobin Cornelius2010-10-092-2/+11
|
* Changed version to Experimental 2010.10.09McCabe Maxsted2010-10-091-1/+1
|
* Fixed (again) how libjpeg is found on Mac. (#256/#464)Jacek Antonelli2010-10-081-1/+1
| | | | | | | | | | | | Related information from Nemurimasu Neiro: stay away from find_library! due to an undocumented feature of find_xxx functions in CMake, no additional libraries may be found after the first call to a find_xxx function that searches the prebuilt libraries folder. CMake will request the folder contents *at most once* and libraries added by install.py will be missed.
* Removed the base SL version from the About Imprudence floater.Jacek Antonelli2010-10-081-3/+1
| | | | | It's not really relevant or accurate anymore, because Imprudence is assembled from so many different sources and versions.
* Allow build under Mac OS X 10.6 SDK by removing deprecated things.Mimika Oh2010-10-082-11/+11
| | | | | | Incorporated Snowglobe changesets: http://svn.secondlife.com/trac/linden/changeset/2823 http://svn.secondlife.com/trac/linden/changeset/2757
* Possible fix for an infinite loop in LLTextureCache.Jacek Antonelli2010-10-081-5/+8
| | | | Backported a few changes from pre-LGPL Viewer 2.
* Tiny layout tweaks to accomodate different font widths.Jacek Antonelli2010-10-082-3/+3
|
* Use integer font sizes to avoid blurriness on some systems.Jacek Antonelli2010-10-082-7/+8
|
* Merge remote branch 'aleric/weekly' into weeklyMcCabe Maxsted2010-10-086-16/+47
|\
| * RED-429: Link against prebuilt libraries / always use gtk-related system ↵Aleric Inglewood2010-10-086-16/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libs (linux) This patch fixes the problem that there were no 'developer' symlinks for the prebuilt packages (which is not needed for runtim), causing the casual user that tries to compile the viewer on linux (without using --standalone) to link against their system libs (while using the header files of the prebuilt versions), often causing linker errors. It also fixes the fact that a few libraries were completely missing, most notably the dbusglib package only had header files and not a library at all! libgio and libpangocairo where missing from the link command line so that the wrong libraries were picked up, if any at all. Finally, the last GTK related prebuilt libraries have simply been removed from the packaging: linux has those installed (or else the users will know how to install them as soon as they see that the viewer complains about a missing library). This is much more stable, as all those libraries more or less form a whole. Or rather, the libraries that use glib, as especially that one gives a problem at the moment since the latest glib has new g_malloc_n functions that don't exist in the prebuilt glib. Note the difference between a USER compiling her own viewer, and the imprudence team compiling a release: When the imprudence team compiles a release we need to create a portable binary that runs on many versions of linux. In order to achieve that we link against "old" library versions, so that the viewer still works on old operating systems, and (hopefull) also on newer systems, since libraries with the same SONAME are backwards compatible. With g_malloc_n as example: our viewer binary doesn't use that function, so a user that links with their own glib will never have a problem, whether or not his library provides this function. On the other hand, when a user gets the sources and compiles his own viewer he wants to use the LATEST library versions: his own operating system ones. The best way to achieve this is to configure with --standalone, but that currently demands that ALL libraries are installed on her system, including a few very-hard-to-get libraries. If she therefore chooses to configure without --standalone, she suddenly gets all the old library versions, forcing her to at least link against those at compile time (in order to minimize the risk of version incompatibilities). A better solution for the do-it-yourself user would be to have a --semi-standalone configuration that only uses the hard-to-get prebuilt libs and further uses as much the operating system libraries as possible. For most of the hard-to-get libraries this is no problem since they all only depend on libc and similar stable ABI libs.
| * Merge remote branch 'remote-twoway/weekly' into weeklyAleric Inglewood2010-10-083-16/+18
| |\
* | \ Merge remote branch 'elektra/weekly' into weeklyMcCabe Maxsted2010-10-084-23/+45
|\ \ \
| * | | Implemented friends tags highlighting, including preferences->general ↵elektrahesse2010-10-084-23/+45
| | | | | | | | | | | | | | | | checkbox to enable/disable the feature. The font on the tags is rendered in bold when the option is active.
| * | | Fixed TOS loading and renamed corretly LLIamHere classes in TOS and Voice ↵elektrahesse2010-10-072-15/+17
| | | | | | | | | | | | | | | | TOS respectively to LLIamHereTOS and LLIamHereVoice to avoid collisions.
* | | | Merge remote branch 'thickbrick/weekly' into weeklyMcCabe Maxsted2010-10-085-96/+72
|\ \ \ \
| * | | | Fix bug #612: Option to highlight misspeld words doesn't persist between ↵thickbrick2010-10-082-6/+3
| | | | | | | | | | | | | | | | | | | | sessions.
| * | | | Fix bug #611: Context menu spell checker suggestions broken.thickbrick2010-10-072-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a confusion between word end position and word length, causing an empty spell checker suggestion list, or possibly crashes. I caused this bug in f5006e8a2f34afa390f0bbcf0f6af15218cf4105. Oops.
| * | | | Merge branch 'weekly' of git://github.com/imprudence/imprudence into weeklythickbrick2010-10-073-16/+18
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Fix RED-603: Errors when loading local imagesthickbrick2010-10-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Avoid bad offsets that would cause failure with this warning: "doRead: Error reading file from local cache"
| * | | | Don't leak SpellMenuBind structs when destroying LLLineEditor/LLTextEditor ↵thickbrick2010-10-042-78/+56
| | | | | | | | | | | | | | | | | | | | objects.
* | | | | Revert "Allow export of megaprims from SL by people who've given us ↵McCabe Maxsted2010-10-081-28/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission" until we can come to a firm decision on this. This reverts commit dfeb8fe3f4110f7e571ababf35401ea6a5fd41d5.
* | | | | Merge branch 'weekly-next' into weeklyMcCabe Maxsted2010-10-0813-25/+121
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Merge remote branch 'aleric/weekly' into weekly-rebaseMcCabe Maxsted2010-10-034-5/+30
| |\ \ \ | | | |/ | | |/|
| | * | RED-560: Add support for STANDALONE to OPENAL.cmakeAleric Inglewood2010-10-021-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use pkg_check_modules to find freealut (and openal) for STANDALONE. Non-standalone is untouched by this version. The changes relative to snowglobe (for the STANDALONE path) is that I removed the 'include(FindOpenAL) (that comes with cmake) which not only doesn't find libalut, but even sets the wrong cmake variables (it sets OPENAL_LIBRARY, and our cmake scripts *use* OPENAL_LIBRARIES). Moreover, under the assumption that STANDALONE really is only for linux (and I think that is so), every linux distribution DOES have freealut (and openal) installed with a pkg-config anyway. I also removed pkg_check_modules(openal) because it is redundant: freealut pulls that in already.
| | * | RED-560: Revert changes to indra/cmake/OPENAL.cmakeAleric Inglewood2010-10-021-19/+104
| | | | | | | | | | | | | | | | | | | | Revert the changes introduced in http://github.com/AlericInglewood/imprudence/commit/e71d3ea2fad63fa2ec81685a9b09c1bed6b493be
| | * | Merge branch 'weekly' of http://github.com/imprudence/imprudence into weeklyAleric Inglewood2010-10-0296-680/+1692
| | |\ \
| | * | | RED-581: SNOW-796: Clicking 'Reset to default' in the Debug Settings floater ↵Aleric Inglewood2010-09-302-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't update cached control values. See http://redmine.imprudenceviewer.org/issues/581
| | * | | RED-579: SNOW-751: 'configure' with cmake 2.8 is extremely slow.Aleric Inglewood2010-09-302-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that indra/cmake/CMakeLists.txt is missing on imprudence, so I couldn't add 'FindZLIB.cmake' to the list of source files (see http://svn.secondlife.com/trac/linden/browser/projects/2009/snowglobe/trunk/indra/cmake/CMakeLists.txt) I added a comment to http://github.com/mccabe/imprudence/commit/39f625963e408ec5dd394e202506700259b9b508 that adds an empty indra/cmake/CMakeLists.txt If Jacek follows up and copies snowglobe's CMakeLists.txt then she'll have to remove the FindZLIB.cmake from it if she tests it before merging with THIS commit. In that case it has to be added back when merging that commit with this one. Tested on imprudence with cmake 2.8.2: * Without patch, 'configure' takes 100 seconds. * With patch, 'configure' takes 4 seconds.
| | * | | RED-578: SNOW-744: scripts/install.py --uninstall does not remove symbolic ↵Aleric Inglewood2010-09-302-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | links. See http://redmine.imprudenceviewer.org/issues/578
| | * | | RED-577: SNOW-477: Wrong string raw_file in strings.xml for RAW fileAleric Inglewood2010-09-3015-14/+16
| | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/577
| | * | | RED-576: SNOW-415: Viewer prints always "WARNING: cleanup: Quitting with ↵Aleric Inglewood2010-09-302-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pending background tasks" See http://redmine.imprudenceviewer.org/issues/576
| | * | | RED-575: VWR-13040: LLObjectSelection::valid_root_begin() is really the same ↵Aleric Inglewood2010-09-302-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as LLObjectSelection::root_begin() See http://redmine.imprudenceviewer.org/issues/575
| | * | | RED-573: FindTut.cmake is missing: tut.h is not searched for.Aleric Inglewood2010-09-303-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch only affects --standalone. It was basically ported from Snowglobe with the following change: If LL_TESTS is not set, then tut.h is not required (this is an improvement, because if LL_TESTS is not set no tests should be created or run). I tested it with -DLL_TESTS:BOOL=ON, -DLL_TESTS:BOOL=OFF and no -DLL_TESTS* at all, with and without tut installed, internally and externally. Things worked as expected. Most notably, with tut.h installed in libraries/include/, it is NOT found. This is necessary because using -Ilibraries/include for standalone is a no no: prebuilt stuff might be downloaded, but we don't want to use it! That directory contains potentially many other libraries.
| | * | | VWR-14426: Link step fails on Linux when LDFLAGS is setAleric Inglewood2010-09-303-2/+3
| | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/572
| | * | | SNOW-86: Dangerous macro leads to possible wrong codeAleric Inglewood2010-09-3012-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/571 This patch appeared to already have been partially applied. I added more semi-colons after all llendl (and LLENDL) macros, and wrapped the lllog ... llendl construct into do { ... } while(0) as is usual for macros that mimic a single statement. The patch was double checked with regular expression greps and a compile.
| | * | | Update of doc/contributions.txtAleric Inglewood2010-09-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added several SNOW and VWR jiras that are already in the imprudence source but weren't added to doc/contributions.txt. This in order to be able to keep track of what is already in there and what isn't.
| | * | | Update of doc/contributions.txt for previous 10 commits.Aleric Inglewood2010-09-281-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops, I forgot to update doc/contributions.txt in my commits. This rectifies that. It is handy to have all jira and redmine labels in doc/contributions.txt so I can see what is already merged in in a particular source tree (of course, then I'll have to add those change with the each particulat commit itself, but I'll assume in this case that all ten will be merged more or less simultaneously ;).
| | * | | RED-567: install.xml contains Linden Lab "local" sources.Aleric Inglewood2010-09-281-147/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/567 We can't scp from machines on the internal LAN of Linden Lab, and this causes errors for certain invokations of install.py.
| | * | | RED-565: Building the package/ directory fails for standalone.Aleric Inglewood2010-09-283-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/565 This patch also reorders the "help" text of llmanifest.py to be alphabetical, next to adding the option --standalone with help text. indra/newview/CMakeLists.txt is changed to pass --standalone to the python script. Finally, viewer_manifest.py, which inherits from llmanifest.py uses it to skip the sections that don't make sense when building standalone, and which fail with errors without this patch. This patch is not 100% tested: I don't have a Mac or windows. However, it ONLY touches 'standalone', and before my patches standalone was broken anyway. So, even if this doesn't fix it completely for Mac and/or windows, then it can't hurt to commit, or even release. Even if this fails, the errors are not fatal: the packaging fails, but the viewer is already compiled at this point. I'd advise against holding this back until it could be tested by a Mac or windows developer that can build standalone: that might never happen to begin with! When time comes, some other developer will test it and when there are still problems, fix it, on the other operating systems.
| | * | | RED-562: SNOW-422: Imprudence doesn't compile with g++ 4.4.xAleric Inglewood2010-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/562
| | * | | RED-561: Optimization flags used during --Type=Debug (linux x86_64)Aleric Inglewood2010-09-282-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/561 Fixed erroneous use of optimization flags when not compiling Release. Also removed -DLL_VECTORIZE from compile options: that is set in a header file (llv4math.h), not on the commandline. Patch affects only 64 bit linux.
| | * | | RED-560: Imprudence doesn't compile when configured with --standaloneAleric Inglewood2010-09-284-107/+37
| | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/560
| | * | | RED-556: SNOW-800: Massively duplicated objectsAleric Inglewood2010-09-2821-566/+1096
| | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/556
| | * | | RED-554: SNOW-623: Add support for boost 1.42Aleric Inglewood2010-09-281-2/+12
| | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/554
| | * | | RED-552: VWR-12838: NDOF is assumed to exist, even with --standalone.Aleric Inglewood2010-09-282-9/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/552 Add FindNDOF.cmake and treat it like every other library (on standalone).
| | * | | RED-566: doc/contributions.txt clean upAleric Inglewood2010-09-281-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/566 Removed collision markers, and fixed white space issues (every line in doc/contributions.txt should start with a TAB). Also added a few SNOW acknowledgements that were missing (that are already in the imprudence code but not acknowledged in doc/contributions.txt). I didn't check everything of course, only my own SNOW contributions related to the build system.
| | * | | RED-553: SNOW-766: Add a 'printbuilddirs' command to develop.pyAleric Inglewood2010-09-281-3/+7
| | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/553
generated by cgit v1.1 at 2024-11-16 07:55:30 +0000