Commit Graph

388 Commits (bb3114af874ecdc628c2f49ff73b7b60feb2de5e)

Author SHA1 Message Date
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
Dave Parks cb50a2395b merge 2010-06-17 20:47:41 -05: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
Richard Nelson 353fc2431a web browser test should always use internal browser 2010-06-16 16:54:14 -07:00
Leyla Farazha 83a7a342ea removing fullscreen functionality
reviewed by richard cc#212
2010-06-15 17:21:27 -07:00
Nyx (Neal Orman) 244321e70c AVP-44 VWR-19699 FIX Multi-wearables and wearable replacement logic
Cleaned up a few things upon code review.

Code reviewed by vir for this checkin as well as following previous commits:
a801af3728ee
af42810b946c
2010-06-04 17:34:46 -04:00
Nyx (Neal Orman) 47beb6dc9c AVP-44 WIP Multi-wearables architecture
One step closer to full support of multi-wearables architecture

code will be reviewed before pushing.
2010-06-03 21:09:49 -04:00
Richard Linden 1bfd7a659b EXT-7600 FIX Context menus for line editors don't work on login screen
initialize edit menu callbacks earlier
2010-06-02 13:40:12 -07:00
Nyx (Neal Orman) cd46893057 EXT-7209 EXT-7366 EXT-7213 FIX EXT-7392 WIP
Final fixes for:
EXT-7209 camera to enter appearance edit mode
EXT-7366 change camera to face front of avatar in previews
EXT-7213 kill old appearance editor

Partial fix for:
EXT-7392 alpha mask checkboxes are not hooked up

All changes code reviewed by vir. Following commits (plus this one) reviewed with this checkin:
425d4e960450
15d04b6464a7
e92ae606de12
adc94512ea9b
24577dbbf7a4
6f28b241eae2

(sorry dessie! :) )
2010-05-27 14:40:49 -04:00
Nyx (Neal Orman) ec7dbc7040 EXT-7213 WIP kill old appearance editor and traces of code
Removed last remaining references to gFloaterCustomize.
Next step: kill the files themselves.
Will be reviewed when complete, before pushing
2010-05-26 18:22:04 -04:00
Andrew Polunin ecd93410ff EXT-7142 FIXED Upload functionality duplicated in the Build menu and Select Linked Parts menu moved up
- LLPanelMainInventory::setUploadCostIfNeeded() - uncommented the line which enables retrieving of the upload cost price using LLGlobalEconomy class.
- Implemented LLUploadCostCalculator event handler in the llviewermenu.cpp (the fact that it should be implemented in this file was discussed with Mike Antipov).
- LLUploadCostCalculator::calculateCost() is implemented only for code readability: it's name is more descriptive than a code snippet placed directly in the constructor (LLPanelMainInventory::setUploadCostIfNeeded() works in similar way: it calculates cost_str only once).
- 'Select Linked Parts' menu was moved below 'Edit Linked Parts'.
- 'Upload' menu was added at the bottom, below 'Options' menu

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

--HG--
branch : product-engine
2010-05-25 15:31:07 +03:00
Callum Prentice d84990307b VI-65 - Addition of Quick/Eazy Buy Web based floater.
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency'
Reviewed by Sam/Richard
2010-05-21 15:22:32 -07:00
Nyx (Neal Orman) f91481c82f EXT-7209 EXT-7366 FIX avatar needs to enter "appearance editing" mode
Avatar now enters "appearance editing" mode when opening the outfit or
wearable editors in the sidepanel. Changed code to ensure we don't
accidentally switch out of it and back in when switching from one to the other.

Note that this cuts out LLFLoaterCustomize from being built and shown to the user
from any UI. The code for this (and related classes) will be removed once we have
pulled any code out of it that we still need. The current outfit and wearable
editors should be working sufficiently for most purposes. Bugs should be reported
to Nyx Linden or the avatar team.

Code reviewed by Vir
2010-05-21 17:02:53 -04:00
Tofu Linden ae0dbecb1c merge from PE's viewer-trunk 2010-05-20 11:44:49 +01:00
Nyx Linden 8487341b0f AVP-44 WIP Back-end support for multiwearables
Changed a lot of areas of code that were not dealing with multiwearables properly.
Little functionality changed, as the support mechanisms that were out of date were
subtle, but getting closer to no further areas of code that don't properly support
multi-wearables.

Code reviewed by Vir.
2010-05-19 19:48:23 -04:00
Vadim Savchuk 9aacdbc155 EXT-7242 FIXED Added a new "Edit my Shape" link to avatar self-click context menu and made it open the shape editing panel.
Again, as in EXT-7241, I tried to improve the way the appearance panels (outfits / edit outfit / edit wearables) are switched, this time aiming to eliminate redundant time-consuming operations (fetches/updated/etc).
I'm not particularly satisfied with the resulting code but it seems to work. A better solution might be to wrap the panels with LLSideTrayPanelContainer.

Additional minor changes:
- Fixed unsafe pointer cast in LLSidepanelAppearance::editWearable().
- Removed redundant onEditOutfitButtonClicked() and onEditWearBackClicked() methods from LLSidepanelAppearance.

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

--HG--
branch : product-engine
2010-05-19 14:03:29 +03:00
Vadim Savchuk 53a5b74af1 EXT-7241 FIXED Changed all "Edit Appearance" links to "Change Outfit" and pointed them to the My Outfits tab.
Renamed the following menu items to "Change Outfit" and made them open My Outfits tab:
- Avatar in-world context menu -> My Appearance.
- Avatar inspector menu -> My Appearance.
- Me -> My Appearance.

To enable the Appearance SP switch to My outfits I cleaned up the logic of switching between my outfits <-> edit outfit <-> edit wearable panels.

Also done the following cleanups and minor improvements:
- Removed unused LLSidepanelAppearance::mEditBtn and mLookInfoType members.
- Removed empty LLSidepanelAppearance::updateVerbs() method.
- Made the "params" argument of LLSideTray::showPanel() and togglePanel() optional.

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

--HG--
branch : product-engine
2010-05-15 14:40:15 +03:00
Roxie Linden 215ae1ed5d DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunk
Includes: DEV-45800, DEV-45803 - Grid Manager
DEV-45804 - SLURL refactor
DEV-45801 - Single username field (for Identity Evolution and SLE Ldap)
Also,
Includes Certificate Management code allowing the viewer to connect to
grids not signed by a well know key (just like any web browser).  Also
contains secure storage for things like passwords.
The security/certificate code is modular with the intention of adding modules
to directly use the operating system facilities for crypto if available.
(that's much more secure than we'll ever be)

Also, refactor of voice to modularize it, and add a diamondware voice module.
CR:  Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-05-11 12:39:40 -07:00
Loren Shih adc0aba2dd EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
Refactored LLWearableDictionary to look more like LLAssetType/LLFolderType/etc. in terms of code design.  This required a lot of superficial changes across many files.  Overall functionality has not changed.
2010-05-11 15:08:29 -04:00
Roxie Linden a11ec0c89f Automated merge 2010-05-04 16:09:14 -07:00
Karl Stiefvater (qarl) 8daf25b65c EXT-6775 Remove support for full-screen mode in Viewer 2. reviewed by davep. 2010-05-03 15:23:45 -05:00
Roxie Linden 8d8f167a4e automated merge with trunk 2010-04-19 16:24:05 -07:00
Roxie Linden 8ba5517a08 Automated merge 2010-04-07 13:20:33 -07:00
Loren Shih 52293aa4bb automated merge 2010-04-07 14:47:25 -04:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden adce2ecdf8 PE merge from pe-viewer-trunk 2010-04-07 13:03:35 +01:00
Tofu Linden 8da371b0f0 merge 2010-04-07 12:16:36 +01:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Loren Shih c3d9316dff EXT-6727 : Allow LLInventoryObservers to target a single item (instead of a vector of items)
Added new constructors to LLInventoryFetch types to allow passing in a single item.
2010-04-06 17:30:23 -04:00
Loren Shih cdbdb11686 EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically
FetchObservers now take in a list of IDs to check against.
Made some naming changes.
2010-04-06 14:47:20 -04:00
Loren Shih 785d4c34b6 EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically
Preliminary work to clean up naming conventions.
2010-04-06 10:19:15 -04:00
Vadim Savchuk 4a997e9627 Merge from default branch
--HG--
branch : product-engine
2010-04-06 17:17:33 +03:00
Loren Shih 2eba9819df EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h

Change made to simulator files as well.
2010-04-05 15:02:36 -04:00
Loren Shih 568d6ed229 EXT-5940 : INFRASTRUCTURE: Typedef all vector<LLUUID>'s
Fixed some more typedefs that I missed in first checkin.
2010-04-02 15:19:44 -04:00
Vadim Savchuk 7d38dd51c2 Manual merge from default branch.
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357.

--HG--
branch : product-engine
2010-04-02 17:18:36 +03:00
Vadim Savchuk f6b48339d9 Fixed major bug EXT-6595 (World->Place Profile flyout menu doesn't include link to side panel place info).
Added a new main menu item: World -> Place Profile -> Place Profile.
I'm not sure about its label though (double "Place Profile").

Reviewed by Sam: https://codereview.productengine.com/secondlife/r/161/

--HG--
branch : product-engine
2010-04-02 15:49:13 +03:00
Roxie Linden 9523c70f9d DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunk
Includes: DEV-45800, DEV-45803 - Grid Manager
DEV-45804 - SLURL refactor
DEV-45801 - Single username field (for Identity Evolution and SLE Ldap)
Also,
Includes Certificate Management code allowing the viewer to connect to
grids not signed by a well know key (just like any web browser).  Also
contains secure storage for things like passwords.
The security/certificate code is modular with the intention of adding modules
to directly use the operating system facilities for crypto if available.
(that's much more secure than we'll ever be)

Also, refactor of voice to modularize it, and add a diamondware voice module.
CR:  Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-02 02:03:21 -07:00
Roxie Linden aa0a129b67 Automated Merge 2010-04-01 21:47:22 -07:00
Richard Nelson 6cc65f9e5f merge 2010-04-01 12:52:04 -07:00
Richard Nelson 7b4046df83 EXT-3531 - Ctrl-P does not work reliably on login 2010-04-01 11:47:21 -07:00
Loren Shih 1ee1004e12 EXT-6666 : Enable debug avatar textures in God, versus non-Release, mode 2010-03-31 15:16:44 -04:00
Loren Shih 909091cc0c EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate class
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
2010-03-30 15:56:15 -04:00
Loren Shih b6e7850c0a Merge 2010-03-29 12:30:09 -04:00
Loren Shih 58d76a9ecf EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
Brad Payne (Vir Linden) 4ff53b9066 For EXT-4666: changed LLAppearanceManager to LLAppearanceMgr throughout 2010-03-29 11:02:39 -04:00
Loren Shih 46fe5d49ca EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26 14:33:48 -04:00
Loren Shih 0a56031bd3 automated merge 2010-03-25 20:15:51 -04:00
Loren Shih 885fc3f9b5 EXT-6536 : Make LLVOAvatarSelf a singleton
Minor superficial cleanup to have all references to getAvatarObject use LLVOAvatarSelf *avatarp = gAgent.getAvatarObject()
2010-03-25 19:56:52 -04:00