summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
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-05MAINT-2155: replace embedded mac-updater.app with a Python script.Nat Goodspeed
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 Deb...William Todd Stinson
2012-12-14merge changes for DRTVWR-224Oz 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-12sync with viewer-developmenteli
2012-12-12Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
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-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
2012-12-05merge changes for MAINT-1953Nat Goodspeed
2012-12-05merge changes for DRTVWR-258Nat Goodspeed
2012-12-05merge changes for MAINT-1979Nat Goodspeed
2012-12-05merge changes for DRTVWR-256Nat Goodspeed
2012-12-05merge changes for MAINT-1955, MAINT-1958Nat Goodspeed
2012-12-05merge changes for DRTVWR-254Nat Goodspeed
2012-12-04merge changes for DRTVWR-253Nat Goodspeed
2012-12-04Fix merge breakagesimon@Simon-PC.lindenlab.com
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-04MAINT-1953 Run through viewer stats and update GPU table with missing entries...Dave Parks
2012-12-04merge changes for MAINT-1953Nat Goodspeed
2012-12-04Pull back upstream fixes from viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-03more for MAINT-1955: Viewer crashes while login after clearing cacheXiaohong Bao
2012-12-03more for MAINT-1955: Viewer crashes while login after clearing cacheXiaohong Bao
2012-12-03MAINT-1979 Viewer crashes while attempting to join group in the moment of loa...Kelly Washington
2012-12-03MAINT-1748 Users have an ability to sell non existing objects from content of...Kelly Washington
2012-11-30MAINT-1958 Trivial change to kick teamcity into behaving.Dave Parks
2012-11-30MAINT-1958 More robust error handling -- handle the case where the FBO alloca...Dave Parks
2012-11-30Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-11-30MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people to...Dave Parks
2012-11-30MAINT-1958 Fix for linux build after transplant.Dave Parks
2012-11-28sync with viewer-developmenteli
2012-11-27merge changes for DRTVWR-230Oz Linden
2012-11-26Automated merge with https://bitbucket.org/lindenlab/viewer-catXiaohong Bao
2012-11-26fix for MAINT-1955: Viewer crashes while login after clearing cacheXiaohong Bao
2012-11-26fix for MAINT-1955: Viewer crashes while login after clearing cacheXiaohong Bao
2012-11-26MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering ...Dave Parks
2012-11-26MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering ...Dave Parks
2012-11-26MAINT-1953 Add NVIDIA GT 230 to gpu tableDave Parks