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
1459c6dfd7
merge
2013-12-09 11:55:25 -08:00
24b7fd1c7f
merge with release
2013-12-09 11:55:02 -08: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
1a456c2e41
MAINT-3539 Additional checking was added to avoid possible crash.
2013-12-09 13:02:06 +02:00
4a09065691
MAINT-3539 Additional checking was added to avoid possible crash.
2013-12-09 13:02:06 +02:00
6212cd2950
MAINT-3552: crash in LLPanel::getString: Failed to find string ErrorFetchingServerReleaseNotesURL in panel floater_about
2013-12-06 17:13:30 -08: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
5bef957159
MAINT-3530 : Add viewer checkbox to extend parcel entry limits to a higher ceiling
2013-12-06 15:44:18 -08:00
b6cda94fa5
STORM-68 Remove incorrect method of setting default object permissions
2013-12-06 17:48:12 -05: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
5d2241b3d6
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-12-05 21:59:04 -08:00
6b84d40558
added some comments and changed calls from get_master_thread_recorder()
...
over to get_thread_recorder() to be agnostic about which thread we're running on
2013-12-05 21:58:45 -08:00
24a2ba7355
fix for SH-4631: Parts of linked objects are not shown in new release Second Life 3.6.11
2013-12-05 17:41:29 -07:00
72fdde2c0d
revert f24e495149fc, the fix for SH-4627: "Object out of range" is not detected on teleport.
2013-12-05 14:34:59 -07:00
11e3f8c3a1
ACME-1043 : Use a clean browser for connection to Flickr and Twitter as well
2013-12-05 12:54:15 -08:00
da135de77d
Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.
2013-12-05 15:26:38 -05:00
096530b726
STORM-68 Get display error message once to work properly
2013-12-05 14:42:14 -05:00
944840c8b1
STORM-68 Code cleanup/function renaming
2013-12-05 13:26:43 -05:00
4724232abd
SH-4611 WIP - this should prevent the case logged, which I believe is caused when cache loading fails. Can not repro so somewhat speculative.
2013-12-05 13:24:38 -05:00
744cf6be8d
merge
2013-12-05 10:39:35 -05:00
0dfc7f6145
Pull merge from lindenlab/viewer-acme
2013-12-04 21:17:04 -08:00
f5b356a7d4
ACME-1043 : Fixed! Added an argument to force a clean full feature browser window in some situations
2013-12-04 21:14:40 -08:00
526be23096
fix for SH-4627: "Object out of range" is not detected on teleport.
2013-12-04 21:46:32 -07:00
ce2cd00cc5
Removed debugging code.
2013-12-04 19:57:11 -08:00
a36c4f45b4
ACME-1043 : WIP : Add an argument to open trusted content with js and other enabled options, bypassing prefs
2013-12-04 18:02:04 -08: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
5a23bf50bc
Added slshare SLapp support for ACME-1214
2013-12-05 00:29:12 +00:00
9108354e9d
Renamed floater_social to floater_facebook for ACME-1205
2013-12-05 00:28:28 +00:00
187fb979d3
Add character count display to floater_twitter for ACME-1215
2013-12-04 19:45:26 +00:00
7e17824f61
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-12-04 12:37:11 -07:00
4a3e01f8dc
fix for SH-4631: Parts of linked objects are not shown in new release Second Life 3.6.11
2013-12-04 12:36:28 -07:00
b6d02ae9c8
Added SLURL checkbox to floater_twitter for ACME-1216
2013-12-04 18:19:47 +00:00
f7dc3937cd
SH-4641 FIX Interesting: Incorrect amount of system memory detected on Mac
2013-12-03 20:27:41 -08:00
56cbfdd55c
Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3489
2013-12-03 20:45:31 -05:00
6809348125
Creating a cleaner branch
2013-12-03 17:06:06 -08:00
3cb64c5038
SH-4606 FIX Interesting: Small objects do not load until they are very close.
...
changed culling to use inverse distance to calculate solid angle, not distance squared
2013-12-03 15:52:36 -08:00
ffff7ef59f
ACME-1117 : Fixed crash in Facebook checkin in logged out situation, check presence of region before accessing it
2013-12-03 14:22:27 -08:00
1320e5ddcd
SH-4640 WIP - use backlinks in inventory
2013-12-03 16:35:07 -05:00
6496e5877b
Pull merge from viewer-acme
2013-12-03 11:53:31 -08:00
29476d29c4
SH-4606 FIX Interesting: Small objects do not load until they are very close.
...
increased SceneLoadMinRadius to 32
changes logic so that falloff starts at SceneLoadMinRadius
added timing to pixel threshold calculation
2013-12-03 10:52:22 -08:00
443c502ccc
MAINT-3476 FIX Opening large chat histories from conversation log eats up huge amounts of memory, leading to viewer crash.
2013-12-03 19:32:56 +02:00
21d9e524f6
MAINT-3262 FIXED Cannot select image to upload to Web profile
2013-12-05 12:51:36 +02:00
69569df61c
MAINT-3351 FIXED Misleading failure message when user is successfully removed from a group's Owners role
2013-12-04 20:28:10 +02:00
ab687d3d21
merge
2013-12-03 19:28:21 +02:00
Oz Linden