summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-12-10Re-fix merge issue that removed "AvatarRenderInfo" cap usagesimon
2013-12-10SH-4653 FIX Interesting: Viewer crashes while reading chat historyRichard Linden
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-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-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-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-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-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.
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-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
2013-12-03SH-4606 FIX Interesting: Small objects do not load until they are very close.Richard Linden
increased SceneLoadMinRadius to 32 changes logic so that falloff starts at SceneLoadMinRadius added timing to pixel threshold calculation
2013-12-03STORM-68 Change CAP name to AgentPreferences and adjust LLSD format to mesh ↵Jonathan Yap
with server changes
2013-12-03Update based on first project viewer tests.Oz Linden
Two more bones to better address back deformation: UPPER_BACK and LOWER_BACK Better deformation for breasts, belly, upper and lower back (seen using the Body Fat and Belly Size sliders) Minor tweaks in the avatar_lad.xml file for a few other minor shapes. Small typo bug (FITMESH-2) Updated rigs and corrected female mesh Removed skeleton-only files so that people all start from the same base meshes with example skinning These updates specifically address the following bugs: FITMESH-2, FITMESH-4, FITMESH-5, FITMESH-7, FITMESH-10 (.ma formats, not .dae)
2013-12-03STORM-1989 Overlapping UI elements in Upload Model floaterJonathan Yap
2013-12-02merge with releaseRichard Linden
2013-11-27ACME-1221 : Do not clear merchant import cookie on 404, happens to newly ↵Merov Linden
minted merchants
2013-11-27merge changes for storm-1987Oz Linden
2013-11-27STORM-1986 Eliminated early return per code reviewJonathan Yap
2013-11-27STORM-1987 Inconsistent menu naming and behavior in Places floaterJonathan Yap
2013-11-26ACME-1220 : Fixed. Do not accumulate callbacks when reinitializing market placeMerov Linden
2013-11-26fix for SH-4637: Viewer-Interesting crashes if you teleport after crossing a ↵Xiaohong Bao
region border.
2013-11-26STORM-1986 Added right click Show on Map context menu for Inventory floater ↵Jonathan Yap
landmarks Possible fix for BUG-4593
2013-11-26MAINT-3319 : Fix the purge of descendents of a category. Note: the cached ↵Merov Linden
number of descendents is not always reliable
2013-11-26merge changes for storm-1984Oz Linden
2013-11-26MAINT-3489: Gracefully handle missing downloaded installer file.Nat Goodspeed
If a marker file indicates that an installer has been downloaded and verified and is ready to install, but that installer file does not exist, log it and revert to checking for update. Also add logging to every code path that can remove the installer explicitly, in case the missing installer is actually being killed off by some weird sequence of state-machine transitions.