summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20merge with releaseRichard Linden
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-19Pull merge from lindenlab/viewer-releaseMerov Linden
2013-06-14ACME-520 : Add more extended state in LLFacebookConnect and handle it ↵Merov Linden
consistently and transparently from the public interface
2013-06-08added Facebook status update feature for ACME-502, ACME-503, and ACME-504Cho
2013-06-05Pull merge from viewer-fbcMerov Linden
2013-06-05ACME-464 : WIP : Make the menu Connect to FB only connect and be disabled if ↵Merov Linden
the user is already connected
2013-06-05merge with viewer-releaseRichard Linden
2013-06-05ACME-471: Now using the actual map top-down image for the checked in location.Gilbert Gonzales
2013-06-05ACME-471: Code cleanup, instead of duplicating code from ↵Gilbert Gonzales
LLAgentUI::buildLocationString, now calling LLAgentUI::buildLocationString with a flag to perform a similar operation.
2013-06-05ACME-471: In last commit was not using the correct name and location. Now ↵Gilbert Gonzales
using the proper name and location.
2013-06-04ACME-471: Once connected to facebook, a user can use the 'Check in to ↵Gilbert Gonzales
Facebook' button under the 'Me' menu to make a check in post to Facebook
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-13ACME-344 : Menu hooked up. Readded the missing completedHeader() methods in ↵Merov Linden
responder that I mistakenly took out during the refactor.
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge downstream code / viewer-betasimon
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-15NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where availableDave Parks
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-04-02Merged in chui beta code.prep@lindenlab.com
2013-04-01merge changes for 3.5.0-beta7Oz Linden
2013-04-01CHUI-907 : Fixed! Suppress inexistant menu item and duplicated registrar ↵Merov Linden
entry to avoid warning
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-25NORSPEC-54 Potential fix for crashing on all sorts of random operations.Dave Parks
2013-03-25Pull and merge downstream code with CHUI viewer-development by way of ↵simon
viewer-lion
2013-03-22Fix simple bug in LLAvatarSetImposterMode::handleEvent()simon
2013-03-22Automated merge with ssh://hg.lindenlab.com/richard/viewer-interestingRichard Linden
2013-03-22merge with viewer-releaseRichard Linden
2013-03-20for SH-4004: interesting: need debug option to clear viewer cache while ↵Xiaohong Bao
still logged in
2013-03-20Prototype code for "simple imposter" mode rendering of avatars.simon
Reviewed by Kelly
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-11mergeprep
2013-03-11mergeprep
2013-03-11Viewer-chui mergeprep
2013-02-25Fixed GCC compiler error in previous changesetKitty Barnett
2013-02-25Added "Selected Material Info" menu option to query basic material ↵Kitty Barnett
information about the current selection
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-25MAINT-2268 Add right-click->"Mute Particle Owner" featureDave Parks
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-18CHUI-379 FIXED Restore Voice Morphing menumaksymsproductengine
2013-01-10Merge pull from lindenlab/viewer-betaMerov Linden
2013-01-08MergeXiaohong Bao
2013-01-04Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2012-12-24CHUI-583 FIXED Link will be opened in external browser if this preference is ↵maxim@mnikolenko
set.
2012-12-11CHUI-587 FIXED Disable menu item if "KeepConversationLogTranscripts" is false.maxim@mnikolenko
2012-12-07CHUI-580 : Fixed : Clean up the use of display name. Allow the use of the ↵Merov Linden
legacy protocol in settings.xml
2012-12-05CHUI-580 : WIP : Change the display name cache system, deprecating the old ↵Merov Linden
protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.