summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-12-10Added placeholder http SLURL for Twitter sharing on Aditi for ACME-1216Cho
2013-12-10Pull merge from lindenlab/viewer-releaseMerov Linden
2013-12-10Automated merge with http://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-12-10mergeBrad Payne (Vir 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 changes for 3.6.12-releaseOz Linden
2013-12-09merge changes for 3.6.12-releaseOz 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-09Added tag 3.6.12-release for changeset 88bbfd7a6971Oz Linden
2013-12-09MAINT-3539 Additional checking was added to avoid possible crash.Mnikolenko ProductEngine
2013-12-09MAINT-3539 Additional checking was added to avoid possible crash.Mnikolenko ProductEngine
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-06STORM-68 Remove incorrect method of setting default object permissionsJonathan Yap
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-05ACME-1043 : Use a clean browser for connection to Flickr and Twitter as wellMerov Linden
2013-12-05Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.Monty Brandenberg
2013-12-05STORM-68 Get display error message once to work properlyJonathan Yap
2013-12-05STORM-68 Code cleanup/function renamingJonathan Yap
2013-12-05SH-4611 WIP - this should prevent the case logged, which I believe is caused ↵Brad Payne (Vir Linden)
when cache loading fails. Can not repro so somewhat speculative.
2013-12-05mergeBrad Payne (Vir Linden)
2013-12-04Pull merge from lindenlab/viewer-acmeMerov Linden
2013-12-04ACME-1043 : Fixed! Added an argument to force a clean full feature browser ↵Merov Linden
window in some situations
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-04ACME-1043 : WIP : Add an argument to open trusted content with js and other ↵Merov Linden
enabled options, bypassing prefs
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.
2013-12-05Added slshare SLapp support for ACME-1214Cho
2013-12-05Renamed floater_social to floater_facebook for ACME-1205Cho
2013-12-04Add character count display to floater_twitter for ACME-1215Cho
2013-12-04Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-12-04fix for SH-4631: Parts of linked objects are not shown in new release Second ↵Xiaohong Bao
Life 3.6.11
2013-12-04Added SLURL checkbox to floater_twitter for ACME-1216Cho
2013-12-03SH-4641 FIX Interesting: Incorrect amount of system memory detected on MacRichard Linden
2013-12-03Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3489Nat Goodspeed
2013-12-03Creating a cleaner branchAura Linden
2013-12-03SH-4606 FIX Interesting: Small objects do not load until they are very close.Richard Linden
changed culling to use inverse distance to calculate solid angle, not distance squared