summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-28ACME-638: Removed LLSocialList class and FBC Test tab in the People panel.Gilbert Gonzales
2013-06-28Merge with viewer-bear which was just merged with viewer-releasecallum_linden
2013-06-28merge changes for latest project integration repoOz Linden
2013-06-28move reading of the sim features to LLViewerRegion for consistency, a couple ↵Oz Linden
of minor cleanups
2013-06-28CHOP-959: Streamline processing for --graphicslevel switch.Nat Goodspeed
Use map-to in cmd_line.xml to inform the command-line processor that the target variable for --graphicslevel is RenderQualityPerformance. That lets us eliminate clunky llappviewer.cpp switch from '0' to 0, etc. Moreover, previous switch statement only accepted 0 - 3, whereas LLFeatureManager::setGraphicsLevel() actually accepts 0 - 6. Introduce LLFeatureManager::isValidGraphicsLevel() and use that to validate. Replace switch statement in setGraphicsLevel() mapping int constants to string literals with static vector of level names, using same data for mapping as for validating level numbers.
2013-06-28removed old error popups and added better logging for ACME-653Cho
2013-06-28NORSPEC-290 Shader optimization WIP -- remove a couple normalizes, pows, and ↵Dave Parks
divides from various lighting functions.
2013-06-28removed unused Me menu items for ACME-637Cho
2013-06-28NORSPEC-206: read RenderMaterialsCapability throttle rate per second from ↵Oz Linden
simulator
2013-06-28merge changes for 3.6.1-releaseOz Linden
2013-06-27Merged lindenlab/viewer-release into defaultCinder Roxley
2013-06-27Merged lindenlab/viewer-release into defaultCinder Roxley
2013-06-27Merged lindenlab/viewer-release into defaultCinder Roxley
2013-06-27ACME-629 Clean up names of variables and functions used in the Facebook ↵Gilbert Gonzales
photo panel
2013-06-27Merge with viewer-releasecallum_linden
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