summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-09increment viewer version to 3.6.13Oz Linden
2013-12-09Added tag 3.6.12-release for changeset 88bbfd7a6971Oz Linden
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-05Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.Monty Brandenberg
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-03Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3489Nat Goodspeed
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-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-26STORM-1986 Added right click Show on Map context menu for Inventory floater ↵Jonathan Yap
landmarks Possible fix for BUG-4593
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.
2013-11-26merge fix for STORM-1984Oz Linden
2013-11-26remove excessively complex fixes for MAINT-2914 and MAINT-3142Oz Linden
2013-11-26STORM-1981 Eliminate beam spreadingJonathan Yap
2013-11-26MAINT-3489: Make Mac updater script detect prematurely deleted .dmg.Nat Goodspeed
Also, delete it when done.
2013-11-25remove obsolete INSTFLAGS references from installerOz Linden
2013-11-25STORM-1981 Make pulse operate properly in both directions.Jonathan Yap
Move duplicated common code into its own function.
2013-11-25Merge. Refresh from viewer-release after 3.6.11 release.Monty Brandenberg
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-22storm-1831 Replacing old hack with an ENUM check.Ima Mechanique
2013-11-21storm-1831 Fixing message string UUID assignmentIma Mechanique
2013-11-21merge changes for 3.6.11-releaseOz Linden
2013-11-21storm-1831 Cleaning up colour LLSD processing code which is no longer used ↵Ima Mechanique
as colours come from the colors XML file.
2013-11-21storm-1831 Cleaning up output messages SyntaxLSL.Ima Mechanique
2013-11-21merge changes for 3.6.11-releaseOz Linden
2013-11-21increment viewer version to 3.6.12Oz Linden
2013-11-21Added tag 3.6.11-release for changeset 2feb70a4cfdeOz Linden
2013-11-21merge changes for open-196Oz Linden
2013-11-21storm-1831 Removing am uneccessary message.Ima Mechanique
2013-11-21storm-1831 Replacing old region changed callback setup with the shiny new one.niel@mint-32
2013-11-20storm-1831 Expanding/fixing copyright headerniel@mint-32
2013-11-20Mergeniel@mint-32
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-19add documentation to LLAgent::addRegionChangedCallback and improve loggingOz Linden
2013-11-18add callbacks to LLAgent for Region and Parcel changesOz Linden
2013-11-18merge changes for STORM-1831Oz Linden
2013-11-18add license headerOz Linden
2013-11-18Code review updates. All comments so far.Monty Brandenberg
2013-11-18add handler for socket.error to fix OPEN-196Oz Linden
2013-11-18correct attribution for open-195Oz Linden