aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-0110-196/+430
| |\ \
| * | | 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-579: SNOW-751: 'configure' with cmake 2.8 is extremely slow.Aleric Inglewood2010-10-021-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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
* | | | RED-573: FindTut.cmake is missing: tut.h is not searched for.Aleric Inglewood2010-10-012-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10-012-2/+2
| | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/572
* | | | SNOW-86: Dangerous macro leads to possible wrong codeAleric Inglewood2010-10-0111-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-013-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-10-011-1/+1
| | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/562
* | | | RED-561: Optimization flags used during --Type=Debug (linux x86_64)Aleric Inglewood2010-10-012-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-556: SNOW-800: Massively duplicated objectsAleric Inglewood2010-10-0121-566/+1096
| | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/556
* | | | RED-554: SNOW-623: Add support for boost 1.42Aleric Inglewood2010-10-011-2/+12
| | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/554
* | | | RED-552: VWR-12838: NDOF is assumed to exist, even with --standalone.Aleric Inglewood2010-10-012-9/+62
| | | | | | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/552 Add FindNDOF.cmake and treat it like every other library (on standalone).
* | | | RED-553: SNOW-766: Add a 'printbuilddirs' command to develop.pyAleric Inglewood2010-10-011-3/+7
| |/ / |/| | | | | | | | See http://redmine.imprudenceviewer.org/issues/553
* | | Fixed Windows compile error introduced in 13b1fd24McCabe Maxsted2010-09-291-1/+1
| | |
* | | Merge remote branch 'thickbrick/weekly' into weeklyMcCabe Maxsted2010-09-291-0/+20
|\ \ \
| * | | Fix missing "Open" in context menu on notecards in inventory.thickbrick2010-09-281-0/+20
| | | | | | | | | | | | | | | | | | | | This was introduced in d9c9fbdd0d4c2638b3aab5b2db0f8cf6d48a928e (windlight notecards)
* | | | Merge remote branch 'thickbrick/translate_fixes_b' into weeklyMcCabe Maxsted2010-09-299-196/+410
|\ \ \ \ | |_|/ / |/| | |
| * | | Context menu translator:thickbrick2010-09-286-116/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't hide the translate menu, instead only enable the options that make sense in the context (translate languages, copy/paste/etc.) - Made highlighting misspellings a global option, with immediate effect. - Convert newview/lgghunspell_wrapper.cpp to UTF-8.
| * | | Fixed typo causing menu seperator to not hide.thickbrick2010-09-251-1/+1
| | | |
| * | | Context translator: default to enabled.thickbrick2010-09-253-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | Set the default of the xui attribute "allow_translate" to true, and add allow_translate="false" to panel_login.xml. This probably needs to be disabled in other places as well.
| * | | LLTextEditor context translator: set selection after translation.thickbrick2010-09-251-3/+9
| | | |
| * | | LLTextEditor context translator:thickbrick2010-09-252-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | - Added a xui attribute "allow_translate", default to off (not enabled in any xml file yet.) - Only show translate menu if clicked on a word, or something is selected.
| * | | LLLineEditor context translator:thickbrick2010-09-252-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | - Added a xui attribute "allow_translate", default to off (not enabled in any xml file yet.) - Only show translate menu if clicked on a word, or something is selected.
| * | | LLLineEditor context translator: re-select text properly.thickbrick2010-09-251-4/+2
| | | |
| * | | More LLLineEditor context translator bugfixes:thickbrick2010-09-251-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | - Use LLWString when doing size calculations (potential crashes and misplaced text) - Weird selection range after translating selected text.
| * | | Fix LLLineEditor context menu translator returning "()" when nothing is ↵thickbrick2010-09-252-12/+81
| | | | | | | | | | | | | | | | | | | | | | | | selected. New behavior is to translate the word under the mouse if nothing is selected.
| * | | Fix LLTextEditor context menu translator returning "()" when nothing is ↵thickbrick2010-09-252-10/+77
| | | | | | | | | | | | | | | | | | | | | | | | selected. New behavior is to translate the word under the mouse if nothing is selected.
| * | | Make chat translator ignore non-interesting translations (empty or same asthickbrick2010-09-252-22/+25
| | |/ | |/| | | | | | | original,) that may result from Google Translate's language autodetec failure.
* | | Fix for Bug #544elektrahesse2010-09-291-0/+4
| | |
* | | Reverted to previous version to avoid crash on local chat open.elektrahesse2010-09-291-3/+1
| | |
* | | Fixed a mismatch in control naming causing the viewer to crash at startupelektrahesse2010-09-271-1/+1
| | |
* | | Merge branch 'weekly' of git://github.com/mccabe/imprudence into weeklyelektrahesse2010-09-27390-20331/+20799
|\ \ \ | | |/ | |/|
| * | Converted XUI files to unix line endings, again.Aleric Inglewood2010-09-26324-20055/+20055
| | | | | | | | | | | | See http://github.com/imprudence/imprudence/commit/e20f3bb7c3310deca86cfc66af0a086261930bcf
| * | Ported gSavedSettings changes from Emerald (as well as modifying a few of ours)McCabe Maxsted2010-09-2541-119/+273
| | |