summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-16MAINT-2242 Fix for shader compilation errors on Intel HD graphics chips.Dave Parks
2013-01-14Added tag 3.4.5-beta2 for changeset 6b9c7dbebef7Oz Linden
2013-01-14merge changes for DRTVWR-283Oz Linden
2013-01-14tag merge of DRTVWR-283Oz Linden
2013-01-11merge changes for DRTVWR-281Oz Linden
2013-01-11tag merge of DRTVWR-281Oz Linden
2013-01-11fix line endingscallum_linden
2013-01-11MAINT-417 Backed out changeset: 7273a1ac51e8Dave Parks
2013-01-10Added tag 3.4.5-beta1 for changeset 40a2265058abOz Linden
2013-01-10merge changes for DRTVWR-280Oz Linden
2013-01-10tag merge of DRTVWR-280Oz Linden
2013-01-10merge changes for DRTVWR-279Oz Linden
2013-01-10tag merge of DRTVWR-279Oz Linden
2013-01-10pull back release tag for 3.4.4Oz Linden
2013-01-10MAINT-2209 Parcel name not updating after teleportKelly Washington
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-09Added tag 3.4.4-release for changeset e1bb1ae7d8b1Oz Linden
2013-01-09merge changes for DRTVWR-276Oz Linden
2013-01-09tag merge of 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-08tag merge of DRTVWR-277Oz Linden
2013-01-08remove duplicated return (merge artifact)Oz Linden
2013-01-08merge changes for DRTVWR-250Oz Linden
2013-01-08tag merge of 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-04pull back 3.4.4-beta4 tagOz Linden
2013-01-04Added tag 3.4.4-beta4 for changeset 05d9f1dd7a95Oz Linden
2013-01-04merge back DRTVWR-275 from 3.4.4 betaOz Linden
2013-01-03tag merge of DRTVWR-275Oz Linden
2013-01-03MAINT-2184 [crashhunters] new crash in LLUUID::toStringKelly Washington
Fix dangling references.
2013-01-02merge changes for DRTVWR-269Oz Linden
2013-01-02tag merge of DRTVWR-269Oz Linden
2012-12-28merge changes for DRTVWR-272Oz Linden
2012-12-28tag merge of DRTVWR-272Oz Linden
2012-12-27merge changes for new Havok licenseOz Linden
2012-12-25merge changes for DRTVWR-273Oz Linden
2012-12-25tag merge of DRTVWR-273Oz Linden
2012-12-21merge accidental commit and its fixOz 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-20merge changes for 3.4.4-beta3Oz Linden
2012-12-20Added tag 3.4.4-beta3 for changeset 2f8a3ef687bcOz Linden