summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
2012-12-18Pull 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-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-17Merge with viewer-materials tipKitty Barnett
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-12Clean up pending requests when regions are removed from LLWorldKitty Barnett
2012-12-12Don't call setTEMaterialID() while processing a PUT response; the region will...Kitty Barnett
2012-12-12Refactor material retrieval to always invoke the region's GET material cap firstKitty Barnett
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-11Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-12-11Merged from viewer-releaseAura Linden
2012-12-07Doing a bit of prep work for gamma correction. Set all bump and normal maps ...Geenz
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-05Clean up now unused code from llfloaterdebugmaterials.h/cppKitty Barnett
2012-12-05merge changes for DRTVWR-256Nat Goodspeed
2012-12-05Added LLMaterialMgr::getAll() to retrieve all materials for the specified regionKitty Barnett
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-04Implementing string conversion and comparison operator overrides for the LLMa...William Todd Stinson
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-12-03Handle delayed requesting and sending of materials through an idle callbackKitty Barnett
2012-12-03Added LLMaterialMgr::get() to retrieve individual materials (with optional ca...Kitty Barnett
2012-12-03Started LLMaterialMgr to handle viewer<->region materials communicationKitty Barnett
2012-12-02Refactor LLFloaterDebugMaterials::convertToPrintableMaterialID() as LLMateria...Kitty Barnett
2012-12-02Fixed two minor issues (mDiffuseAlphaMode and mAlphaMaskCutoff were reversed;...Kitty Barnett
2012-12-02Changed line editors to spin controls for all material float parameters in th...Kitty Barnett
2012-12-02Pull and merge from https://bitbucket.org/lindenlab/viewer-developmentKitty Barnett