summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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-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-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-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-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-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-26remove excessively complex fixes for MAINT-2914 and MAINT-3142Oz Linden
2013-11-26ACME-3320 : Clearing deleted categories so not to pool on them foreverMerov Linden
2013-11-26STORM-1981 Eliminate beam spreadingJonathan Yap
2013-11-25MAINT-3320 : Make inbox (Received Items) more resilients to deletion while ↵Merov Linden
we're at it
2013-11-25remove obsolete INSTFLAGS references from installerOz Linden
2013-11-25Merge last changes for DRTVWR-345simon
2013-11-25STORM-1981 Make pulse operate properly in both directions.Jonathan Yap
Move duplicated common code into its own function.
2013-11-25mergeMaximB ProductEngine
2013-11-25MAINT-3499 FIXED Region Debug Console is broken after resizemaksymsproductengine
2013-11-25Merge. Refresh from viewer-release after 3.6.11 release.Monty Brandenberg
2013-11-25Merge - doh!simon
2013-11-24STORM-1981 Rough initial changes for evaluation purposes.Jonathan Yap
2013-11-24move setting default grid to settings_install.xml so that it works on all ↵Oz Linden
platforms
2013-11-24normalize format of and add arch to all installer namesOz Linden
2013-11-22Merge server-releasesimon
2013-11-21Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-21merge changes for 3.6.11-releaseOz Linden
2013-11-21merge changes for 3.6.11-releaseOz Linden
2013-11-21increment viewer version to 3.6.12Oz Linden
2013-11-21MAINT-3480 FIXED Duplicated strings are deletedMnikolenko ProductEngine
2013-11-21MAINT-3471 FIXED Set USER_LOCALE when updating item count.Mnikolenko ProductEngine
2013-11-19MAINT-2287 : Fix merge errors when merging viewer-releaseMerov Linden
2013-11-19ACME-3319 : Consolidate Merchant Outboxes when several are present into one ↵Merov Linden
in the right place
2013-11-19STORM-1980 Merge changes Oz made (new way of detecting an agent has changed ↵Jonathan Yap
regions) Modify code to make use of the changed callback
2013-11-19STORM-1980 Minor xml changeJonathan Yap
2013-11-19replace uses of LLEnvManagerNew::setRegionChangeCallback with ↵Oz Linden
LLAgent::addRegionChangedCallback
2013-11-19MAINT-3469 FIXED '\n' is shown in 'Can't divide land' notification instead ↵Mnikolenko ProductEngine
of new string
2013-11-19add documentation to LLAgent::addRegionChangedCallback and improve loggingOz Linden
2013-11-18Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-18add callbacks to LLAgent for Region and Parcel changesOz Linden
2013-11-18MAINT-3319 : WIP : Introduce a consolidate folder method used for Merchant ↵Merov Linden
Outbox
2013-11-16STORM-1980 Code cleanup and an attempt to fix a mac/linux compile errorJonathan Yap
2013-11-15MAINT-3320 : Fixed! Inventory panels are not resistant to folder root ↵Merov Linden
deletion, using handle instead of pointer and cleaning things consistently
2013-11-15STORM-1980 Added a floater displaying a countdown timer.Jonathan Yap
Removed most of the previous changes.
2013-11-13MAINT-3320 : WIP : Introduced a cleanOutbox() method to be called on outbox ↵Merov Linden
deletion