aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Update of doc/contributions.txtAleric Inglewood2010-10-011-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-10-011-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-10-011-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-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-566: doc/contributions.txt clean upAleric Inglewood2010-10-011-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-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-27391-20333/+20801
|\ \ \ | | |/ | |/|
| * | 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
| | |
| * | Revert "Updated boost 1.36 libs for Windows to support local textures (todo: ↵McCabe Maxsted2010-09-251-2/+2
| | | | | | | | | | | | | | | | | | update boost to at least 1.39)" since we no longer need these libs This reverts commit 4a07f267bdba86314e39bf082a9cfc5e5ad713b3.
| * | Moved RenderWaterVoidCulling into the Imprudence section of settings.xmlMcCabe Maxsted2010-09-251-11/+11
| | |
| * | Applied patch by Aleric Inglewood for VWR-12984: Water flickers and ↵McCabe Maxsted2010-09-258-18/+22
| | | | | | | | | | | | disappears in patches, part 3: Collapse LL_VO_HOLE_WATER and LL_VO_EDGE_WATER into one LL_VO_VOID_WATER
| * | Applied patch by Aleric Inglewood for VWR-12984: Water flickers and ↵McCabe Maxsted2010-09-251-1/+1
| | | | | | | | | | | | disappears in patches, part 2: Also support GL_NV_depth_clamp
| * | Applied patch by Aleric Inglewood for VWR-12984: Water flickers and ↵McCabe Maxsted2010-09-2528-167/+477
| | | | | | | | | | | | disappears in patches, part 1
* | | Changes the search system, so it matches the keyword against name or surname ↵elektrahesse2010-09-251-4/+5
|/ / | | | | | | initials.
* | Fixed Windows compile bug in 721c25d8. Changed std::max to llmax since ↵McCabe Maxsted2010-09-231-1/+1
| | | | | | | | Windows apparently thought it'd be a good idea to have its own definition -_-
* | Merge remote branch 'armin/weekly' into weeklyMcCabe Maxsted2010-09-235-7/+13
|\ \
| * | one more poke on trees+grass + fix the windlight waterArmin Weatherwax2010-09-234-5/+10
| | |
| * | fix: cached trees + grass white on opensimArmin Weatherwax2010-09-233-4/+5
| | | | | | | | | | | | issues remaining: windlight water is "flat"
| * | fix: "Random" is no integerArmin Weatherwax2010-09-231-2/+2
| |/
* | Merge branch '1.4-fexp-snapshotupdate' into weeklyMcCabe Maxsted2010-09-231-98/+121
|\ \
| * | Added safety checks for when snapshot window goes out of sync with the main ↵McCabe Maxsted2010-09-191-98/+121
| | | | | | | | | | | | UI, as well as a few backported changes from Viewer 2
* | | Merge remote branch 'thickbrick/weekly' into weeklyMcCabe Maxsted2010-09-236-58/+93
|\ \ \
| * | | More sanity checks in OpenJPEG decodes for #355thickbrick2010-09-211-10/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch by Carjay McGinnis from VWR-1815. This fixes decoding lossless and small textures where the viewer's assumption about compressed size breaks (i.e. discard level only half there), and also encoding small lossy textures. This relys on a patched OpenJPEG to work (see openjpeg_top_corner_fix.diff from VWR-1815.)
| * | | Double-click teleport:thickbrick2010-09-215-48/+58
| | |/ | |/| | | | | | | | | | | | | | | | - clean up duplicated (and subtly and needlessly different) code. - keep the camera heading in inter-sim double-click teleport in a hackish way, since SL sims give LookAt info that is kind of random in AgentMovementComplete.
* | | Added empty indra/cmake/CMakeLists.txt to suppress a CMake 2.8 warning.Jacek Antonelli2010-09-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "CMake Warning (dev) at CMakeLists.txt:36 (add_subdirectory): The source directory /home/jacek/imprudence/linden/indra/cmake does not contain a CMakeLists.txt file. CMake does not support this case but it used to work accidentally and is being allowed for compatibility. Policy CMP0014 is not set: Input directories must have CMakeLists.txt. Run "cmake --help-policy CMP0014" for policy details. Use the cmake_policy command to set the policy and suppress this warning. This warning is for project developers. Use -Wno-dev to suppress it."
* | | don't rely on indexed color extension(SNOW-220)Nemurimasu Neiro2010-09-231-1/+0
| | |