aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-081-5/+5
|
* Merge remote branch 'aleric/weekly' into weeklyMcCabe Maxsted2010-10-081-14/+16
|\
| * RED-429: Link against prebuilt libraries / always use gtk-related system ↵Aleric Inglewood2010-10-081-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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-083-8/+6
|\ \ \
| * | | Fix bug #612: Option to highlight misspeld words doesn't persist between ↵thickbrick2010-10-082-6/+3
| | | | | | | | | | | | | | | | sessions.
| * | | 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"
* | | | 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-089-20/+91
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Merge remote branch 'elektra/weekly' into weeklyMcCabe Maxsted2010-10-032-11/+24
| |\ \
| | * | Patch to enable building on any parcel if the agent has create powers in the ↵elektrahesse2010-10-032-11/+24
| | | | | | | | | | | | | | | | land group. If the land is deeded the object is created with the agent active group, else it's set to the land group by default. Also enables the build button when it should.
| * | | Reduced the minimum size of the minimapMcCabe Maxsted2010-10-031-1/+1
| | | |
| * | | Reduced the max width and height for the snapshot window to hopefully lower ↵McCabe Maxsted2010-10-031-2/+2
| | | | | | | | | | | | | | | | the crash rate a little
| * | | Allow export of megaprims from SL by people who've given us permissionMcCabe Maxsted2010-10-031-3/+28
| | |/ | |/|
| * | Fixed #157: Group lists get merged after logging into multiple gridsMcCabe Maxsted2010-10-021-0/+3
| | |
| * | Preview temporary textures on upload (by Henri Beauchamp from the Cool ↵McCabe Maxsted2010-10-021-1/+4
| | | | | | | | | | | | Viewer). TODO: add 'temporary' to the window title for temp textures
| * | Fixed RezWithLandGroup not working when shift-dragging prims (from Henri ↵McCabe Maxsted2010-10-021-1/+28
| | | | | | | | | | | | Beauchamp and the Cool Viewer)
| * | Removed persist for HighResSnapshot setting as it causes crash loops when ↵McCabe Maxsted2010-10-021-1/+1
| |/ | | | | | | enabled and opening the snapshot window with bad settings
* | Changed version to Experimental 2010.10.06-hotfixMcCabe Maxsted2010-10-061-1/+1
| |
* | Fixed TOS loading and renamed corretly LLIamHere classes in TOS and Voice ↵elektrahesse2010-10-062-15/+17
|/ | | | TOS respectively to LLIamHereTOS and LLIamHereVoice to avoid collisions.
* Changed version to Experimental 2010.10.02McCabe Maxsted2010-10-021-1/+1
|
* #489: added /LARGEADDRESSAWARE to the Windows linker command line settingsMcCabe Maxsted2010-10-021-2/+2
|
* Applied patch by Ansariel Hiller for #568: reload balance option in the ↵McCabe Maxsted2010-10-022-1/+26
| | | | advanced menu. Patch originally from Phoenix. I've modified it to support our currency changes, too
* Merge remote branch 'armin/weekly' into weeklyMcCabe Maxsted2010-10-026-11/+44
|\
| * fix: Bug #413 1.3 Logout: crash when cancelling currency purchaseArmin Weatherwax2010-10-021-1/+1
| | | | | | | | todo: llfloaterbuycurrency needs refactor
| * fix: Bug #390 Logout: snapshot window doesn't close when logging outArmin Weatherwax2010-10-011-8/+17
| |
| * fix: don't play balance changed ui-sound when relogging into account with ↵Armin Weatherwax2010-10-012-1/+6
| | | | | | | | different balance
| * replacent for f99376788 Fixed #381: using voice causes viewer crash on ↵Armin Weatherwax2010-10-011-2/+5
| | | | | | | | disconnect/quit
| * fix friendlist not cleared on logoutArmin Weatherwax2010-10-013-1/+16
| |
| * fix crash on logoutArmin Weatherwax2010-10-011-0/+1
| |
* | Merge remote branch 'elektra/weekly' into weeklyMcCabe Maxsted2010-10-023-13/+10
|\ \
| * \ Merge branch 'weekly' of git://github.com/mccabe/imprudence into weeklyelektrahesse2010-10-016-36/+62
| |\ \
| * | | Enabled friends chat and keywords highlighting for both IMs and Group IMs.elektrahesse2010-10-011-11/+5
| | | |
| * | | Fix for "about landmark" crash when invoking it on a freshly received landmark.elektrahesse2010-09-302-2/+5
| | | |
* | | | RED-581: SNOW-796: Clicking 'Reset to default' in the Debug Settings floater ↵Aleric Inglewood2010-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | doesn't update cached control values. See http://redmine.imprudenceviewer.org/issues/581
* | | | RED-577: SNOW-477: Wrong string raw_file in strings.xml for RAW fileAleric Inglewood2010-10-0214-14/+14
| | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/577
* | | | RED-576: SNOW-415: Viewer prints always "WARNING: cleanup: Quitting with ↵Aleric Inglewood2010-10-021-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | pending background tasks" See http://redmine.imprudenceviewer.org/issues/576
* | | | RED-575: VWR-13040: LLObjectSelection::valid_root_begin() is really the same ↵Aleric Inglewood2010-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | as LLObjectSelection::root_begin() See http://redmine.imprudenceviewer.org/issues/575
* | | | VWR-14426: Link step fails on Linux when LDFLAGS is setAleric Inglewood2010-10-011-1/+1
| | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/572
* | | | SNOW-86: Dangerous macro leads to possible wrong codeAleric Inglewood2010-10-013-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | RED-565: Building the package/ directory fails for standalone.Aleric Inglewood2010-10-012-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-561: Optimization flags used during --Type=Debug (linux x86_64)Aleric Inglewood2010-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-556: SNOW-800: Massively duplicated objectsAleric Inglewood2010-10-013-12/+17
| | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/556