summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-20merge changes for DRTVWR-271Oz Linden
2012-12-20Reverted mac updaterAura Linden
2012-12-20There goes a month of workAura Linden
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-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-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-17increment version to 3.4.5Oz Linden
2012-12-17merge changes for DRTVWR-244Oz Linden
2012-12-16MergedAura Linden
2012-12-16Fixed small one-time memory leaks.Aura Linden
2012-12-14BOOL vs bool FIGHTAura Linden
2012-12-14merge changes for DRTVWR-224Oz Linden
2012-12-13Fixes from Oz's merge.Aura Linden
2012-12-13merge fixes from 3.4.3-beta3Oz Linden
2012-12-13merge changes for DRTVWR-267Oz Linden
2012-12-13merge changes for DRTVWR-244Oz Linden
2012-12-13Fixed whitespace issues for merge.Aura Linden
2012-12-13merge changes for DRTVWR-266Oz Linden
2012-12-13Fix line endings.Kelly Washington
2012-12-13MAINT-1995 Names of banned and allowed residents are not shown in Access tab ↵Kelly Washington
of the About Land dialog Code by Richard, reviewed by merov and kelly
2012-12-12MAINT-2082: fix deletion of an autoreplace listOz Linden
2012-12-12MAINT-2051: Implement replacement of an existing autoreplace listOz Linden
2012-12-11Merged from viewer-releaseAura Linden
2012-12-11Crash reporter fixed, debugging removed.Aura Linden
2012-12-11Interim debug checkin to test from teamcityAura Linden
2012-12-10merge changes for DRTVWR-260Oz Linden
2012-12-07Removed duplicated block of code in LLAddBuildTest.cmake. Added comment to ↵Logan Dethrow
point to duplicated code. Replaced hard-coded tcmalloc link option with variable that is created in GooglePerfTools.cmake.
2012-12-06Added compiled AutoUpdater.nib made from new AutoUpdater.xibAura Linden
2012-12-06Fixed several minor issues with validation.Aura Linden
2012-12-05merge changes for MAINT-1955Nat Goodspeed
2012-12-05merge changes for DRTVWR-259Nat Goodspeed
2012-12-05merge changes for MAINT-1951Nat Goodspeed
2012-12-05merge changes for DRTVWR-257Nat Goodspeed
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 21:47:00 +0000