summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2013-03-11Viewer-chui mergeprep
2013-02-13Merge from viewer-betaprep
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
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-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-24Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentNat Goodspeed
2013-01-11Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2013-01-10Merge pull from lindenlab/viewer-betaMerov Linden
2013-01-09MAINT-1481: remove linux-updater; move logic to Linux update_installNat Goodspeed
Now that the viewer's own background updater logic is responsible for downloading a new installer, the only functionality we still use in linux-updater that couldn't be expressed more simply in bash is the UI. But since most Linux distros capable of running SL at all have zenity, and all will have xmessage, we can handle even the UI part. Add xmenity wrapper script so update_install doesn't have to care which is present, and make the bash script that used to launch linux-updater do the real work.
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-12-05Linux Viewer build fixes.Logan Dethrow
* Removed no longer used unpack_bufsize from bitpack_test.cpp * Added llviewertexture_stub.cpp to the newview tests directory to fix llworldmap_test.cpp and llworldmipmap_test.cpp linker errors.
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-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
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-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-19Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-11-19MAINT-1841 Use NVAPI to force NVIDIA GPU power management mode to prefer max ↵Dave Parks
performance Reviewed by Simon.
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-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
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-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-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-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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 19:41:00 +0000