summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-28made it optional to autoconnect in ↵Cho
LLFacebookConnect::getConnectionToFacebook() for ACME-648
2013-06-27ACME-630 Adding missing filesGilbert Gonzales
2013-06-27mergeGilbert Gonzales
2013-06-27ACME-630 Adjust floater_social.xml to load panels from files instead of ↵Gilbert Gonzales
in-lining
2013-06-27merge changes for 3.6.1-releaseOz Linden
2013-06-27increment viewer version to 3.6.2Oz Linden
2013-06-27Fixed delay in loading tabs on Facebook floater for ACME-649Cho
2013-06-27Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-27CHOP-959: Make settings.xml actually valid XML LLSD.Nat Goodspeed
UserLoginInfo block had <key>Value</key> without the required subsequent element to provide any actual value. This confused at least the Python LLSD reader.
2013-06-27Added license headers.Geenz
2013-06-27changed FBC photo sharing to use JPEG instead of PNG for ACME-636Cho
2013-06-27mergeGilbert Gonzales
2013-06-27ACME-628 Removing unneeeded headers files and used forward declarations for ↵Gilbert Gonzales
llfloatersnapshot.h, llfloatersocial.h and llsnapshotlivepreview.h.
2013-06-27Fix for down key presses not opening up the IME character selection window, ↵Geenz
and inadvertently being handled while marked text is selected.
2013-06-27CHOP-955, CHOP-957: Prioritize indra.util.llmanifest in same source repo.Nat Goodspeed
It seems that certain build hosts have an (obsolete? broken?) install of indra.util.llmanifest under the system Python. If we append the local repo indra/lib/python to sys.path, viewer_manifest.py pulls in the broken llmanifest. Prepend to sys.path instead to ensure we get the right one.
2013-06-27CHUI-817 FIX Revealing the "Conversations" window reveals hidden Nearby Chat ↵PavelK ProductEngine
window as well
2013-07-19CHUI-985 POSTPONED [CHUIBUG]User receives three friendship offer ↵maksymsproductengine
notifications simultaneously when he accept/decline friendship offer
2013-07-17CHUI-987 FIXED (Viewer crashes when you try drag and drop any object from ↵Mnikolenko ProductEngine
inventory onto avatar’s name in resident picker)
2013-07-16CHUI-978 FIXED Add Nearby chat history to the list of transcriptions if it ↵Mnikolenko ProductEngine
exists(to enable "Chat history" menu item for Nearby chat)
2013-07-10CHUI-984 FIX Clicking on voice icon no longer brings up voice volume sliderPavelK ProductEngine
2013-07-09CHUI-978 FIXED Load data from chat log file in separate thread to prevent ↵Mnikolenko ProductEngine
viewer freeze
2013-07-08CHUI-982 FIXED Clicking on conversation in conversation list to bring focus ↵maksymsproductengine
to conversation removes text entry prompt for chat bar
2013-07-02Pull merge lindenlab/viewer-releasemaksymsproductengine
2013-06-27CHOP-956: Add settings_install.xml to settings_files.xml.Nat Goodspeed
Also clarify comment for ELLPath in lldir.h: ELLPath int values are read from settings_files.xml.
2013-06-26ACME-621 : Add autoconnect to FBC in the social floater, disable Post ↵Merov Linden
buttons when not connected.
2013-06-26mergeGilbert Gonzales
2013-06-26ACME-628 Removing unneeeded headers files from llsnapshotpreview, llsnapshot ↵Gilbert Gonzales
and llfloatersocial
2013-06-26Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-26MATBUG-194 Fix for crazy colors on projector shadows with NVIDIA OpenGL 3.3 ↵Dave Parks
implementations
2013-06-26Merge vwr-dev-matGraham Madarasz (Graham)
2013-06-26Remove patch fileGraham Madarasz (Graham)
2013-06-26Added tag 3.6.1-release for changeset 75cf8e855ae1Oz Linden
2013-06-26Merge cleanup.Dave Parks
2013-06-26Automated merge with https://bitbucket.org/davep/viewer-release-iqa-1366Dave Parks
2013-06-26Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-26NORSPEC-290 Allow shader compiler to unroll loop in multiPointLightFDave Parks
2013-06-26CHUI-983 FIXED Call showHistory() after clicking toast as it was before. ↵Mnikolenko ProductEngine
Minor change in showHistory()
2013-06-26NORSPEC-29: use the MaxMaterialsPerTransaction simulator feature if availableOz Linden
2013-06-25Pull merge from lindenlab/viewer-fbcMerov Linden
2013-06-25ACME-497 : Refactor the LLSocialCheckinPanel code a bit to make it more ↵Merov Linden
maintainable
2013-06-25Merge vwr-dev-matGraham Linden
2013-06-25NORSPEC-288 remove unassertable asserts from restoring code to condition ↵Graham Linden
normals for this fix
2013-06-25mergeGilbert Gonzales
2013-06-25ACME-586: Fixing the file size appearing as red. Was using the postcard ↵Gilbert Gonzales
snap-shot type which is used for e-mailing pictures (red indicates going over 1mb).
2013-06-25MATBUG-78 Fix for alpha lighting falloff not matching opaque lighting ↵Dave Parks
falloff (again).
2013-06-25Merge pull from lindenlab/viewer-fbcMerov Linden
2013-06-25ACME-612 : Implemented a loading indicator for the map tile when it's ↵Merov Linden
loading, also disable the checkbox during that time
2013-06-25used default SL logo for image-less checkins for ACME-613Cho
2013-06-25CHOP-957: Stop looking for, or parsing, Mac arguments.txt file.Nat Goodspeed
2013-06-25CHOP-957: Stop reading gridargs.dat in 'secondlife' wrapper script.Nat Goodspeed
However, for backwards compatibility, continue to recognize and discard --skip-gridargs switch.