a4f8fb48fc
Revert debugging code introduced in last check-in
2009-11-25 14:57:28 -08:00
5e41f8615f
Merge to Tip again (someone else checking in same time as me)
2009-11-25 14:54:34 -08:00
f42dbc3cae
Merge to Tip
2009-11-25 14:53:46 -08:00
cf8b851061
Fix for DEV-42324 (Default exception handler still called sometimes for SLPlugin)
...
Added some code from an online article to patch the CRT and disable all default
exception handling.
2009-11-25 14:52:22 -08:00
3efbd20980
Implement fade-out for llprogressbar, fix problem where setTopCtrl was being called
...
Review #47
2009-11-25 14:39:05 -08:00
751a904982
DEV-43046: Move media controls to the bottom of media
...
- Tweaked the algorithm to shift controls down when zoomed in.
- Adjusted some numbers in the XUI file
- Moved some hard-coded constants into the XUI file so they can be data-driven
2009-11-25 13:22:18 -08:00
45e9a060b4
DEV-41422 Show Home button and make Stop button remain enabled in time-based media controls
2009-11-25 10:40:26 -08:00
57bc7dc44f
automated merge from viewer-2-0 pull -u
2009-11-25 12:01:05 -05:00
725cdc6e5b
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-25 08:46:23 -08:00
73f909f7cd
Add Power On/Off icons
2009-11-25 08:45:54 -08:00
5f7503b252
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-25 11:21:47 -05:00
c5ef834606
Fix for EXT-2667 - making sure inv_item isn't null
2009-11-25 11:21:08 -05:00
33450e6f1f
Automated merge of ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
2009-11-25 10:48:25 -05:00
41eb231e6a
Fix for screen buffers not getting reallocated appropriately all the time (the assumption that buffers should only be reallocated if the resolution changed was wrong).
2009-11-25 00:27:43 -06:00
4b0b975e28
Merge cleanup.
2009-11-24 23:36:57 -06:00
e264f00c83
Merge
2009-11-24 23:21:57 -06:00
c9e153c182
Fix for stalls when resizing screen texture.
2009-11-24 23:14:29 -06:00
ccf6cb3f9b
viewer-2.0 automated merge
...
--HG--
branch : avatar-pipeline
2009-11-24 22:11:24 -05:00
2369fa96c2
Automated merge.
...
--HG--
branch : avatar-pipeline
2009-11-24 22:07:17 -05:00
9b9c3f03ac
EXT-2386 : The very first time you log in as a new account, your inventory sidepanel is blank
...
Changed the way that we're generating initial views for inventory panels. Instead of waiting for a notification, we check on idle and generate the views whenever we first see that the inventory has become usable.
--HG--
branch : avatar-pipeline
2009-11-24 21:58:08 -05:00
0b200c1a3a
Artwork for Stop and Zoom Out for the prim media controls
2009-11-24 18:25:26 -08:00
06fd219245
EXT2825 : Clicking on Outfit Opener in AppearanceSP should open outfits accordion
...
--HG--
branch : avatar-pipeline
2009-11-24 20:39:28 -05:00
8fb121bf2d
DEV-42130 - moved progress bar to below media controls, made it half-height per recommendation in DEV-42130
2009-11-24 17:17:08 -08:00
80f85b3937
EXT-2817 : COF contents in appearanceSP are sometimes blank on startup
...
COF folder was being removed from panel because its parent is outside the panel. Added checks so that first-level children of panel root are never to be removed.
--HG--
branch : avatar-pipeline
2009-11-24 20:14:01 -05:00
859607a423
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
2009-11-24 16:52:08 -08:00
ce7102d300
FIX DEV-43033 - the prim media controls were "stealing focus" and so would clobber any drop-downs
...
Reviewed by James (thanks, James!)
2009-11-24 16:51:04 -08:00
788dbcce66
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
...
--HG--
branch : avatar-pipeline
2009-11-24 19:48:46 -05:00
a49862a4fc
FIX DEV-41999: don't set home URL if "Multiple Media"
...
Review #44
2009-11-24 16:48:20 -08:00
6da470f189
EXT-2818 no way to get IMG_INVISIBLE as a baked texture
...
reverting unnecessary changes based on code review of previous checkin.
Code for both patches reviewed by Seraph.
--HG--
branch : avatar-pipeline
2009-11-24 19:47:56 -05:00
c8519c5a7b
Code review feedback:
...
Don't re-sort when adding to the queue: it isn't really necessary
since we sort every time we pull off the queue.
2009-11-24 15:55:53 -08:00
d3d59f6b14
Backed out changeset: ec7f6f4bd908
2009-11-24 17:51:50 -06:00
5b5354c933
Merge
2009-11-24 15:36:50 -08:00
de78ec1345
Nuke the last few references to the long-dead LCD code.
2009-11-24 15:31:34 -08:00
52a21a301b
EXT-2818 not using IMG_INVISIBLE in baked textures
...
this patch allows IMG_INVISIBLE in an alpha mask to set the baked texture to
also be IMG_INVISIBLE for the appropriate baked texture.
Will be post-reviewed with other alpha mask fixes.
--HG--
branch : avatar-pipeline
2009-11-24 18:25:20 -05:00
fb26dd7796
Merge
2009-11-24 15:05:13 -08:00
fd74ba5467
Merge to tip
2009-11-24 14:36:57 -08:00
b0a31eaaee
References a new version of LLQtWebKit - still based on Qt 4.5.2
...
Also includes a newer version of OpenSSL (0.9.8l)
2009-11-24 14:33:52 -08:00
f276b73d97
DEV-41998 - refactor mediadataclient to use a std::list, and re-sort every time an item is pulled off the queue
...
Review #43
This change refactors mediadataclient to no longer use a PriorityQueue (which sorts only on insertion), but rather just use a std::list which is re-sorted on insert, and also when "popped" (at the time the queue timer goes off).
Also implemented a unit test to make sure re-sorting occurs on timer tick.
2009-11-24 14:26:00 -08:00
ea2e0f6b09
merge
...
--HG--
branch : avatar-pipeline
2009-11-24 17:13:18 -05:00
b6c93cf540
For EXT-2584: Select and rename new folder when creating new outfit; currently works for new outfit created in side panel, but not in appearance editor
...
--HG--
branch : avatar-pipeline
2009-11-24 17:11:26 -05:00
fa88f41ccc
Rebuild of llqtwebkit for mac, as of this revision:
...
https://bitbucket.org/lindenlab/llqtwebkit/changeset/4d51abc23397/
2009-11-24 13:41:57 -08:00
07a396e311
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-24 16:12:01 -05:00
88a56949d5
made task inventory offers work the old way, and disabled inv slurls for them.
2009-11-24 15:43:29 -05:00
9e2d78aca1
Merge from product-engine
2009-11-24 12:42:14 -08:00
562cc63a29
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
...
--HG--
branch : avatar-pipeline
2009-11-24 15:34:46 -05:00
4821134aa7
EXT-2671 avatar rebaking on every login
...
We were querying agent wearables (baked texture) cache before setting
mWearablesLoaded. First thing the function does is checks mWearablesLoaded.
Moving the call down to later in the function allows us to request & use
cached baked textures again.
Code reviewed by Seraph
--HG--
branch : avatar-pipeline
2009-11-24 15:34:31 -05:00
04cf3fefca
merge
...
--HG--
branch : product-engine
2009-11-24 21:56:50 +02:00
b619f822e6
merge
...
--HG--
branch : product-engine
2009-11-24 21:55:23 +02:00
c812c616ea
merge
...
--HG--
branch : avatar-pipeline
2009-11-24 14:39:39 -05:00
fc6cfc27be
Fix for EXT-2571 to accommodate accordion panels
...
--HG--
branch : avatar-pipeline
2009-11-24 14:37:48 -05:00
callum