1ca028cd7b
STORM-812 Make bottom buttons in Object Profile identical for single and multi-prim objects
2010-12-23 17:12:37 -05:00
49de8add83
STORM-810 : Auto update and related changes (integration request from team chopper)
2010-12-22 23:24:58 -08:00
c86d6a7bbb
STORM-808 : merge webkit upgrade to Qt v4.7.1
2010-12-22 14:06:46 -08:00
6182ded4e9
SOCIAL-374 FIX (Windows) Avatar images not loading on join.secondlife.com in Webkit 4.7
...
Updated llqtwebkit build for Windows from changeset f8e31d21585d in the llqtwebkit repository.
2010-12-21 17:11:01 -08:00
ec3a58d2e3
SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7
...
Updated llqtwebkit build for Mac from changeset f8e31d21585d in the llqtwebkit repository.
2010-12-21 16:46:30 -08:00
5d6ccc5cde
SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7
...
Reviewed by Callum
2010-12-21 16:38:06 -08:00
ab100825bd
STORM-151 : pull in viewer-development
2010-12-21 15:40:42 -08:00
704873e0da
STORM-460 : pull in viewer-development
2010-12-21 15:32:03 -08:00
a2d7d12246
STORM-524 : pull in viewer-development
2010-12-21 15:30:25 -08:00
472c9363a4
STORM-453 : pull in viewer-development
2010-12-21 15:27:41 -08:00
e1b198a36b
Merge from trunk
2010-12-21 10:33:58 -08:00
a8edb1af21
STORM-151 : Fix llui_libtest integration test
2010-12-20 23:09:16 -08:00
d275251138
SOCIAL-399 FIX Viewer crash when canceling http auth on a media prim
...
Reviewed by Callum at http://codereview.lindenlab.com/5636001
2010-12-20 16:33:25 -08:00
67a914ebd7
Fix for a couple of minor merge issues.
2010-12-20 12:02:56 -08:00
fdd5348f81
Remove unimplemented software updater option. Fix potential double start of updater service.
2010-12-20 11:34:06 -08:00
dee57bea25
Merge from viewer-development.
2010-12-20 11:21:17 -08:00
2c68cb2c69
fix windows build?
2010-12-20 10:38:36 -08:00
9c97a200be
Merge - final pull of viewer-development.
2010-12-20 09:57:39 -08:00
25eef545fd
merge fix for storm-412
2010-12-20 09:06:06 -05:00
81b5931146
merge fix for storm-801
2010-12-20 09:05:09 -05:00
46422ab953
merge fix for storm-796
2010-12-20 09:04:09 -05:00
1718ca48c2
STORM-511 FIXED Display tooltip for sender name on group notices.
...
Changes:
* Set tooltip for sender name.
* Overridden handleTooltip() for the tooltip to be of normal (yellow) color.
2010-12-18 20:17:36 +02:00
fa9cbe50fa
Merge STORM-796
2010-12-18 18:39:12 +02:00
3b97a200b8
STORM-796 ADDITIONAL_FIX Fixed Mac build.
2010-12-18 18:35:32 +02:00
b59dad36ba
STORM-412 FIXED Resident profile controls aren't reshaped on changing panel width
...
- Added parameters for text boxes to follow right side of panel
2010-12-18 14:00:47 +02:00
b77fb544d2
STORM-460 FIXED "Go" button is cropped from right in the Media Browser
...
- Decreased button width
2010-12-18 12:56:31 +02:00
085a8b260d
STORM-801 FIXED Wrong checkbox label in panel preferences, advanced tab
...
- Corrected checkbox label
2010-12-18 12:18:03 +02:00
67ca1c0b62
SOCIAL-395 (FIX) LLWebContentFloater not handling Javascript size and window position parameters in
...
Change to llfloaterwebcontent.cpp is a whitespace change only to fix a broken checkin
2010-12-17 16:20:19 -08:00
f95effdacf
Better fix for CHOP-286 - reenabled bandwidth limits on linux now that we've fixed the freeze.
2010-12-17 15:59:51 -08:00
0af2c1a482
SOCIAL-371 (PARTIAL) HTTP Auth sites do not load / allow login on Media on a Prim faces in Webkit 4.7
...
Fixes broken text substituition of realm/host only.
2010-12-17 15:54:20 -08:00
63dec2a9b9
Temporary workaround for CHOP-286: bandwidth limits freeze the downloader thread on linux
2010-12-17 14:26:55 -08:00
46e8816fb0
Adding newline char at EOF so linux version builds (sigh)
2010-12-17 13:57:12 -08:00
db11a76d51
Merge from viewer-development post 2.4 release
2010-12-17 15:54:00 -05:00
3c3c9a0d49
Automated merge with https://bitbucket.org/mani_linden/viewer-development
2010-12-17 12:07:22 -08:00
67a543aa6c
ich bin stupid; this should actually fix the windows build.
2010-12-17 12:07:09 -08:00
6a6757cab4
don't rely on stream cast to bool behavior; use explicit fail call.
2010-12-17 11:35:26 -08:00
049815bd52
and don't break other builds.
2010-12-17 10:55:09 -08:00
b707048fdf
fix windows build (suppress warning from lexical_cast)
2010-12-17 10:53:02 -08:00
452d9d5e3d
Updated contributions.txt for STORM-799 and STORM-800
2010-12-17 15:15:10 +01:00
3c05ebd286
ESC-237 No static init of LLAtomics and move TFRequest out of unnamed namespace.
...
Linux startup crash appears to be due to static/global C++ init of LLAtomic
types. The initializer with explicit value makes some runtime calls and it
looks like these assume, at least on Linux, that apr_initialize() has been
called. So move the static POST count to a member and provide accessors
and increment/decrement. Command queue was built on a pointer to a class
in anonymous namespace and that's not quite valid. Made it a nested
class (really a nested forward declaration) while keeping the derived
classes in anonymous.
2010-12-16 16:42:26 -08:00
836bbd8395
SOCIAL-370 FIX (2) Links to External Web Pages not working in Floaters such as Search in Webkit 4.7 branch
2010-12-16 15:40:02 -08:00
51e53849f0
SOCIAL-393 FIX Need a keyboard shortcut to open the Web Content floater
2010-12-16 15:39:19 -08:00
4a2a9ba80a
SOCIAL-392 FIX Web Content Panel does not save location history between sessions
2010-12-16 15:34:46 -08:00
fb8ba15801
Automated merge with file:///Users/oz/Work/viewer-development
2010-12-16 17:51:35 -05:00
d4899435a0
Merge
2010-12-16 17:36:51 -05:00
95c33793a2
Merge new tag
2010-12-16 17:35:17 -05:00
8a6cb03992
Merge
2010-12-16 14:35:08 -08:00
2413789e10
Added tag 2.4.0-release for changeset 1ed382c6a08b
2010-12-16 14:26:24 -08:00
aa7e8e380b
merge fix for storm-529
2010-12-16 16:13:37 -05:00
1abfd822e5
merge fix for storm-776
2010-12-16 14:55:01 -05:00
Jonathan Yap