Commit Graph

10404 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Tofu Linden be4edcd3da merge 2010-06-18 15:37:45 +01:00
Mike Antipov 89825da530 EXT-7777 WIP Implemented loading indicator for "Save" and "Save As" actions in "My Outfits" & "Edit Outfit" Panels.
EXT-7929 FIXED Updated functionality of attaching object: loading indicator gets hidden when attaching is completed.

- Fixed crash when accessing singleton on application exit.

- Updated functionality of attaching object: loading indicator was not hidden.
 * Reason: link to attachment was created without next appearance updating.
 * Fix: passed "true" into LLAppearanceMgr::addCOFItemLink to call LLAppearanceMgr::updateAppearanceFromCOF when attachments is completed. (Like for clothing).

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/611/

--HG--
branch : product-engine
2010-06-18 17:28:32 +03:00
Loren Shih 172e8edcb0 automated merge 2010-06-18 10:18:08 -04:00
Andrew Polunin 2c5af9672c EXT-5808 FIXED Added another context menu. Also Navigation Bar and Mini-Location bar are mutually exclusive now
- Implemented context menu for Mini-Location bar (menu_topinfobar.xml)
- Implemented function show_topinfobar_context_menu() (in llviewermenu.h) which displays context menu for Mini-Location bar.
- Functions toggle_show_navigation_panel() and toggle_show_mini_location_panel() modified so that Navigation Bar and Mini-Location bar are mutually exclusive (when the former is visible the latter is hidden and vice versa).
- Implemented method LLPanelTopInfoBar::onContextMenuItemClicked which handles \"landmark\" and \"copy\" Mini-Location bar context menu actions.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/607/

--HG--
branch : product-engine
2010-06-18 15:58:00 +03:00
Tofu Linden 333f60ef3c merge from PE's viewer-release 2010-06-18 12:24:21 +01:00
Vadim Savchuk a8276dfd59 Merge from default branch
--HG--
branch : product-engine
2010-06-18 14:08:46 +03:00
Andrew Dyukov 9aa7109456 EXT-7847 FIXED Disabled "trash" button if an item is selected inside selected outfit.
- Added bool mItemSelected variable and getter for it to determine if the selection inside outfit exists, and used it when determining whether to enable "Trash" button in My Outfits.

Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/600/

--HG--
branch : product-engine
2010-06-18 12:56:02 +03:00
Andrew Dyukov 7b64357562 EXT-7754 FIXED Implemented marking of worn outfit accordion header text with bold
- Added method to LLAccordionCtrlTabHeader which allows to change style of its textbox
- Added method to LLOutfitsList which marks accordion header of currently selected otfit and tied it up to BOF callbacks

Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/609/

--HG--
branch : product-engine
2010-06-18 12:22:02 +03:00
Yuri Chebotarev f26eb91c44 EXT-7766 FIX change the order of processing url matching and linebreaks
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/596/

--HG--
branch : product-engine
2010-06-18 10:49:09 +03:00
Yuri Chebotarev 884e08b509 EXT-6527 FIX Introduce new plain_text flag in LLTextBase and prevent image segment from being created if this flag is set.
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/587/

--HG--
branch : product-engine
2010-06-18 10:47:49 +03:00
Dave Parks cb50a2395b merge 2010-06-17 20:47:41 -05:00
Andrew A. de Laix e90c1399bc Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-06-17 17:21:53 -07:00
Andrew A. de Laix 9a57dc0cf3 Block installation of exception handler when app is being debugged (Darwin only). Fixes issues with debugging Darwin SL. 2010-06-17 17:21:38 -07:00
Richard Linden db846cebe9 merge 2010-06-17 17:15:40 -07:00
Richard Linden 68bfb03a9f EXT-6296 FIX "Primitive" misspelled as "Primative" in About Land menu 2010-06-17 17:14:59 -07:00
Leyla Farazha 6c121d4540 Merge 2010-06-17 16:26:26 -07:00
Leyla Farazha a6774820bc EXT-7297 Viewer does not verify that a user has sufficient L$ when buying "contents" of an object
reviewed by richard, cc Review #217
2010-06-17 16:25:44 -07:00
Leyla Farazha abd4a4e966 EXT-6957 Media Navigation & Interaction does not work for "Group" if "Anyone" is disabled.
reviewed by richard cc#216
2010-06-17 16:18:25 -07:00
Monroe Linden b022a9f158 Fix for EXT-6277 ("Edit" right-click inventory item does nothing if item is not worn).
Reviewed by Leyla.
2010-06-17 15:59:42 -07:00
Richard Nelson b52044cf26 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-06-17 15:54:27 -07:00
Loren Shih d3b9c8944b automated merge 2010-06-17 17:43:22 -04:00
Loren Shih 408484d0c1 EXT-7916 FIXED Miscllaneous UI issues with Preview Gesture Floater
EXT-7920 FIXED Start and stop buttons are not clickable

Start and stop buttons were outside the UI box containing them.
2010-06-17 17:41:02 -04:00
Brad Payne (Vir Linden) 347e88961c EXT-4919 WIP - populating new users with more gestures, and activating appropriate ones 2010-06-17 17:37:28 -04:00
Richard Linden 8d84b6e82d EXT-7811 FIX Crash to desktop during SL login 2010-06-17 13:53:19 -07:00
Loren Shih 4fc8140a1d EXT-7916 FIXED Miscllaneous UI issues with Preview Gesture Floater
See subtasks for complete lists of fixes.  The preview gesture floater had some major issues and regressions.
2010-06-17 16:36:49 -04:00
Loren Shih 9ae5e2816c EXT-7909 FIXED Cleanup llpreviewgesture #include files
Superficial header file fixes.
2010-06-17 15:43:40 -04:00
Vadim Savchuk 8cf968e00e EXT-7903 FIXED Disabled "Edit" context menu option for multi selection in the Outfit Editor.
Trivial fix, not reviewed.

--HG--
branch : product-engine
2010-06-17 21:58:37 +03:00
Vadim Savchuk 89fb6d2ddb EXT-7874 FIXED Change 'Rename' to 'Rename Outfit' in outfit context menu on 'My Outfit' tab.
Trivial change, not reviewed.

--HG--
branch : product-engine
2010-06-17 21:44:37 +03:00
Vadim Savchuk 383fd7e86f EXT-6468 ADDITIONAL FIX Changed "- Select Mature -" to "- Select maturity rating -" in group profile.
Requested by Eli and approved by Benjamin.

--HG--
branch : product-engine
2010-06-17 21:38:46 +03:00
Vladimir Pchelko 451ee947d6 EXT-7751 FIXED Show tooltip condition was updated
Fix descrition:
Show tooltip, for long-named items (title text size > text box size) when mouse over text box rectangle.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/576/

--HG--
branch : product-engine
2010-06-17 21:30:22 +03:00
Vadim Savchuk 9a5c3a2939 Fixed build.
--HG--
branch : product-engine
2010-06-17 20:54:33 +03:00
Dave Parks 9ed825fe5a Line endings fix. 2010-06-17 12:47:17 -05:00
Dave Parks d67dbf3c99 merge 2010-06-17 12:45:58 -05:00
Dave Parks fa7d983f08 Add timer for comparison against davep/viewer-release 2010-06-17 12:44:49 -05:00
Dave Parks 1cd299ec8b Fix fast timer view showing incorrect units. 2010-06-17 12:44:23 -05:00
Vadim Savchuk c75c247bc9 EXT-7620 FIXED Save outfit selection when applying filter and restore it after filter has been reset.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/603/

--HG--
branch : product-engine
2010-06-17 19:35:29 +03:00
Vadim Savchuk 9f99644360 EXT-7722 Fixed "Add to COF" and "Remove from COF" outfit context menu items to be enabled when appropriate and work properly.
Work on "Take Off - Remove from Current Outfit" and "Wear - Add to Current Outfit" menu options:
- The menu items of the outfit context menu and the My Outfits gear menu are now disabled
  when inappropriate instead of being hidden.
- The menu items get enabled/disabled depending on whether you can wear (take off) anything from the selected outfit.
  (was: depending on whether you're wearing the outfit)
- Changed the way the options work: they now only operate on clothes and attachments.
  "Add to COF" now only adds those body parts that are missing in COF;
  "Remove from COF" doesn't touch body parts at all.

  Without this change both "Add" and "Remove" options would be available simultaneously, because
  any valid outfit contains body parts. I think that would be confusing.
  And you don't expect you body parts to be replaced when doing "Add to COF'. (that's addition, not replacement)

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/585/

--HG--
branch : product-engine
2010-06-17 19:03:57 +03:00
Loren Shih 6bbbd6582f EXT-7888 FIXED Opening a gesture from an in-world object shows gesture floater with blank information
EXT-7909 FIXED Cleanup llpreviewgesture #include files

Fixed an issue that was causing gesture asset loading to fail.
Also did header file cleanup.
2010-06-17 11:10:28 -04:00
Sergei Litovchuk 8d2ddff47e EXT-7609 FIXED Added worn items indication with bold text.
Fixed updating worn items indication.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/551/.

--HG--
branch : product-engine
2010-06-17 17:42:09 +03:00
Alexei Arabadji 22189c1c46 Automated merge with https://hg.productengine.com/secondlife/viewer-release/
--HG--
branch : product-engine
2010-06-17 18:33:03 +03:00
Alexei Arabadji 09b9f5dc11 EXT-7772 FIXED Corrected button texture file name.
reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/606/

--HG--
branch : product-engine
2010-06-17 18:32:04 +03:00
Vladimir Pchelko 9fbb349ec8 EXT-7736 FIXED Reverted fix for EXT-2819 (crash in color picker).
Fix description:
    Check getParentFloater result.
Note:
    ColorsWatch have no parent Floater in EditWearable side-panel.

--HG--
branch : product-engine
2010-06-17 17:50:58 +03:00
Dessie Linden 74817f151f Merged from q/viewer-release 2010-06-17 07:42:08 -07:00
Alexei Arabadji d03338ee61 Automated merge with https://hg.productengine.com/secondlife/viewer-release/
--HG--
branch : product-engine
2010-06-17 17:41:36 +03:00
Alexei Arabadji 7aaca88e5b EXT-4568 added assertion on receiving form server sim info with empty sim name.
--HG--
branch : product-engine
2010-06-17 17:41:04 +03:00
Lynx Linden 7cc0063478 EXT-7901 FIXED Allow clicking on http://secondlife.com/app URLs.
The SLE code makes any http://<host>/app, http://<host>/region,
or http://<host>/secondlife URL be treated as a SLurl rather than a
normal http URL. This seems to be overly general, and has bitten us
because http://secondlife.com/app is used as a redirect URL for server
release notes.

In the short-term, I've made an exception for hostnames that match
"secondlife.com", so that the server release notes work again.

In the long-term, we should assess whether treating any URL that starts
with a path of "app", "region", or "secondlife" should be treated as a
SLurl. What happens when google adds "http://www.google.com/app"?
2010-06-17 15:36:05 +01:00
Mike Antipov 9745a0a9e4 EXT-7777 WIP Added several cases to show Loading indicator in "My Outfits:"
* Outfit is loading for the first time
* After user clicks:
 ** Item Context menu > Add
 ** Item Context menu > Replace

Known Issues:
1. For multi-wearable indicator will disappear after first item from the batch is worn.
   Did not fix this to not affect the stability before 2.1 release.
2. To show loading indicator first time we have to notify subscribers of LLAgentWearables.
   For now this is done from the deprecated LLAgentWearables::processAgentInitialWearablesUpdate

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/602/

--HG--
branch : product-engine
2010-06-17 17:03:05 +03:00
Alexei Arabadji ebf78baa42 Automated merge with https://hg.productengine.com/secondlife/viewer-release/
--HG--
branch : product-engine
2010-06-17 17:01:47 +03:00
Alexei Arabadji cdafe7cef5 EXT-7788 FIXED Rename in context menu shows very short text field for new name
1 Made line editor width configurable for alert notifications.
2 Set line editor width to 300px.

reviwed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/605/

--HG--
branch : product-engine
2010-06-17 17:01:18 +03:00
Mike Antipov eb973cf6b2 EXT-7755 FIXED Updated condition to not show "No Outfit" as a status when outfit is changing.
Implementation details:
 * Added flag to LLAgentWearables to determining that outfit is changing. Synchronizing it with mLoadingStartedSignal and mLoadedSignal signals.
 * Check this flag when there is no outfit set to show empty title when outfit is being changed.
 * Also updated condition to disable "Wear" button when outfit is being changed.

Additional improvements:
 * Removed reference to parent LLSidepanelAppearance from the LLPanelOutfitsInventory.
 * Now LLSidepanelAppearance is subscribed to mLoadingStartedSignal and mLoadedSignal to update its loading indicator.

Known Issue:
 * When new outfit is being worn its name is shown in title for a short moment (loading indicator is shown at this time). Then it is changed with an empty title and is shown when outfit is already worn.
If necessary it should be investigated and fixed in scope of another issue.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/593/

--HG--
branch : product-engine
2010-06-17 16:51:04 +03:00
Lynx Linden 68b956b0d3 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-06-17 13:09:28 +01:00
Lynx Linden d4232e4ae1 EXT-7887 FIXED Release note URL updated.
We now point directly to the wiki for Viewer release notes and we
include three digits in the version number. E.g.,

http://wiki.secondlife.com/wiki/Release_Notes/Second Life Beta Viewer/2.1.0
2010-06-17 13:08:59 +01:00
Tofu Linden ca21110135 grr, dos2unix again 2010-06-17 11:47:53 +01:00
Tofu Linden acfb50f61c merge from PE's viewer-release 2010-06-17 10:53:10 +01:00
Yuri Chebotarev 9eeaaf6738 EXT-7791 FIX Show inventory panel if its not visible.
reviewed by Mike Antipov, Loren Shih at https://codereview.productengine.com/secondlife/r/599/

--HG--
branch : product-engine
2010-06-17 11:02:12 +03:00
Richard Nelson 4aef5f54de EXT-7734 FIX In-world object properteis often don't show correct information
reviewed by Leyla
2010-06-16 17:32:51 -07:00
Richard Nelson 353fc2431a web browser test should always use internal browser 2010-06-16 16:54:14 -07:00
Richard Nelson ab2588a47c fix for media browser layout 2010-06-16 16:53:40 -07:00
Xiaohong Bao 599a9a97b4 trivial: remove some debug code of llpushcallstacks. 2010-06-16 16:47:56 -06:00
Xiaohong Bao 70ba555a2a adjust debug code for EXT-6792: Crash on ATI 3200 2010-06-16 16:38:51 -06:00
Loren Shih 08515a8eb3 EXT-7890 FIXED "Open" on folder of in-world contents does nothing
Removed "open" menu option, to be consistent with right-click options on inventory folders elsewhere.
2010-06-16 17:49:04 -04:00
Loren Shih 67185e19b4 EXT-5342 FIXED Open in Inventory contents does nothing for certain item types
"Open" is added conditionally based on item type.
2010-06-16 16:40:48 -04:00
Xiaohong Bao 84d3eb1bee Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-06-16 14:08:51 -06:00
Brad Payne (Vir Linden) cc5beffdf4 merge 2010-06-16 15:29:41 -04:00
Brad Payne (Vir Linden) bc91053543 EXT-6571 FIX - avoid removing links to missing wearables, which fixes a problem with ordering in multi-wearables 2010-06-16 15:26:53 -04:00
Loren Shih 5635f10c41 automated merge 2010-06-16 14:29:10 -04:00
Loren Shih 823ae2ea98 EXT-7735 FIXED When receiving a folder, "Show" (or hotlink) doesn't do anything
Fixed highlight and open item code to work for both categories and items (was previously only working for items).
2010-06-16 13:35:57 -04:00
Richard Nelson 8512897c1d turned down step volume even more 2010-06-16 10:27:58 -07:00
gabriel lee abb0ccb762 ext-7834 fixed corruption of menu item vector
reviewed by richard
2010-06-16 18:04:37 +01:00
gabriel lee 42a4ab9ae1 EXT-7834 fixed corruption of menu item vectors
reviewed by Richard
2010-06-16 18:03:03 +01:00
Richard Nelson 206ce0bb2c fix for broken rear view camera 2010-06-16 09:50:09 -07:00
Vladimir Pchelko 3ad0981d2f EXT-7823 FIXED Accordion widget was improved to show different message when no_matched_tabs in panel or no_visible_tabs in panel.
Added "no_matched" and "no_visible" text for TeleportHistory.
+ Added "no_visible" text for My Outfit list.
+ Fixed filtering in TeleportHistory.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/591/

--HG--
branch : product-engine
2010-06-16 19:43:24 +03:00
Vadim Savchuk 630296551b EXT-7747 FIXED Disable the "Add" item of wearable context menu when it's inappropriate.
The "Add" item of wearable context menu is now disabled if multiple clothes selected
or when you can't add more wearables of the given type (max number is worn).

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/595/

--HG--
branch : product-engine
2010-06-16 16:04:26 +03:00
Mike Antipov 81e2aad388 EXT-7475 FIXED Added callback to update verbs in My Inventory SP when tab in inventory panel is changed.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/597/

--HG--
branch : product-engine
2010-06-16 16:11:19 +03:00
Andrew Polunin 83c1ca9a05 EXT-7693 ADDITIONAL FIX Added assertion in the type_map to make sure xml and code are in sync
--HG--
branch : product-engine
2010-06-16 16:10:16 +03:00
Vadim Savchuk 9cb1fcec6d Merge from default branch
--HG--
branch : product-engine
2010-06-16 15:25:40 +03:00
Vladimir Pchelko b9a468aff6 EXT-7751 FIXED Sets title text for ToolTip and show ToolTip when title text > text boxsize
Reviewed by Vadim Savchuk and Mike Antipov at https://codereview.productengine.com/secondlife/r/576/

--HG--
branch : product-engine
2010-06-16 13:53:39 +03:00
Tofu Linden 9ee5a62332 merge from PE's viewer-release 2010-06-16 11:02:45 +01:00
Paul Guslisty 46ebc6d373 EXT-7576 FIXED 'Add to Outfit:' panel should shrink the top 'Edit Outfit' list to 1/3 the vertical height
- Increased height of 'Add to Outfit' panel and set animate for layout stack. Animate attrubute was set to true to force proper calculation of layout panels size when one of the layout panels can dynamically change its visibility

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/588/

--HG--
branch : product-engine
2010-06-16 11:21:20 +03:00
Paul Guslisty 5de0b6ac29 EXT-7667 FIXED There is much unnecessary empty space from the right side in the Group profile information
- Increased width of layout panel and its accordion

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/589/

--HG--
branch : product-engine
2010-06-16 11:18:38 +03:00
Alexei Arabadji 8e9d7d3d00 Automated merge with https://hg.productengine.com/secondlife/viewer-release/
--HG--
branch : product-engine
2010-06-16 11:11:07 +03:00
Alexei Arabadji f74fe0c212 EXT-7763 FIXED Made text editor of script error window as read only.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/594/

--HG--
branch : product-engine
2010-06-16 11:03:28 +03:00
Yuri Chebotarev 0a6a0c3515 merge
--HG--
branch : product-engine
2010-06-16 10:11:46 +03:00
Yuri Chebotarev a66ec792c9 EXT-7790 FIX Reset inventory filter when showing original item in inventory
reviwed by Loren Shih at https://codereview.productengine.com/secondlife/r/575/

--HG--
branch : product-engine
2010-06-16 10:10:59 +03:00
Leyla Farazha 1c15d18175 Merge 2010-06-15 17:23:21 -07:00
Leyla Farazha 8628e67b82 apply resolution cleanup 2010-06-15 17:22:35 -07:00
Leyla Farazha 83a7a342ea removing fullscreen functionality
reviewed by richard cc#212
2010-06-15 17:21:27 -07:00
Richard Linden 594d2618aa fixed crash in accordionctrl 2010-06-15 16:29:29 -07:00
Richard Linden f56bc6c04a merge 2010-06-15 15:38:45 -07:00
Richard Linden 4fb3198642 EXT-7090 WIP STRG(CTRL)+SHIFT+S in Mouselook doesnt make a snapshot
made world view extend to where menu bar would normally be when in mouselook
2010-06-15 15:25:55 -07:00
Loren Shih 4ae0a0703b EXT-7468 FIXED Remove all 2.1 COF debugging code
#ifdef'd a couple more llinfos spam to not show up in release mode.
2010-06-15 17:58:08 -04:00
Richard Linden 251a695c78 EXT-7870 - Turn down footstep volume 2010-06-15 14:54:58 -07:00
Loren Shih d801628cb4 automated merge 2010-06-15 17:12:42 -04:00
Loren Shih d2d95e9645 automated merge 2010-06-15 17:12:22 -04:00
Monroe Linden 79c4c1241b Enable the call to LLQtWebKit::setWindowOpenBehavior() on Linux, since the llqtwebkit build has been updated. 2010-06-15 14:11:26 -07:00
Loren Shih 0be5ce0a59 EXT-7468 FIXED Remove all 2.1 COF debugging code
#ifdef'd a bunch of llinfos spam to not show up in release mode.  Removed some other legacy comments.
2010-06-15 17:11:01 -04:00
Loren Shih 8294f69ea3 EXT-7651 FIXED Take out hack in isLocalTextureDataFinal for TextureDiscardLevels
Removed hack (this was just used for debugging avatar rez times).
2010-06-15 17:09:43 -04:00
Brad Payne (Vir Linden) 050199e031 merge 2010-06-15 16:57:25 -04:00
Brad Payne (Vir Linden) 3ce5e0e99d EXT-6953 FIX - enable new walk/run by default 2010-06-15 16:56:51 -04:00
Richard Linden 2b7188d614 merge 2010-06-15 13:54:06 -07:00
Richard Linden 8b95793c35 EXT-6953 WIP fixed walk cycle foot slip feedback to not speed up animation so much
also, made camera default target and offset live-settable for debugging

reviewed by vir
2010-06-15 13:53:40 -07:00
Loren Shih f12aa928c5 EXT-7758 FIXED Take out "Change FolderType" for viewer2.1.
Change folder type is now keyed off of SUPPORT_ENSEMBLES versus being available in non-release viewers.
2010-06-15 15:56:54 -04:00
Loren Shih 40133be7be EXT-7829 FIXED Corrupted graphics in inventory side panel (gray box)
Took out ensemble folder icon use, replaced with default icons.
2010-06-15 15:56:46 -04:00
Brad Payne (Vir Linden) f8a8499c9d merge 2010-06-15 15:01:08 -04:00
Andrew Polunin e460985ddf EXT-7639 FIXED added shop button which reacts according to the ticket description
- Added method LLAccordionCtrl::getExpandedTab() which search for the first expanded accordion tab. This method is a bit of hacking, but I discussed it with Vadim Savchuk.
- LLAccordionCtrlTab::isExpanded() is made 'const'. This is necessary to call it from getExpandedTab() which is also 'const'.
- Added all provided Marketplace URLs (taken from EXT-7257) to the settings.xml. So URLs can be configured without recompilation.
- Added method LLCOFWearables::getSelectedItems() which can be used to get ALL selected items (not only one).
- Class LLShopURLDispatcher is implemented in the llpaneloutfitedit.cpp.
- Added callback LLPanelOutfitEdit::onShopButtonClicked() which calls LLShopURLDispatcher to send user to the correct URL.
- Added shop button (shop_btn) widget in panel_outfit_edit.xml. It has invalid icon for now. After review I'm going to reassign the ticket to someone who will provide correct icons.

Reviewed by Vadim Savchuk and Mike Antipov at https://codereview.productengine.com/secondlife/r/569/

--HG--
branch : product-engine
2010-06-15 21:52:15 +03:00
Brad Payne (Vir Linden) 9b014886b0 merge 2010-06-15 14:36:32 -04:00
Monroe Linden d6af2d0985 Fix for EXT-7414 (Jumping to a specific time in a video stream does not work in Viewer 2.)
This was a race condition.  In the repro case, LLViewerMediaImpl::seek() was getting called before the media source got a chance to be loaded (since the load is now delayed at least 1 frame due to the priority calculations), so the seek command was being dropped.

The fix is to save the seek time in mPreviousMediaTime in this case, and rearrange the code in LLViewerMediaImpl::loadURI() so that it gets used whenever it's non-zero.  I've also added similar code in LLViewerMediaImpl::pause() and LLViewerMediaImpl::start() to set mPreviousMediaState.  (If there are any cases where content wants parcel media to start out paused, they would have had a similar issue.)

Reviewed by Callum and Richard at http://codereview.lindenlab.com/2478002 .
2010-06-15 10:53:02 -07:00
Richard Linden a37e6ce52e merge 2010-06-15 10:25:47 -07:00
Vadim Savchuk 33c3064639 EXT-7808 FIXED Renamed the "Wear" context menu item to "Replace" in My Outfits and Add Wearable panels.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/582/

--HG--
branch : product-engine
2010-06-15 20:23:39 +03:00
Brad Payne (Vir Linden) 44f65edd68 merge 2010-06-15 12:53:56 -04:00
Lynx Linden da078d9a35 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-06-15 17:28:33 +01:00
Lynx Linden b2b6d52807 EXT-7851 FIXED Cleaned up code to avoid confusion.
The mTmpWriteBuffer member variable was never actually being allocated
because it was being shadowed by a local variable. This is why the
code never crashed. I've removed the member variable as it was clearly
never used and really confused the code.
2010-06-15 17:28:17 +01:00
Vladimir Pchelko 26c97318aa EXT-7776 FIXED Button label was renamed.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/578/

--HG--
branch : product-engine
2010-06-15 18:36:58 +03:00
Tofu Linden 85c14e4510 fix minor xml barf. 2010-06-15 15:53:04 +01:00
Tofu Linden 65d8872507 merge fix in unrelated file. 2010-06-15 15:35:47 +01:00
Tofu Linden b9ea8cc0b5 final(?) merge to revert snapshot floater to 2.0.1 level. 2010-06-15 14:55:05 +01:00
Tofu Linden 9fd6bab430 Backed out changeset 1acc14a5e7ac 2010-06-15 14:51:03 +01:00
Tofu Linden 66caff142a merge backout. 2010-06-15 14:49:55 +01:00
Tofu Linden ea412a7377 Backed out changeset 388c6d09894a 2010-06-15 14:49:45 +01:00
Tofu Linden 90250cb36d merge backout. 2010-06-15 14:49:26 +01:00
Tofu Linden 5ad91abfdf Backed out changeset b447707f20f5 2010-06-15 14:49:16 +01:00
Tofu Linden f8c91bad6b merge backout. 2010-06-15 14:48:31 +01:00
Tofu Linden f4b7164752 Backed out changeset 1c66b34b7fbe 2010-06-15 14:48:14 +01:00
Tofu Linden 472b7a94c0 merge backout. 2010-06-15 14:47:51 +01:00
Tofu Linden 565d177156 Backed out changeset c9dd9852d76b 2010-06-15 14:47:38 +01:00
Tofu Linden ff4d30edf4 merge backout. 2010-06-15 14:46:01 +01:00
Tofu Linden bc0b401359 Backed out changeset d632626f9b11 2010-06-15 14:45:51 +01:00
Tofu Linden d5d3c85215 merge backout 2010-06-15 14:45:13 +01:00
Tofu Linden 4d852aba0e Backed out changeset 688db499e2d1 2010-06-15 14:45:04 +01:00
Tofu Linden a2cb781e59 merge backout 2010-06-15 14:43:31 +01:00
Tofu Linden 87e9828fc9 Backed out changeset ccbf22ff283c 2010-06-15 14:43:19 +01:00
Tofu Linden 3a651fe406 merge backout 2010-06-15 14:41:08 +01:00
Tofu Linden b95bd0dc27 Backed out changeset 68feae2ef00a 2010-06-15 14:41:01 +01:00
Tofu Linden 10af942811 merge backout 2010-06-15 14:39:45 +01:00
Tofu Linden 0effcd8a9f Backed out changeset fb6c9a1cebfc 2010-06-15 14:39:37 +01:00
Tofu Linden 597a26aca1 merge backout 2010-06-15 14:39:18 +01:00
Tofu Linden c8dea8b6e5 Backed out changeset 2f4b18cc2bbf 2010-06-15 14:39:10 +01:00
Tofu Linden 44647bd3b1 merge reversion, leaving lldate intact. 2010-06-15 14:37:42 +01:00
Tofu Linden 10c722604a Backed out changeset 6d51a12cb2d8 2010-06-15 14:35:21 +01:00
Mike Antipov 55cc54a06f EXT-7860 FIXED added check against NULL for member pointer.
Reviewed by Vadim Savchuk.

--HG--
branch : product-engine
2010-06-15 16:02:45 +03:00
Vadim Savchuk c773e01fbf EXT-7789 FIXED Removed "Rename Outfit" option from My Outfits gear menu
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/584/

--HG--
branch : product-engine
2010-06-15 15:48:52 +03:00
Tofu Linden fce2653f6b SNOW-620 PARTIAL Infinite loop in LLSphere::getBoundingSphere
Neither the test nor the code being tested are good - the unit test can hang.  Skipping test for now, passing over to the sim maint backlog.
2010-06-15 13:26:40 +01:00
Tofu Linden 2fc77b8ee8 VWR-19683 llmediaimplgstreamervidplug gcc 4.4 build errors 2010-06-15 13:13:24 +01:00
Tofu Linden c21c192d0c EXT-7348 Can't open Advanced Menu in Linux Client
Added a new, preferred shortcut for Show Advanced Menu, that isn't eaten by the desktop on Linux.  The old shortcut also works.
2010-06-15 13:01:11 +01:00
Mike Antipov cfb9a6e341 Merge from default branch
--HG--
branch : product-engine
2010-06-15 13:26:09 +03:00
Alexei Arabadji 11903fab73 EXT-7783 ADDITIONAL FIX Corerected emitting BOF changed/replaced signals in LLOutfitObserver.
Emitting COF changed shouldn't block emitting BOF changed/replaced signals.
reviewed by Mike Antipov

--HG--
branch : product-engine
2010-06-15 12:51:13 +03:00
Mike Antipov 300cb34291 EXT-7794 FIXED Implemented a common-used notification about wearing outfit to display loading indicator.
Details:
* Added signal "Wearable Loading Started" in AgentWearables (in parallel with "Wearables Loaded")
* Now it is raised from the LLAppearanceMgr::wearInventoryCategory.

Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/583/

--HG--
branch : product-engine
2010-06-15 12:38:30 +03:00
Mike Antipov d1cb678bac Merge from default branch
--HG--
branch : product-engine
2010-06-15 11:15:51 +03:00
Richard Nelson a43c997d0a re-disabled old style properties floater 2010-06-14 17:55:50 -07:00
Richard Nelson 330b9dc6ee merge 2010-06-14 17:52:56 -07:00