summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2010-12-22Merge with viewer-developmentDon Kjer
2010-12-15Merge from don_linden/viewer-sandboxDon Kjer
2010-12-15pulling fixes back from viewer-betaOz Linden
2010-12-17Merge from viewer-development post 2.4 releaseMonty Brandenberg
2010-12-13Merge from viewer-developmentDon Kjer
2010-12-10fix working directory in install script and remove dependency on open option ↵Andrew A. de Laix
--args which is 10.6 only. Also fix erroneous check in process launcher which was mistakenly reporting a failed execution of the new updater script.
2010-12-09Pull from viewer-betaMerov Linden
2010-12-09merge from http://hg.secondlife.com/viewer-developmentMonty Brandenberg
2010-12-08Merge from http://bitbucket.org/simon_linden/viewer-devDon Kjer
2010-12-08CHOP-239: reconcile LL_VERSION_BUNDLE_ID with Info-SecondLife.plist.Nat Goodspeed
The bundle ID is found in llversionviewer.h, Info-SecondLife.plist and mac_updater.cpp. The latter two state it as "com.secondlife.indra.viewer". llversionviewer.h stated it as "com.secondlife.snowglobe.viewer". Changing it to "indra" to be consistent. For further discussion, please see the Jira.
2010-12-02ESC-211 Metrics data sink - fix delivery by viewerMonty Brandenberg
The TextureFetch thread was still stalling out due to a different path that determines whether there is work or not in the thread (uses getPending()) and that had to be harmonized with the changes to runCondition(). I'm not happy with this solution but a refactor of the LLThread tree isn't in the cards right now.
2010-11-24Pull from viewer-betaMerov Linden
2010-11-23[mq]: thread_state_fixAndrew A. de Laix
2010-11-22increment viewer version number to 2.5Oz Linden
2010-11-19ER-330 : Improve ObjectUpdateCached message packing. Added some viewer ↵Dave SIMmONs
metrics, will disable later.
2010-11-19Automated merge with http://bitbucket.org/lindenlab/viewer-developmentBill Curtis
2010-11-19Automated merge with file:///Users/Bill/Projects/viewer-releaseBill Curtis
2010-11-18CHOP-135 Bug fixes.Mark Palange (Mani)
2010-11-18Merge with viewer-developmentMark Palange (Mani)
2010-11-18added logging and default value for max-agent-groupsBill Curtis
2010-11-13STORM-52 FIXED Made it possible to use an external script editor.Vadim ProductEngine
The editor can be specified: * via "ExternalEditor" setting in settings.xml * via LL_SCRIPT_EDITOR variable Removed obsolete XUIEditor setting in favor of the new one.
2010-11-11hacking mac updater to install from local dmgAndrew A. de Laix
2010-11-11fix termination issues with thread safe queue in main loop repeater service.Andrew A. de Laix
2010-11-09Fix for dll linkage errors.brad kittenbrink
2010-11-09start of a thread safe queueAndrew A. de Laix
2010-11-09Fix crash if thread is manually shut down before it is destroyed.Andrew A. de Laix
2010-11-08STORM-105 : takes Vadim's comments into account, clean up use of static ↵Merov Linden
globals and magic strings, enforce naming conventions
2010-11-08changes to read max-agent-groups from login.cgi responseBill Curtis
2010-11-05STORM-105 : Take Vadim code review into account, code clean upMerov Linden
2010-11-04merge with viewer-developmentMerov Linden
2010-11-04automated merge from http://hg.secondlife.com/viewer-betaLoren Shih
2010-11-02STORM-422 FIXED Added command line option "-disablecrashlogger" to disable ↵Vadim ProductEngine
crash logger. This is a patch originally written by Robin Cornelius. I made it work with Google Breakpad.
2010-11-01Remove assert from lldictionary that keeps devs from working with mesh ↵Dave Parks
viewer and release viewer.
2010-10-27STORM-105 : improve decompression perf gathering, allow perf name to be ↵Merov Linden
passed on the command line, fix crash in analysis phase
2010-10-22Merge with viewer-developmentMerov Linden
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-20bump Development version to 2.4Oz Linden
2010-10-19Bumped viewer version to 2.3.0Dessie Linden
2010-10-14more debug code for SH-207: viewer crash in LLVertexBuffer::mapBuffer.Xiaohong Bao
2010-10-14for SH-335: create a debug tool to track of memory availability.Xiaohong Bao
2010-10-12Pull update from viewer-developmentMerov Linden
2010-10-08Merge fixes for VWR-23047, VWR-20911, and SNOW-748Oz 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-09-27MergeLeyla Farazha
2010-09-16Pull update from viewer-developmentMerov Linden