a3e30250e8
merge
2012-01-04 09:59:57 -05:00
570d562f58
merge changes for vmrg-209 and vmrg-210 back from beta branch
2011-12-21 15:21:12 -05:00
55f1d95d97
merge changes for vmrg-210
2011-12-21 15:18:56 -05:00
ec06aa129f
add mutex to protect curl_multi-init()
2011-12-20 15:02:21 -07:00
5dc8e44c76
EXP-1499 FIXED Added some NULL checks in notifications UI code to avoid a crash on exit.
...
The crash happened if connection timed out while there were unread object inventory offers.
2011-12-20 20:44:38 +02:00
1620ad6d00
more tuning of llcurl code targeting crashes like SH-2777.
2011-12-20 11:04:10 -07:00
cfc6ac76e1
more tuning of llcurl code targeting crashes like SH-2777.
2011-12-20 11:04:10 -07:00
b022ebf13c
merge changes for storm-1734
2011-12-20 10:39:06 -05:00
2667c6a80f
merge changes for storm-653 and storm-1737
2011-12-20 09:20:36 -05:00
540dc4b955
merge up to latest viewer-development
2011-12-20 09:19:21 -05:00
5affaf264d
SH-2738 Don't lock unless we really need to
2011-12-19 16:55:21 -06:00
43e3603cd7
SH-2738 Don't lock unless we really need to
2011-12-19 16:55:21 -06:00
8ca5050231
merge changes for vmrg-206
2011-12-19 16:42:53 -05:00
4d7d582535
pull back release tags
2011-12-19 16:41:50 -05:00
58f9982fbc
SH-2738 Add comment documenting need to not make main thread wait on curl_multi_perform
2011-12-19 15:35:38 -06:00
4c8d00d1d3
update build params for oz viewer-trial build
2011-12-19 15:25:39 -05:00
c7f9c3af3c
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2011-12-19 12:44:07 -07:00
a336f1ee39
merge changes for storm-1737
2011-12-19 13:16:01 -05:00
5226629883
STORM-1737 panel_edit_skin.xml uses confusing historical terminology
2011-12-18 10:29:05 -05:00
399bd5643c
STORM-653 As a user i would like to be able to see the available number of attachments and remaining free slots.
2011-12-17 13:27:20 -05:00
c0b4ec6fe7
SH-2694 Fix for FPS drop when mousing over flexi objects (don't use an octree for flexi raycast)
2011-12-16 17:43:30 -06:00
16b6a47247
EXP-1742 FIX -- Clicking IM notification or receiving multiple IM notifications in quick succession crashes to desktop
...
* Moved toast logic for mouse hover out of the draw call to avoid chain of callbacks that lead to reordering of the draw list while we are iterating over it.
2011-12-16 15:07:04 -08:00
c7a7976010
merge changes for storm-1729
2011-12-16 10:07:31 -05:00
67fafa40ae
merge snowstorm issues to latest viewer-development
2011-12-16 10:07:06 -05:00
b015ab4bd2
merge changes for vmrg-206
2011-12-16 09:39:55 -05:00
efec138037
fix for SH-2738 and SH-2777, might also help SH-2723: heap corruption
...
SH-2738: Texture fetching freezes due to LLcurl
SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
2011-12-15 21:39:48 -07:00
4ec112bfce
fix for SH-2738 and SH-2777, might also help SH-2723: heap corruption
...
SH-2738: Texture fetching freezes due to LLcurl
SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
2011-12-15 21:39:48 -07:00
94673473ed
merge changes for storm-1653
2011-12-15 16:06:08 -05:00
916c4a79e5
merge changes for storm-1731
2011-12-15 16:05:26 -05:00
c0f5b24b54
merge changes for storm-1723
2011-12-15 16:04:40 -05:00
1b6ee87bc8
merge changes for storm-1733
2011-12-15 16:03:34 -05:00
a94a923240
storm-1723: fix character display when a lot of different characters are used
2011-12-15 15:19:50 -05:00
6b11c292c0
merge changes for vmrg-205
2011-12-15 12:57:40 -05:00
6d520dcc1c
WIP VWR-23642
2011-12-14 16:54:21 -08:00
9fa68f0da3
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-14 17:55:36 -06:00
0c5c88ff67
FIX VWR-23635
2011-12-14 15:18:59 -08:00
190b9985c6
FIX VWR-22449
2011-12-14 14:57:34 -08:00
821c964230
STORM-1736 Cropped buttons in the bottom of the Ad-hoc floater
2011-12-14 17:44:10 -05:00
d39b276b3c
FIX VWR-22392
2011-12-14 14:38:28 -08:00
1e0f11df87
sync with viewer-development
2011-12-14 13:52:43 -08:00
fdc223287c
STORM-1734 Update contributions.txt with Storm jira number
2011-12-14 13:58:46 -05:00
eb7b43fb55
STORM-1733 Menu entry Release Keys is in Advanced->Shortcuts sub-menu but has no shortcut
2011-12-14 13:21:48 -05:00
6cefa46636
EXP-1635 FIXED Made it clear that inventory snapshots are limited to 512x512 px.
2011-12-14 17:12:40 +02:00
82f043c333
EXP-1639 FIXED Fixed a resolution rounding error.
...
The error sometimes led to the following issues with maximized viewer window on MS Windows:
* displaying incorrect resolution
* failure to update snapshot
2011-12-14 15:26:13 +02:00
e4f1f611a4
merged .hgtags
2011-12-13 17:36:29 -05:00
d8aa31d10a
Added tag DRTVWR-103_3.2.4-release, 3.2.4-release for changeset bd6bcde25844
2011-12-13 16:59:12 -05:00
2dc7df91ad
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-13 15:23:55 -06:00
ac94b66a08
storm-1729: ensure that cpu id has no leading or trailing spaces for ease of comparison and formatting
2011-12-13 15:58:34 -05:00
4e92846cd5
SH-1427 Fix for redundantly applying light intensity to deferred lights.
2011-12-13 14:37:20 -06:00
7f85f6be6a
VWR-27832 L$ Transfer failures show alert as if successful
2011-12-12 20:07:34 -05:00
Brad Payne (Vir Linden)