06d6659845
removing of dos line ending
2013-12-11 22:01:24 +02:00
97d9eee4ff
OPEN-113 Use better way of testing for stub that will not impact TPVs.
2013-12-11 14:29:52 -05:00
69dfa3507a
Workaround for MAINT 3099: remove any Vivox log file left in the program folder
2013-12-11 11:17:31 -05:00
81d1d427f1
OPEN-113 Build > Upload > Model > Calculate weights & fee is not disabled in OS built viewers
2013-12-11 10:41:28 -05:00
9399448987
BUG-4685: remove any SecondLife.exe file left in the SecondLifeViewer folder by an install prior to 3.12
2013-12-11 09:53:48 -05:00
065bbf7d38
MAINT-3553 Another checking is added to avoid possible crash.
2013-12-11 14:42:02 +02:00
321a81e371
Re-fix merge issue that removed "AvatarRenderInfo" cap usage
2013-12-10 13:24:10 -08:00
c017694d39
MAINT-3571: include settings_install.xml whether it contains settings or not
2013-12-10 15:42:21 -05:00
6ee6c2795d
merge changes for 3.6.12-release
2013-12-09 15:48:52 -05:00
bbe6b7e0f0
merge changes for 3.6.12-release
2013-12-09 15:37:37 -05:00
7dec85a53d
Merge. Refresh from viewer-release after 3.6.12 release.
2013-12-09 15:29:21 -05:00
1a9b9f1bd1
increment viewer version to 3.6.13
2013-12-09 14:52:47 -05:00
65123c4029
Added tag 3.6.12-release for changeset 88bbfd7a6971
2013-12-09 14:52:45 -05:00
4a09065691
MAINT-3539 Additional checking was added to avoid possible crash.
2013-12-09 13:02:06 +02:00
bde3be7b5d
MAINT-3552: crash in LLPanel::getString: Failed to find string ErrorFetchingServerReleaseNotesURL in panel floater_about
2013-12-06 17:13:30 -08:00
de94e8c232
Merge latest viewer release for 3.6.13
2013-12-09 15:52:00 -08:00
ea1f6a6343
SH-4645 Viewer hangs on exit after cancelling a mesh upload.
...
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-06 16:02:53 -05:00
da135de77d
Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.
2013-12-05 15:26:38 -05:00
5b40445e66
STORM-1993 In the About Land floater only send object return time to server when it has been changed
2013-12-04 19:38:52 -05:00
e390255de6
STORM-1992 'Open voice connection' and 'Expand participant list' buttons are overlapping each other in IM conversation after resizing.
2013-12-04 19:33:10 -05:00
56cbfdd55c
Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3489
2013-12-03 20:45:31 -05:00
83c62e7094
Update based on first project viewer tests.
...
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-03 09:25:30 -05:00
56f9b9c048
STORM-1989 Overlapping UI elements in Upload Model floater
2013-12-03 04:19:23 -05:00
0c6d06692e
merge changes for storm-1987
2013-11-27 12:02:04 -05:00
bb68d6a889
STORM-1986 Eliminated early return per code review
2013-11-27 10:43:02 -05:00
d533dcebf7
STORM-1987 Inconsistent menu naming and behavior in Places floater
2013-11-27 10:26:27 -05:00
db8e4824e7
STORM-1986 Added right click Show on Map context menu for Inventory floater landmarks
...
Possible fix for BUG-4593
2013-11-26 19:43:15 -05:00
ced4ccdbd2
merge changes for storm-1984
2013-11-26 19:18:04 -05:00
a55f88109f
MAINT-3489: Gracefully handle missing downloaded installer file.
...
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-26 17:18:28 -05:00
fe3a930623
merge fix for STORM-1984
2013-11-26 16:09:43 -05:00
52ec6f9af0
remove excessively complex fixes for MAINT-2914 and MAINT-3142
2013-11-26 15:09:55 -05:00
44ea72848f
STORM-1981 Eliminate beam spreading
2013-11-26 09:30:53 -05:00
9e986201ba
MAINT-3489: Make Mac updater script detect prematurely deleted .dmg.
...
Also, delete it when done.
2013-11-26 09:25:10 -05:00
6c44fe90f2
remove obsolete INSTFLAGS references from installer
2013-11-25 15:52:59 -05:00
97b932c405
Merge last changes for DRTVWR-345
2013-11-25 11:12:57 -08:00
f04c2a781c
STORM-1981 Make pulse operate properly in both directions.
...
Move duplicated common code into its own function.
2013-11-25 13:54:43 -05:00
e28bd4612e
merge
2013-11-25 20:07:28 +02:00
bae67dee23
MAINT-3499 FIXED Region Debug Console is broken after resize
2013-11-25 19:37:57 +02:00
fc4f6e2dac
Merge. Refresh from viewer-release after 3.6.11 release.
2013-11-25 12:32:21 -05:00
5756b7b3d0
Merge - doh!
2013-11-25 09:17:29 -08:00
6b1d835f95
STORM-1981 Rough initial changes for evaluation purposes.
2013-11-24 15:46:21 -05:00
79919ef9b6
move setting default grid to settings_install.xml so that it works on all platforms
2013-11-24 13:18:12 -05:00
6d6b0edfe2
normalize format of and add arch to all installer names
2013-11-24 13:16:36 -05:00
f1be57cd30
Merge server-release
2013-11-22 10:39:03 -08:00
2c5e306e14
MAINT-3474 FIXED crash on startup in LLTextureCache::purgeAllTextures(bool) attempting to delete texture cache
2013-11-22 20:16:37 +02:00
915ade1029
merge changes for 3.6.11-release
2013-11-21 15:35:25 -05:00
45bc601563
merge changes for 3.6.11-release
2013-11-21 14:08:38 -05:00
787ccaf297
increment viewer version to 3.6.12
2013-11-21 14:05:30 -05:00
bcf2611279
Added tag 3.6.11-release for changeset 2feb70a4cfde
2013-11-21 14:05:28 -05:00
4f2a7167b6
merge changes for open-196
2013-11-21 11:29:28 -05:00
maksymsproductengine