summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2012-11-07Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-11-07MAINT-1815 Fix for excessive memory usage in Mayfair. Disable tcmalloc. ↵Dave Parks
Disable private memory pools. Make viewer large address aware on windows. Reviewed by Kelly
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
Two fairly simple conflicts: dead stats sending code in the texture fetch code (new llcorehttp library) and the cleanup code in llappviewer was moved around in 3.4.x.
2012-11-06Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-05CHUI-468 : Suppress LLCallFloater completelyMerov Linden
2012-11-01Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-10-31Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-10-30pull back changes from 3.4.1-beta11Oz Linden
2012-10-30merge changes for DRTVWR-235Oz Linden
2012-10-20Adding expanded searching for symbols during google breakpad symbol scanDon Kjer
2012-10-17Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-16MAINT-1737: Moving files around to replace the Rebake_Region button with a ↵William Todd Stinson
menu option.
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-10-04Building headless and non-headless libraries side-by-side, removing the need ↵Don Kjer
for the BAKING cmake setting.
2012-10-04Removing server-related cmake cruft. Fixing libGLU warnings on linux.Don Kjer
2012-10-03Backed out changeset: eb957fafe167William Todd Stinson
2012-10-03Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-02Renaming the floater stinson files to be floater debug materials.William Todd Stinson
2012-09-28CHUI-345 ADDITIONAL FIX (LLConversationViewSession: enable speaking indicator)Paul ProductEngine
- Clicking on the conversation speaking icon brings up the volume floater for voice conversations
2012-09-25Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-09-21Adding the CXX to each CMake project definition.William Todd Stinson
2012-09-20Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-13Fleshed out target_link_libraries dependencies between libraries. ↵Don Kjer
Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2012-09-12Fixing merge conflicts related to restoring DRTVWR-167 changesBrad Payne (Vir Linden)
2012-09-12initial attempt to restore changes that make removing tcmalloc possible; not ↵Oz Linden
tested
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-08Automated mergeDon Kjer
2012-09-08Removed most llappearance -> llui dependencies (LLTrans remains). Moved ↵Don Kjer
LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
2012-09-07SH-3264 Porting over the XML loading of the avatar structure to llappearanceNyx (Neal Orman)
Moved over the necessary classes to llappearance to support the loading of the avatar's structure & params from file.
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
This was yet another refresh from v-d because of significant changes to lltexturefetch that would not have been resolvable by casual application of any merge tool. There are still a few questions outstanding but this is the initial, optimistic merge.
2012-09-06Extracted mWearableDatas from LLAgentWearables into ↵Don Kjer
llappearance/LLWearableData. Moved LLDriverParam into llappearance
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-03Merge VirLinden/sunshine -> don_linden/sunshine-experimentalDon Kjer
2012-09-03Extracted texture baking system into llappearance library.Don Kjer
2012-08-29First pass at throwing together a test panel for the material capability ↵William Todd Stinson
service.
2012-08-24mergeBrad Payne (Vir Linden)
2012-08-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-22CHUI-282 : WIP : Isolated llconversationview classes and suppressed the ↵Merov Linden
dependency of model to widgets
2012-08-22merge changes for DRTVWR-202Oz Linden
2012-08-22pull back release hotfix and beta fixesOz Linden
2012-08-21SH-3261 SH-3324 WIP Starting extraction of wearable/appearance librariesNyx (Neal Orman)
First pass at cmake configs, and starting to try to move wearable class. Things are broken, checkpointing work to collaborate.
2012-08-21storm-1906: correct cmake error when using precompiled llphysicsextensions_tpvOz Linden
2012-08-17Merged in from viewer-development.Aura Linden
2012-08-20CHUI-295: Problem: The places panel implemention was incomplete and trying ↵Gilbert Gonzales
to make use of a class that was not fully implemented (placesfolderview). Resoltuion: Upon creation of the places panel, placesfolderview is created which contains the proper overloaded functions to show the correct menu when right clicking.
2012-08-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-06CHUI-98 : Isolate LLConversationItem and LLConversationViewModel in their ↵Merov Linden
own file
2012-08-03Merge of viewer-development (3.4.1).Monty Brandenberg
2012-08-02Merge viewer-horde-fixes -> sunshineDon Kjer
2012-07-30CHUI-217 FIX Items are not visible in Merchant OutboxRichard Linden
cleaned up a lot custom code for folder view item creation in inbox and outbox proper initialization of views from inventory panel starting folder