summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-12-17Merge from viewer-development post 2.4 releaseMonty Brandenberg
2010-12-17Automated merge with https://bitbucket.org/mani_linden/viewer-developmentAndrew A. de Laix
2010-12-17ich bin stupid; this should actually fix the windows build.Andrew A. de Laix
2010-12-17don't rely on stream cast to bool behavior; use explicit fail call.Andrew A. de Laix
2010-12-17STORM-744 : Turn llimage/tests/ on againMerov Linden
2010-12-17and don't break other builds.Andrew A. de Laix
2010-12-17fix windows build (suppress warning from lexical_cast)Andrew A. de Laix
2010-12-17STORM-669 FIXED 'Security browsing' icon is overlapped by 'More' button in ↵Paul Guslisty
object info mini-inspector - Moved 'Security browsing' icon before URL. Now icon is in one line with URL.
2010-12-17Adjust parameter in call to setFocusOnAvatar to be more efficient (don't ↵Jonathan Yap
animate)
2010-12-16ESC-237 No static init of LLAtomics and move TFRequest out of unnamed namespace.Monty Brandenberg
Linux startup crash appears to be due to static/global C++ init of LLAtomic types. The initializer with explicit value makes some runtime calls and it looks like these assume, at least on Linux, that apr_initialize() has been called. So move the static POST count to a member and provide accessors and increment/decrement. Command queue was built on a pointer to a class in anonymous namespace and that's not quite valid. Made it a nested class (really a nested forward declaration) while keeping the derived classes in anonymous.
2010-12-16SOCIAL-370 FIX (2) Links to External Web Pages not working in Floaters such ↵callum
as Search in Webkit 4.7 branch
2010-12-16SOCIAL-393 FIX Need a keyboard shortcut to open the Web Content floatercallum
2010-12-16SOCIAL-392 FIX Web Content Panel does not save location history between sessionscallum
2010-12-16merge fix for storm-529Oz Linden
2010-12-16merge fix for storm-776Oz Linden
2010-12-16clearer message.Andrew A. de Laix
2010-12-16STORM-796 FIXED Implemented rendering /app/region/ SLapps into ↵Vadim ProductEngine
human-readable strings. Example: secondlife:///app/region/Ahern/10/20/30/ is displayed as "Ahern (10,20,30)".
2010-12-16Vary install failed message depending on whether it was required or not.Andrew A. de Laix
2010-12-16STORM-529 FIXED Added Undo/Redo items to the Build menu.Vadim ProductEngine
2010-12-15STORM-151 : Suppress unused code, clean up code formating, fix typosMerov Linden
2010-12-15SOCIAL-389 FIX Stop button in Web Content panel does not stop page content ↵callum
from loading or progress bar So many things wrong here it wasn't funny - button not enabled, button not connected to function, wrong call to stop browser etc.
2010-12-15SOCIAL-387 FIX Clicking on links in TOS during account activation in the ↵callum
viewer do not launch browser in Webkit 4.7 Mis-assumption about floaters that spawn web-content
2010-12-16STORM-771 FIXED Pasting wearable items from clipboard to Current Outfit or ↵Seth ProductEngine
an outfit folder now creates links to these items.
2010-12-15STORM-453 : Points to the 7.21 curl libs, fixes curl cmake, fixes ↵Merov Linden
mac_updater build
2010-12-15don't ask before quitting when login or download progress is being shown.Andrew A. de Laix
2010-12-15ESC-235 Truncation of over-sized metrics reports wasn't working.Monty Brandenberg
Legacy of the LLSD::Map-to-LLSD::Array conversion, this ended up performing an erase on the array rather than the map taking out all the regions. So, there *was* a metrics report, it was just empty of regions. Fixed and scanned for more array/map problems and corrected the data type for duration sorts (should have been Real).
2010-12-15VWR-24254: Add support for using ld.gold on linux.Aleric Inglewood
To use ld.gold configure with: -DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,-use-gold". ld.gold links the viewer on my machine in 8 seconds, as opposed to 19 seconds with ld.bfd. Moreover, it uses a LOT less memory during linking (about 750 MB instead of 2.5 GB!). VWR-24254: Don't link with fontconfig on non-linux. While we already added fontconfig in the above patch, that code turned out to also be used by Windows and Darwin (contrary to the comments in the code). After looking at the history of commits and a discussion on IRC it was decided that the original coder (Kyle Ambroff <ambroff@lindenlab.com>) really meant (LINUX AND VIEWER) instead of (NOT LINUX OR VIEWER).
2010-12-20VWR-24261: Configuration with cmake 2.8 is extremely slowAleric Inglewood
Add non-broken FindZLIB.cmake.
2010-12-16VWR-24251: Fix -DLL_TESTS:BOOL=ON on standalone when Tut is installed in a ↵Aleric Inglewood
non-standard directory. If tut/tut.hpp isn't installed in a standard include directory all tests fail because the found include directory for tut isn't passed to the compiler. This patch fixes this by passing it. Note that using include_directories() in a Find*.cmake file is bad practise. The correct way is to set an include dir variable and call include_directories() once. It certainly doesn't work for the tests anyway because the tests are all over the place and include_directories is on a per folder basis. What is needed is to set it for each (test) target. However, there is no TARGET_INCLUDE_DIRECTORIES. The closest thing that we have is to set the COMPILE_FLAGS property for a target. Fortunately, standalone is only used for linux, so we can just use -I${TUT_INCLUDE_DIR} to get the effect we want.
2010-12-15VWR-10579: Fix NDOF.cmake to do the right thing on standalone.Aleric Inglewood
The old one just assumed that libndof is installed, even on standalone. This patch looks for it on standalone, unless configured with -DNDOF:BOOL=OFF, and when not found prints an error message (including telling about -DNDOF:BOOL=OFF).
2010-12-15SNOW-240: Fix libjson naming madness, again, for standalone.Aleric Inglewood
SNOW-240 was actually about adding the whole search. While this has been done, there is one issue left: On linux (and remember, all of this is about standalone) the libjson packages of distributions don't have this complex compiler version baked into their name. See also the last comment on SNOW-240: https://jira.secondlife.com/browse/SNOW-240?focusedCommentId=205305&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-205305 This patch fixes this issue by first searching for libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so and when that fails search for the system package library file libjson.so.
2010-12-15VWR-24252: On standalone, find Qt4 with find_package, and find llqtwebkit.Aleric Inglewood
If Qt and/or llqtwebkit is found in a non-standard place, you still have to set LD_LIBRARY_PATH yourself (to $QTDIR/lib) before running the viewer of course (or the webkit plugin will silently fail).
2010-12-15STORM-800 FIXED Crash in LLRemoteParcelInfoProcessor::processParcelInfoReply()Kitty Barnett
2010-12-15STORM-799 FIXED Crash in LLVivoxVoiceClient::notifyStatusObservers()Kitty Barnett
2010-12-15VWR-24247: develop.py configure still searches for the wrong header file ↵Aleric Inglewood
when checking for Tut The viewer code includes "tut/tut.hpp" everywhere, so that is what we should search for when determining an include path for this header. This just searches in the usual places, including the paths provided through CMAKE_INCLUDE_PATH, and will find tut/tut.hpp: exactly what we need.
2010-12-15pulling fixes back from viewer-betaOz Linden
2010-12-15STORM-776 : unable to change permissions to "no trans" on item in avatar ↵Wolfpup Lowenhar
inventory applied Kitty's code changes listed in STROM-288 as it is a related issue and this actualy fixed both issues!
2010-12-15MergeKent Quirk
2010-12-15STORM-786 ADDITIONAL FIX Fixed Windows build.Vadim ProductEngine
2010-12-15STORM-786 FIXED Fixed disappearing controls in avatar picks list.Vadim ProductEngine
Caused by an improper fix of STORM-690. Made the way we switch between profile view panels (profile view / pick_info / pick_edit) more robust. It now suits both My Profile and Profile View panels.
2010-12-14SOCIAL-369 FIX Hitting reload on the media browser removes entries from ↵Monroe Linden
location history for that session in Webkit 4.7
2010-12-14Automated merge with https://bitbucket.org/mani_linden/viewer-developmentNat Goodspeed
2010-12-14SWAT-352: when loading lleventhost, call apr_dso_error() function.Nat Goodspeed
In addition to its usual apr_sterror() function, APR defines a special function specifically for errors relating to the apr_dso_*() functions. Introduce ll_apr_warn_status() and ll_apr_assert_status() overloads accepting apr_dso_handle_t* to call apr_dso_error() as well as apr_strerror() and log its output. Use new ll_apr_warn_status() in LLAppViewer::loadEventHostModule() for apr_dso_load() and apr_dso_sym() calls. Instead of shorthand ll_apr_assert_status(), use with llassert_always() so check is still performed even in Release build. Add more lleventhost-related debugging output, e.g. full pathname of the DLL. On Mac and Linux, call 'file' command to report nature of the DLL too.
2010-12-14Mergebrad kittenbrink
2010-12-14SOCIAL-383 FIX Sites with no titles do not show web address in title bar in ↵callum
Web Content Browser
2010-12-14SOCIAL-384 FIX Menu bar images do not have tooltips in Web Content Browsercallum
2010-12-14SOCIAL-381 FIX WEB CONTENT shown in title bar of Web Content Browser when ↵callum
opening a popup window
2010-12-14SOCIAL-366 FIX UI Issues with HTTP Dialogs in Webkit 4.7callum
2010-12-14VWR-24263: Crash fix for notecards with negative text lengthKadah_Coba
2010-12-14SOCIAL-373 FIX Media browser does not show https secure icon in address bar ↵callum
when a site is loaded over https