summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-01-09merge changes for DRTVWR-276Oz Linden
2013-01-09More merge cleanup.Dave Parks
2013-01-09More merge cleanup.Dave Parks
2013-01-09Merge cleanup.Dave Parks
2013-01-08merge changes for DRTVWR-277Oz Linden
2013-01-08Automated merge with https://bitbucket.org/lindenlab/viewer-tigerDave Parks
2013-01-08remove duplicated return (merge artifact)Oz Linden
2013-01-08merge changes for DRTVWR-250Oz Linden
2013-01-07FIX INTL-110 remove utf8 BOMeli
2013-01-07FIX INTL-110 fix corrupted chinese character in translationeli
2013-01-07merge with headcallum_linden
2013-01-04merge back DRTVWR-275 from 3.4.4 betaOz Linden
2013-01-03Automated merge with https://bitbucket.org/lindenlab/viewer-catXiaohong Bao
2013-01-03fix for MAINT-2147: crash in LLTextureCache::writeToFastCache on OSXXiaohong Bao
2013-01-03MAINT-2195 FIX Terrain textures are different for each sessionRichard Linden
seed the random number generator in noise.h with a known value when initializing the perlin noise system and then back to a random value when done
2013-01-03MAINT-2184 [crashhunters] new crash in LLUUID::toStringKelly Washington
Fix dangling references.
2013-01-02fix for MAINT-2167: Sculpts failing to rezXiaohong Bao
2013-01-02merge changes for DRTVWR-269Oz Linden
2012-12-28merge changes for DRTVWR-272Oz Linden
2012-12-21SH-3357 Texture fetch debugger not running correctly under drano-Monty Brandenberg
http phase 1 Some missing counter initialization kept the debugger from entering the startup state giving the appearance of a do- nothing floater. Also found some unbound recursion that might need looking at in the future. (There's a comment.)
2012-12-21SH-3331 Fix incorrect overrun message when sending body with HTTPMonty Brandenberg
request. During readcallback, would generate an overrun-type message about reading position beyond end-of-data. Mistake was is messaging when state is exactly at end of data (which is expected) versus an overrun. Both result in declaring end-of-data to libcurl. Also changed some of the status logging for the metrics payload to be less chatty on success, more informative on error.
2012-12-21MAINT-2168: Backed out changeset fb93eecd462d, reapply fixNat Goodspeed
Now that we've backed out the premature push, reapply the actual fix to propagate it appropriately.
2012-12-21MAINT-2168: Backed out changeset 797318b62275, pushed to wrong repoNat Goodspeed
This changeset was prematurely pushed to the wrong repository. Back it out to propagate it the right way.
2012-12-21MAINT-2168: fail with real message if required var PORT not set.Nat Goodspeed
llhttpclient_test.cpp is only supposed to be run by test_llsdmessage_peer.py, as specified in llmessage/CMakeLists.txt. test_llsdmessage_peer.py sets the environment variable PORT before running INTEGRATION_TEST_llhttpclient. While it's not yet clear under what circumstances INTEGRATION_TEST_llhttpclient could find PORT not set (getenv() returning NULL), it's obvious that in that case, the previous code might well crash. Make it at least fail with an explanatory message rather than a mysterious large negative integer. In theory, occurrences of that message could help us solve the underlying issue.
2012-12-20fix for SH-3151: Some textures not in view load when avatar sits down.Xiaohong Bao
2012-12-20merge changes for 3.4.4-beta3Oz Linden
2012-12-20merge changes for DRTVWR-271Oz Linden
2012-12-20Reverted mac updaterAura Linden
2012-12-20There goes a month of workAura Linden
2012-12-19MAINT-2152 Fix for bad aspect ratio on custom resolution snapshotsDave Parks
2012-12-19merge changes for 3.4.4-beta2Oz Linden
2012-12-19merge changes for DRTVWR-270Oz Linden
2012-12-19Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentNat Goodspeed
2012-12-19MAINT-1986: merge in TeamCity check in hashmap_testNat Goodspeed
2012-12-19MAINT-1986: merge in server-trunk fixesNat Goodspeed
2012-12-19MAINT-1986: in TeamCity, do not reload saved hashmap_test data.Nat Goodspeed
Rev b7fd7c95c571 allows a developer to debug a failure in hashmap_test 1. Once the test fails, rerunning that test will replay the same failure to try to permit debugging it. But that behavior is extremely undesirable under TeamCity! In a TeamCity run, don't even check for saved data file.
2012-12-18MAINT-2150 Fix for super-large ( > 4096 ) snapshots having black bordersDave Parks
2012-12-18Switched mkTempDir back to using apple standard tempdir behavior instead of /tmpAura Linden
2012-12-18MAINT-1986: patch OPSDEV-111 fix (rev 9346b73d6843) from server-trunkNat Goodspeed
2012-12-18FIX (SPECULATIVE) MAINT-1340 - Media Volume control broken on Vista+ systemscallum_linden
2012-12-18MAINT-1986: patch DEV-50942 fix (rev 28828ba0f0be) from server-trunk.Nat Goodspeed
2012-12-17Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-12-17Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-12-17MAINT-2134: Removing llassert() calls that were causing problems with the ↵William Todd Stinson
Debug and RelWithDebInfo builds. Also, reworked the rest of the methods to only apply in cases where the class instance has been initialized.
2012-12-17Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-12-17MAINT-2136 Add "RenderDepthOfFieldInEditMode" to control whether or not to ↵Dave Parks
leave DoF enabled while editing
2012-12-17increment version to 3.4.5Oz Linden
2012-12-17MAINT-2080 - remove wrong assert in LLMenuOptionPathfindingRebakeNavmesh::quit()simon@Simon-PC.lindenlab.com
2012-12-17merge changes for DRTVWR-244Oz Linden
2012-12-16MergedAura Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 07:33:33 +0000