summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-17Merge with viewer-materials tipKitty Barnett
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 ↵Kitty Barnett
will send its own ObjectUpdate message
2012-12-12Refactor material retrieval to always invoke the region's GET material cap firstKitty Barnett
2012-12-11Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-12-10merge changes for DRTVWR-260Oz Linden
2012-12-10tag merge of DRTVWR-260Oz Linden
2012-12-10pull back release tagsOz Linden
2012-12-10Added tag 3.4.3-release for changeset 5cba5f39d0a8Oz Linden
2012-12-10merge release tagOz 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-07Merge in backed out changes.Logan Dethrow
2012-12-07Backed out changeset 69636bceb5a2.Logan Dethrow
2012-12-07Backed out changeset 227671259809.Logan Dethrow
2012-12-07Backed out changeset 5cf865a7afa7Logan Dethrow
2012-12-07Use a single multiplier value for all material fieldsKitty Barnett
2012-12-05merge changes for MAINT-1955Nat Goodspeed
2012-12-05merge changes for DRTVWR-259Nat Goodspeed
2012-12-05tag merge of DRTVWR-259Nat Goodspeed
2012-12-05merge changes for MAINT-1951Nat Goodspeed
2012-12-05merge changes for DRTVWR-257Nat Goodspeed
2012-12-05tag merge of DRTVWR-257Nat Goodspeed
2012-12-05merge changes for MAINT-1953Nat Goodspeed
2012-12-05merge changes for DRTVWR-258Nat Goodspeed
2012-12-05tag merge of 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-05tag merge of 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-05tag merge of DRTVWR-254Nat Goodspeed
2012-12-04merge changes for DRTVWR-253Nat Goodspeed
2012-12-04tag merge of DRTVWR-253Nat Goodspeed
2012-12-04merge changes for BUG-768Nat Goodspeed
2012-12-04Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-12-04Updating the comparison function to not use ascii-character comparison. ↵William Todd Stinson
This will give better sorting when the operator overriden comparators are used.
2012-12-04Implementing string conversion and comparison operator overrides for the ↵William Todd Stinson
LLMaterialID class.
2012-12-04MAINT-1953 Run through viewer stats and update GPU table with missing ↵Dave Parks
entries and new expected OpenGL versions
2012-12-04merge changes for DRTVWR-251Nat Goodspeed
2012-12-04tag merge of DRTVWR-251Nat Goodspeed
2012-12-04merge changes for MAINT-1953Nat Goodspeed
2012-12-04tag merge of DRTVWR-255Nat Goodspeed
2012-12-04tag merge of DRTVWR-252Nat Goodspeed
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 ↵Kelly Washington
loading group members * Fix one race condition that could dereference a dangling pointer. reviewed with Simon and Baker.
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 ↵Kitty Barnett
callback)
2012-12-03Started LLMaterialMgr to handle viewer<->region materials communicationKitty Barnett
* refactored LLFloaterDebugMaterials::requestPutMaterials() to use LLMaterialMgr instead * replaced "Object editing" results list with information about the active selection instead