12bc7eb017
merge changes for storm-823
2011-01-04 16:37:16 -05:00
2b44c8919f
STORM-823 FIXED Fixed Tab Key not working properly in floaters.
...
Bug was caused by not fiding focus root in LLUICtrl::findRootMostFocusRoot() when tab was pressed in floaters. When it was not found, LLPanel::handleKeyHere() didn't move focus to the next control.
Floaters had erroneous behaviour because of focus_root xml param: though value of focus root was set with setFocusRoot() in floater's constructor , later it was overwritten in LLFloater::initFloaterXML() with value from xml again.
This problem was introduced in af49c237b0f9 - there focus root was moved to xml.
- To fix the problem, setFocusRoot() call was added after initFromParams() in LLFloater::initFloaterXML() to set proper value of focus root after overwriting it from xml.
The drawback of the fix is that focus_root param is ignored by floaters and its value is determined depending on chrome, as it did before but the only other way to fix this problem would be to set the param in xml manually for each existing floater, and do it for each new floater added to viewer.
2010-12-30 20:18:00 +02:00
cc3f0d287c
Automated merge from viewer-development
2010-12-30 13:11:44 -05:00
e70ca1c391
merge kdu unit tests (storm-744)
2010-12-29 15:29:58 -05:00
c26eaf53f8
SH-702 Broken Window: rename shader_heirarchy.txt to shader_hierarchy.txt
...
Trivial rename (file is an unused doc file).
2010-12-29 15:19:43 -05:00
bf1d42ff96
STORM-744 : Make getMetaData pass when all is stubbed
2010-12-28 20:00:06 -08:00
5ed4046df5
STORM-744 : Throw exception consistently so llkdu fails consistently
2010-12-28 18:32:07 -08:00
d83314ad3f
STORM-744 : Fix release building issue
2010-12-28 15:58:37 -08:00
087c105317
STORM-242 : pull into viewer-development
2010-12-28 13:21:58 -08:00
5b52a801c6
STORM-805 : pull into viewer-development
2010-12-28 13:19:43 -08:00
cc11129afb
STORM-682 : pull into viewer-development
2010-12-28 13:15:07 -08:00
e4336b63b6
STORM-242 ADDITIONAL_FIX One more build fix...
2010-12-28 19:01:57 +02:00
d790003055
STORM-242 ADDITIONAL_FIX Fixed release build and error handling.
2010-12-28 14:30:52 +02:00
76e70a0da6
Automated merge with file:///Users/oz/Work/viewer-development
2010-12-28 06:58:04 -05:00
0b74df6774
STORM-523 : pull into viewer-development
2010-12-27 21:21:01 -08:00
4d296c19e5
STORM-242 FIXED Fixed incorrect release notes URL in the "You just entered a region using a different server version" notification.
2010-12-27 21:47:06 +02:00
061c3a5ab6
VWR-20879: Allow find_vc_dir() to work with VCExpress
2010-12-27 12:18:19 +00:00
0c5bd3675b
STORM-744 : Took code review into account, moving stuff back in protected or even private, fix things to work in debug mode, some clean up in j2coj also
2010-12-24 11:36:15 -08:00
f644ef0fb0
STORM-682 FIXED Fixed positioning notification toasts in mouse-look mode.
...
Toasts were positioned as if side tray was expanded.
The fix is to reshape the so-called toasts screen channel (an area where toasts are drawn)
on entering/leaving mouse-look mode, so that the screen channel can notice that side tray get in/visible.
2010-12-24 20:20:26 +02:00
265616ca02
STORM-682 WIP Removed unused code.
2010-12-24 18:53:45 +02:00
a9caa3151c
merge fix for storm-411
2010-12-24 09:08:20 -05:00
ef1c3aac88
merge fix for storm-784
2010-12-24 09:07:06 -05:00
14d830ca43
merge improved fix for STORM_785
2010-12-24 07:41:41 -05:00
5a4bb72b8d
Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-export
2010-12-23 19:41:44 -05:00
49de8add83
STORM-810 : Auto update and related changes (integration request from team chopper)
2010-12-22 23:24:58 -08:00
e874b156c5
STORM-744 : pull from STORM-151
2010-12-22 22:32:14 -08:00
f8325ac588
STORM-805 : add some printout to the log so we can trace the answer map-server-url at startup
2010-12-22 22:09:42 -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
36207fcf1a
STORM-805 : Fix the map URL
2010-12-20 12:59:17 -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
bdd07a7a64
STORM-411 FIXED The most of additional options in the Teleport History profile are always disabled
...
- Deleted unimplemented menu items from XML
- Hide "Make a Landmark" menu item in case "Teleport History Place Profile" panel is opened
2010-12-20 18:04:59 +02: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
Oz Linden