Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
James Cook 123ef91f2d Partial EXT-1735 added "for sale" clickable icon next to landmark star 2009-11-24 17:28:02 -08:00
Kent Quirk f9ef8fc4b3 EXT-2764 EXT-2766 add and remove help ids to reflect reality 2009-11-24 20:19:33 -05:00
Rick Pasetto 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
Loren Shih 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
Rick Pasetto 859607a423 Automated merge with ssh://rick@hg.lindenlab.com/skolb/media 2009-11-24 16:52:08 -08:00
Rick Pasetto 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
Nyx (Neal Orman) 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
Rick Pasetto a49862a4fc FIX DEV-41999: don't set home URL if "Multiple Media"
Review #44
2009-11-24 16:48:20 -08:00
Nyx (Neal Orman) 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
James Cook dcb1f0e862 Clean up some unused parameters noted in code review with Richard. 2009-11-24 15:57:32 -08:00
Rick Pasetto 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
Dave Parks d3d59f6b14 Backed out changeset: ec7f6f4bd908 2009-11-24 17:51:50 -06:00
Steve Bennetts 5b5354c933 Merge 2009-11-24 15:36:50 -08:00
Bryan O'Sullivan de78ec1345 Nuke the last few references to the long-dead LCD code. 2009-11-24 15:31:34 -08:00
Nyx (Neal Orman) 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
James Cook 5e6fb96b0b Expose floater close, etc. button images in XML.
Renamed EFloaterButtons to EFloaterButton
Review with Richard pending
2009-11-24 15:16:27 -08:00
Steve Bennetts fb26dd7796 Merge 2009-11-24 15:05:13 -08:00
callum fd74ba5467 Merge to tip 2009-11-24 14:36:57 -08:00
callum 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
Rick Pasetto 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
Brad Payne (Vir Linden) ea2e0f6b09 merge
--HG--
branch : avatar-pipeline
2009-11-24 17:13:18 -05:00
Lis Pardi e6ce8d1a06 ext-2814 turn off border on "Press a key to select" floater 2009-11-24 17:12:28 -05:00
Brad Payne (Vir Linden) 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
Monroe Linden 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
Eric M. Tulla (BigPapi) 07a396e311 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-24 16:12:01 -05:00
Vadim Savchuk a7d2130464 Fixed major bug EXT-2701 (Recent People > last_interaction value is not internationalized).
Made the avatar last interaction time localizeable.
This also fixes task EXT-1096 (Implement Recent time in Recent People list for Avatar items).

--HG--
branch : product-engine
2009-11-24 22:59:00 +02:00
Justin C. Rounds (Chuck) 6f95a90b22 Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/ 2009-11-24 15:55:29 -05:00
Justin C. Rounds (Chuck) 7f4e9e2cdc Updated to use new button art.
http://jira.secondlife.com/browse/EXT-2732
2009-11-24 15:54:36 -05:00
Eric M. Tulla (BigPapi) 88a56949d5 made task inventory offers work the old way, and disabled inv slurls for them. 2009-11-24 15:43:29 -05:00
Steve Bennetts 9e2d78aca1 Merge from product-engine 2009-11-24 12:42:14 -08:00
Sergei Litovchuk 11a9fe3e7c Fixed critical EXT-2469 "Viewer crashes in the Floater Call".
- Replaced a boost::function in VoiceChannel by a boost::signal connection for calling VoiceChannel state change callback.

--HG--
branch : product-engine
2009-11-24 22:38:32 +02:00
Nyx (Neal Orman) 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
Nyx (Neal Orman) 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
Lis Pardi cb48c896d6 ext-2591 Missing tool tip on texture icon in New Permissions Floater 2009-11-24 15:33:45 -05:00
Lis Pardi 9e9a6e5c0e Automated merge with ssh://lis@hg.lindenlab.com/james/gooey 2009-11-24 15:23:22 -05:00
Lis Pardi 724950bac9 ext-2557 buttons should not be bolded -- changing default button size from SansSerifMedium to SansSerifSmall 2009-11-24 15:23:11 -05:00
Vadim Savchuk 04cf3fefca merge
--HG--
branch : product-engine
2009-11-24 21:56:50 +02:00
Vadim Savchuk b619f822e6 merge
--HG--
branch : product-engine
2009-11-24 21:55:23 +02:00
James Cook 179582a195 Merge 2009-11-24 11:54:45 -08:00
James Cook 81e6c0f6ef Fixed double-semicolon. Last commit reviewed with Leyla. 2009-11-24 11:52:12 -08:00
Brad Payne (Vir Linden) c812c616ea merge
--HG--
branch : avatar-pipeline
2009-11-24 14:39:39 -05:00
James Cook 58ee415c49 Fixed line editor right padding to work when left padding also assigned
Eliminated UILineEditorHPad and added 2 px of padding to all custom line
editors.
EXT-1735 Show parcel property icons
Review with Leyla pending
2009-11-24 11:39:22 -08:00
Brad Payne (Vir Linden) fc6cfc27be Fix for EXT-2571 to accommodate accordion panels
--HG--
branch : avatar-pipeline
2009-11-24 14:37:48 -05:00
Vadim Savchuk 87d7c6d6f9 Work on task EXT-2092 (Task Panel tabs should toggle visibility of the panel).
Made the People and Me task panels support the desired tri-state behavior.
Until all the other task panels support that behavior, it is disabled.

--HG--
branch : product-engine
2009-11-24 21:18:09 +02:00
Rick Pasetto 6d5aff5aec Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-24 11:04:32 -08:00
Eugene Mutavchi 3d2fbad4ca Fixed normal bug EXT-2570 (There is no connecting/leaving spatial voice chat notifications in the nearby chat)
--HG--
branch : product-engine
2009-11-24 20:57:41 +02:00
Sergey Borushevsky 240c21cc2d Related to implementation of EXT-2517 (Add support for the viewer 1.23 chat history style (widget-less))
- reverted changes in session processing code in LLIMFloater::onClose in rev. bd3f78cc1c42.

--HG--
branch : product-engine
2009-11-24 20:34:05 +02:00
Sergey Borushevsky c227f93b1a Fixed minor bug EXT-2745 (Contents of Groups field duplicates after IM session has been started)
--HG--
branch : product-engine
2009-11-24 20:27:56 +02:00
Lis Pardi 95e123ae41 ext-2557 Buttons should not be bolded -- changes to remove font="SansSerifMedium" and "SansSerif" on buttons 2009-11-24 13:00:45 -05:00
Rick Pasetto b8a046f7d9 Automated merge with ssh://rick@hg.lindenlab.com/skolb/media 2009-11-24 09:56:59 -08:00