summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2013-01-25CHUI-667 Upon exit from DND mode, a maximum of one sound should be played. ↵Gilbert Gonzales
Solution. Added a deferred sound class which will have sound id's added to it and upon unmuting the deferred sounds will be played.
2013-01-10Merge pull from lindenlab/viewer-betaMerov Linden
2012-12-18CHUI-499: Adding ability to serialize the communication notifications to ↵William Todd Stinson
local disk per user.
2012-12-12CHUI-499: Refactoring the persistent notification storage so that I can ↵William Todd Stinson
reuse the functionality for do-not-disturb mode.
2012-11-27merge changes for DRTVWR-230Oz Linden
2012-11-26merge changes for DRTVWR-249Oz Linden
2012-11-20Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-16Certain test and example programs now need the Boost.System library.Nat Goodspeed
2012-11-13Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-09CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and ↵AlexanderP ProductEngine
in accordance with the naming convention in the project, some classes and corresponding files should be renamed: LLIMConversation -> LLFloaterIMSessionTab LLIMFloater -> LLFloaterIMSession LLNearbyChat -> LLFloaterIMNearbyChat LLIMFloaterContainer -> LLFloaterIMContainer LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
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-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-03Backed out changeset: eb957fafe167William Todd Stinson
2012-10-03Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.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-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-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-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-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-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-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
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-27Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.Todd Stinson
2012-07-27Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-27CHUI-151 FIXED (Implement conversation log)Paul ProductEngine
A brief explanation of what have been implemented. More information can be found in comments. 1. Created conversation history viewer (llfloaterconversationpreview) 2. Created LLConversation and LLConversationLog classes which represent and hold data of conversations (llconversationlog) 3. Created LLConversationLogList and LLConversationLogListItem which are the visual representation of LLConversationLog and LLConversation respectively 4. Created LLFloaterConversationLog - which holds and displays LLConversationLogList
2012-07-25Fix to build with code signing option (patch from STORM-1900)callum_linden
2012-07-24merge to viewer-developmentoOz Linden