summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-02-25keywords_lsl_default.xml updates from the simulator treeOz Linden
2014-02-25merge changes for 3.7.2-releaseOz Linden
2014-02-25merge latest changes from Ima with 3.6.14-releaseOz Linden
2014-02-24merge with releaseRichard Linden
2014-02-24Pulled from release.obscurestar
2014-02-24Pull merge from viewer-releaseMerov Linden
2014-02-24increment viewer version to 3.7.3Oz Linden
2014-02-24STORM-2015 Region restart sound alerts from all users on a STORM-1980 ↵Jonathan Yap
enabled viewer play inworld - should be local only.
2014-02-22Simple variable cleanup.Ricky Curtice
There was a lot of repeated division that was obscuring meaning, along with a variable that was always identical to another preexisting variable. This last was probably an archaism, and was just due for removal.
2014-02-21changed variable names and errors to more accurately reflect the operation ↵JJ Linden
being performed
2014-02-20[MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the ↵Baker Linden
cause of the crash
2014-02-20Fix build problemmaksymsproductengine
2014-02-19duplicated the workaround added for darwin codesigning onto the windos ↵JJ Linden
codesigning
2014-02-19Merge with releaseRichard Linden
2014-02-18STORM-1920: Documented the meaning of some of the variables involved, built ↵Ricky Curtice
simplest change to solve issue. The highlighting code assumed that the axis of the scaling movement was aligned with the scale tick marks - e.g. one of the cardinal directions with respect to the OBB of the selection. This was and is NOT true when dragging from the corner, aka scaling more than one axis at a time. The solution was to calculate the measured distance by projecting the snapped distance along the snap direction onto the axis of the relevant snap guide. This gives the correct values, and is nice and clean - both in the change involved, and in the values returned. However, while the fundamental misunderstanding in the code has been cleaned up by this change, the tick_val variable has so much jitter in the bottom end that the is_approx_equal function doesn’t come true > 98% of the time. This is the next problem to solve.
2014-02-18STORM-1920: Math cleanup from Richard Linden.Ricky Curtice
2014-02-14Merge. Refresh from viewer-release after 3.7.1 release.Monty Brandenberg
2014-02-14increment viewer version to 3.7.2Oz Linden
2014-02-14OPEN-203 dummy commit to satisfy mercurialDrake Arconis
2014-02-12add two debug settings: "SceneLoadLowMemoryBound" and "SceneLoadHighMemoryBound"Xiaohong Bao
2014-02-12Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2014-02-12reduce peak memory usage to fix SH-4574: Interesting: viewer crash in ↵Xiaohong Bao
LLJoint::setScale
2014-02-12merge with releaseRichard Linden
2014-02-11Merge. Refresh from viewer-release after 3.7.0 releaseMonty Brandenberg
2014-02-11merge up to 3.7.0-release and get unit test fixesOz Linden
2014-02-10STORM-1915 Fix unit testsJonathan Yap
2014-02-11Hack to fix ACME-1317Cho
2014-02-10increment viewer version to 3.7.1Oz Linden
2014-02-06accidentally left _CrtCheckMemory defined in non-Windows buildsRichard Linden
2014-02-06MergeRichard Linden
2014-02-06added LL_TRACE_ENABLED to allow disabling of lltraceRichard Linden
2014-02-06more fix for a memory crash caused by accessing deleted pointers.Xiaohong Bao
2014-02-06Refactoring to better check state of loading and to allow clearing of ↵Ima Mechanique
highlighting if we don't have a valid keywords file.
2014-02-06Adding clear methods to remove any highlighting.Ima Mechanique
2014-02-06Changing how state of loading is reported to better allow other classes to ↵Ima Mechanique
know what is happening.
2014-02-05more fix for a non-finite number assertion in llvolumeXiaohong Bao
2014-02-05fix a memory crash caused by accessing deleted pointers.Xiaohong Bao
2014-02-05MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:maksymsproductengine
- memory leaks fixing;
2014-02-14Merge viewer-release with 3.7.1simon
2014-02-14More memory cleanup of containers after DeletePairedPointer() usage.simon
2014-02-14MAINT-3724 : LLWorld::addRegion logging is misleadingsimon
2014-02-14mergeBaker Linden
2014-02-14[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdownBaker Linden
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-11MAINT-3639 disable ALM for OSX 10.6.8Graham Madarasz (Graham Linden)
2014-02-10Merge viewer-releasesimon
2014-02-10MAINT-3710 FIXED List of members is removed from General tab. Title column ↵Mnikolenko ProductEngine
is added to the list in Members tab. Roles tab is renamed to Roles & Members and Roles sub-tab is default now.
2014-02-05Checking version for cached files so older versions cannot sneak through on ↵Ima Mechanique
upgrading of format.
2014-02-05Cleaning up a little. Using assigned values for simFeature/Capability name ↵Ima Mechanique
instead of literal values.
2014-02-04fix crash at line 2207: llassert(dst->isFinite3()) in llvolume.cppXiaohong Bao
2014-02-01MergeIma Mechanique