summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-22merge changes for DRTVWR-287Oz Linden
2013-01-22Add debug level logging for Avatar by default. Will need to turn this off ↵Brad Payne (Vir Linden)
before general release, but will give us better debugging info during testing
2013-01-18SH-3344 WIP - more texture load monitoringBrad Payne (Vir Linden)
2013-01-16MAINT-2247 Child object does not update rotation while selected.Kelly Washington
2013-01-16MAINT-2242 Fix for shader compilation errors on Intel HD graphics chips.Dave Parks
2013-01-16mergeBrad Payne (Vir Linden)
2013-01-16SH-3645 WIP - preserve item order after wearable save asBrad Payne (Vir Linden)
2013-01-15SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an ↵Brad Payne (Vir Linden)
obnoxious and widely-used workaround, re-create COF link after wearable edit to force COF version bump
2013-01-14SH-3632:Undo change is now disabled after you save and return to the edit ↵prep
out fit panel (this behavior is now make sunshine-internal consistent with 3.4.1)
2013-01-14removed yet another logcontrol.xml commitBrad Payne (Vir Linden)
2013-01-14merge changes for DRTVWR-283Oz Linden
2013-01-11merge changes for DRTVWR-281Oz Linden
2013-01-11fix line endingscallum_linden
2013-01-11MAINT-417 Backed out changeset: 7273a1ac51e8Dave Parks
2013-01-11SH-3639 WIP - cleaned up some diagnostics and added fault injection ability. ↵Brad Payne (Vir Linden)
Disabled inventory retries for now.
2013-01-11mergeBrad Payne (Vir Linden)
2013-01-10merge changes for DRTVWR-280Oz Linden
2013-01-10mergeBrad Payne (Vir Linden)
2013-01-10SH-3639 WIP - increased retry interval to allow for intermittent extremely ↵Brad Payne (Vir Linden)
slow responses
2013-01-10MAINT-2209 Parcel name not updating after teleportKelly Washington
2013-01-10SH-3142: Added a debug option that circumvents the precache delay when ↵prep
teleporting.
2013-01-09viewer-development mergeBaker Linden
2013-01-09[MAINT-2185] Unable to upload terrain .raw filesBaker Linden
- Fixed an issue where a slash was prepended to the beginning of the filename (which happened to be the full path)
2013-01-09SH-3600. Undo change is disabled upon reentry into the appearance panelprep
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-09mergeprep
2013-01-09SH-3620: Fix for editing a nocopy wearable being removed from the outfitprep
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-08mergeBrad Payne (Vir Linden)
2013-01-07FIX INTL-110 remove utf8 BOMeli
2013-01-07FIX INTL-110 fix corrupted chinese character in translationeli
2013-01-07SH-3344 WIP - keep avatar local textures flagged no-delete while in useBrad Payne (Vir Linden)
2013-01-07merge with headcallum_linden
2013-01-04merge back DRTVWR-275 from 3.4.4 betaOz Linden
2013-01-03MAINT-2184 [crashhunters] new crash in LLUUID::toStringKelly Washington
Fix dangling references.
2013-01-02merge changes for DRTVWR-269Oz Linden
2012-12-28merge changes for DRTVWR-272Oz Linden
2012-12-21mergeBrad Payne (Vir Linden)
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-20Disabling build of headless appearance utilityDon Kjer
2012-12-20Skipping rendering of unneeded morph masksDon Kjer