summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2010-10-21Automated merge up from viewer-developmentLoren Shih
2010-10-20STORM-417 : merge with viewer-developmentMerov Linden
2010-10-20STORM-417 FIXED Port of SNOW-140 to SG 2.0 : Forced updates not working on MacVadim ProductEngine
The point of this patch is to make the Mac updater code a bit more flexible and reliable than it is right now. The issue is double: * reliability: the string comparison code on the bundle identifier is not UTF8 compliant * flexibility: the bundle identifier is hard coded to match the bundle identifier of LL viewer (i.e. com.secondlife.indra.viewer) so it can't work for another viewer (in particular, it didn't work for Snowglobe). The "bundle identifier" is one of those Mac only thing stored in the Info.plist of a "bundle" (the ".app" folder that's bundling an executable and all its resources and is seen as an application when browsing with the Mac OS X Finder). The patch fixes both issues: * compare correctly UTF8 encoded strings * allow the bundle ID to be passed as a parameter to the updater The patch has really no consequence on LL viewer. It's more a matter of having cleaner, better code. Author: Cypren Christenson Ported and reviewed by: Merov Linden
2010-10-20STORM-419 FIXED <anonymous>' is used uninitialized in this function in ↵Vadim ProductEngine
lldarray.h Author: Robin Cornelius Ported by: Techwolf Lupindo Reviewed by: Merov Linden
2010-10-20Automated merge up from viewer-developmentLoren Shih
2010-10-20bump Development version to 2.4Oz Linden
2010-10-20Automated merge up from viewer-developmentLoren Shih
2010-10-19Bumped viewer version to 2.3.0Dessie Linden
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-10-15automated mergeRoxie Linden
2010-10-14Merge from http://hg.secondlife.com/viewer-identity (display names)Leyla Farazha
2010-10-13automated mergeRoxie Linden
2010-10-08Merge fixes for VWR-23047, VWR-20911, and SNOW-748Oz Linden
2010-09-29Fix for serialization deprecation problems.Dave Parks
2010-09-27MergeLeyla Farazha
2010-09-27mergeDave Parks
2010-09-24Fix for bad zipping of meshes and add mesh icon back to repository.Dave Parks
2010-09-22SH-150 FIX - build params changes for mesh beta viewer, flag in window titleBrad Payne (Vir Linden)
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-09-16MergeLeyla Farazha
2010-09-16Merged VWR-23047 (SNOW-512, -fPIC for 64bit) and follow-ups (VWR-20911 & ↵Boroondas Gupte
SNOW-748)
2010-09-15Add role action to allow hosting of events on group landRoxie Linden
2010-09-13Bunch of trivial typo fixes that were bothering me on another branch!Tofu Linden
2010-09-04Correct license on newly exported files to LGPL.Aimee Linden
2010-09-03buildfix: disabling fasttimers assert to unstick the buildNyx (Neal Orman)
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-09-02Fix for crash when loading models (Don't hit UI from the main thread). ↵Dave Parks
Added asserts to LLFastTimer to verify main thread use only.
2010-08-31mergeDave Parks
2010-08-31SNOW-748 FOLLOWUP make CMake if indentation consistent with other ↵Boroondas Gupte
occurrences (i.e. two spaces only)
2010-08-31SNOW-748 FIXED Building on OSX 10.6 fails with "warning: -mdynamic-no-pic ↵Boroondas Gupte (original patches by Aimee Linden)
overrides - fpic or -fPIC" Originally commited at http://svn.secondlife.com/trac/linden/changeset/3499/projects/2010/snowglobe and http://svn.secondlife.com/trac/linden/changeset/3501 SVN changeset 3499 partially applied with --ignore-whitespace: Hunk #1 FAILED at 259. Hunk #2 FAILED at 265. 2 out of 2 hunks FAILED -- saving rejects to file indra/llcommon/CMakeLists.txt.rej patching file indra/media_plugins/webkit/CMakeLists.txt Hunk #1 succeeded at 33 with fuzz 1 (offset -8 lines). patching file indra/media_plugins/base/CMakeLists.txt patching file indra/media_plugins/gstreamer010/CMakeLists.txt patching file indra/media_plugins/example/CMakeLists.txt patching file indra/llplugin/CMakeLists.txt Manually applied to indra/llcommon/CMakeLists.txt (straight forward). SVN changeset 3501 applied with fuzz 1: patching file indra/media_plugins/webkit/CMakeLists.txt Hunk #1 succeeded at 33 with fuzz 1 (offset -8 lines). Hunk #2 succeeded at 39 with fuzz 1 (offset -8 lines). No further changes other than that.
2010-09-16SNOW-512/SNOW-287: Build of LLPlugin fails on 64bit linux due to non PIC ↵Boroondas Gupte (daggyfied changeset by Techwolf Lupindo, original fix by Robin Cornelius)
code linking into the DSO Formatting, cleanup, and one minor change by Techwolf Lupindo. Minor change was a move of the hunk in indra/media_plugins/webkit/CmakeLists.txt to same area as the other plugins CmakeLists.txt files. daggyfied version of https://bitbucket.org/Techwolf/viewer-development/changeset/00bd21962052
2010-08-30merging up from viewer-developmentAaron Terrell (Enus)
2010-09-22mergeRichard Linden
2010-09-21Increment version number since we forked for beta.Kent Quirk
2010-09-16mergeRichard Linden
2010-09-16STORM-180 FIXED Fixed crash on login in Japanese locale.Andrew Dyukov
The crash was caused by erroneous getting of month name from vector with week day names in LLStringUtil::formatDatetime(). This code woth introduced in June, so though it didn't work properly, it didn't cause the crash(cause June is 5th month). But when number of current month exceeded number of days in week(this happened in August cause it is 8th) code started getting 8th element from vector with 7. This caused the crash. It reproduced only on Japanese locale because only there code that caused it was used(see STORM-177 for details). This changeset seems to fix STORM-177 too. - Used vector with months names where it should be.
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-25mergeDave Parks
2010-08-24standardizing test suite names as class name under testAaron Terrell (Enus)
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-20added llfasttimer_class.h to projectRichard Nelson
2010-08-20increment patch level so that version is 2.1.2Oz Linden
2010-08-20Merge from dessie/viewer-releaseLeyla Farazha
2010-08-16VWR-20670 (SNOW-506) FIXED Protection on LLInstanceTracker base in ↵Aimee Linden
LLEventTimer needs to be public for gcc >4.1
2010-08-13fixed fast timer average frame time rollover errorRichard Nelson
2010-08-13Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicMonroe Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden