summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2013-12-19merge addition of LLAgent::removeRegionChangeCallbackOz Linden
2013-12-18STORM-1980: set new region restart sound uuidOz Linden
2013-12-18STORM-1831 Changing addRegionChangedCallback to more closely resemble the ↵Ima Mechanique
feature it replaces. This fixes the crashes reported by Whirly ;-)
2013-12-17add LLAgent::removeRegionChangedCallbackOz Linden
2013-12-17merge changes for open-113Oz Linden
2013-12-17merge changes for 3.6.12-releaseOz Linden
2013-12-17Mac Fullscreen fix for MAINT-3288 and MAINT-3135Aura Linden
2013-12-17Mac Fullscreen fix for MAINT-3288 and MAINT-3135Aura Linden
2013-12-16merge changes for storm-1993Oz Linden
2013-12-16merge changes for storm-1992Oz Linden
2013-12-16merge changes for storm-1989Oz Linden
2013-12-16merge changes for storm-1987Oz Linden
2013-12-16merge changes for storm-1986Oz Linden
2013-12-16merge changes for storm-1981Oz Linden
2013-12-13Merge downstream codesimon
2013-12-13MAINT-3522 FIXED Continue loop after adding Nearby chat history to the list.Mnikolenko ProductEngine
2013-12-13mergeMaximB ProductEngine
2013-12-12MAINT-3519 (Resident is able to share worn clothes.)MaximB ProductEngine
2013-12-11MAINT-3575: remove old exe if found in current install directoryOz Linden
2013-12-11removing of dos line endingmaksymsproductengine
2013-12-11OPEN-113 Use better way of testing for stub that will not impact TPVs.Jonathan Yap
2013-12-11Workaround for MAINT 3099: remove any Vivox log file left in the program folderOz Linden
2013-12-11OPEN-113 Build > Upload > Model > Calculate weights & fee is not disabled in ↵Jonathan Yap
OS built viewers
2013-12-11BUG-4685: remove any SecondLife.exe file left in the SecondLifeViewer folder ↵Oz Linden
by an install prior to 3.12
2013-12-10SH-4653 FIX Interesting: Viewer crashes while reading chat historyRichard Linden
fixed code that was causing abnormal thread termination in the first place
2013-12-10Re-fix merge issue that removed "AvatarRenderInfo" cap usagesimon
2013-12-10MAINT-3571: include settings_install.xml whether it contains settings or notOz Linden
2013-12-10Pull merge from lindenlab/viewer-releaseMerov Linden
2013-12-10Automated merge with http://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-12-09Automated merge with http://bitbucket.org/lindenlab/viewer-lionRichard Linden
2013-12-09Merge in downstream code for 3.6.13simon
2013-12-09MAINT-3017 FIX Inventory filter for Recent tab does not persist between ↵Richard Linden
sessions as it used to. added names back to inventory filters, so they can be deserialized
2013-12-09Pulled viewer-releaseAura Linden
2013-12-09Merge. Refresh from viewer-release after 3.6.12 release.Monty Brandenberg
2013-12-09mergeRichard Linden
2013-12-09merge with releaseRichard Linden
2013-12-09increment viewer version to 3.6.13Oz Linden
2013-12-06MAINT-3552: crash in LLPanel::getString: Failed to find string ↵simon
ErrorFetchingServerReleaseNotesURL in panel floater_about
2013-12-06MAINT-3552: crash in LLPanel::getString: Failed to find string ↵simon
ErrorFetchingServerReleaseNotesURL in panel floater_about
2013-12-09Merge latest viewer release for 3.6.13simon
2013-12-06MAINT-3530 : Add viewer checkbox to extend parcel entry limits to a higher ↵simon
ceiling
2013-12-06SH-4645 Viewer hangs on exit after cancelling a mesh upload.Monty Brandenberg
Problem involved a 3-way livelock between the main, upload and decomposition threads. Viewer is shutting down but an upload is in the 'generate hulls' state. Main thread asks upload request to discard and spins waiting for it to finish. Upload thread is in generateHulls spinning waiting for the decomposition thread to process a mesh request. Decomposition thread is sleeping waiting for main thread to deliver work that upload thread has asked the decomposition thread to do.
2013-12-05Automated merge with http://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-12-05added some comments and changed calls from get_master_thread_recorder()Richard Linden
over to get_thread_recorder() to be agnostic about which thread we're running on
2013-12-05fix for SH-4631: Parts of linked objects are not shown in new release Second ↵Xiaohong Bao
Life 3.6.11
2013-12-05revert f24e495149fc, the fix for SH-4627: "Object out of range" is not ↵Xiaohong Bao
detected on teleport.
2013-12-04fix for SH-4627: "Object out of range" is not detected on teleport.Xiaohong Bao
2013-12-04Removed debugging code.Aura Linden
2013-12-04STORM-1993 In the About Land floater only send object return time to server ↵Jonathan Yap
when it has been changed
2013-12-04STORM-1992 'Open voice connection' and 'Expand participant list' buttons are ↵Jonathan Yap
overlapping each other in IM conversation after resizing.