Commit Graph

413 Commits (affefe2361ee73eee60bca42e3edb41c65ffa95d)

Author SHA1 Message Date
Aimee Linden b1c677a6e7 Merge 2010-08-28 16:03:53 +01:00
Merov Linden dbe965eaa1 Sync with viewer-development 2010-08-26 21:45:20 -07:00
Aimee Linden 34a063ae5a VWR-20715 Double-click teleport
SNOW-352/SNOW-421/SNOW-462 Imported from Snowglobe 2
By Twisted Laws and Thickbrick Sleaford
2010-08-26 16:49:41 +01:00
Merov Linden 5361e6826f VWR-20710 : Sit anywhere, port of SG2.x SNOW-610 patch 2010-08-25 10:58:49 -07:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden 98870dfa24 merge from viewer-release 2010-08-12 12:53:53 +01:00
Loren Shih 7836f0fff3 EXT-8650 Can wear mutliple copies of a no-copy item via object links
- EXT-8660 Cleanup ambiguous llviewerobject::set/getItemID code

Lots of files changed, but this is mostly just a trivial function call rename.  This change is very low risk.
2010-08-11 12:34:27 -04:00
Dave Parks e62e31a2f2 Fix for crash when deferred rendering enabled and toggling wireframe.
(transplanted from 3886dff9a2829c7a8957d2cc48742e0678ec06a6)
2010-08-10 09:13:41 -05:00
Vadim Savchuk 554d543b02 EXT-8577 FIXED Context menu items for multi-attachments
Changes:
* Implemented bulk-add from My Appearance SP.
* Made sure there's no memleak when you click Wear/Attach in the in-world object context menu
  and the callback isn't invoked (because e.g. avatar fails to get close enough to the object).
  I stated that in comments.

Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/844/

--HG--
branch : product-engine
2010-08-09 18:10:36 +03:00
Vadim Savchuk 62466c0704 EXT-8577 WIP Context menu items for multi-attachments.
Done:
- 1. Dropped the obsolete "MultipleAttachments" setting.
- 2. Added an "Add" item to the following attachment-related context menus:
     * My Appearance (ex-My Outfits) context menu.
     * Edit Outfit -> Add More context menu.
     * Object in-world context menu.
     * Inventory context menu.
     * Object inspector gear menu.
- 3. Modified "Attach To / Attach To HUD" to perform the "add" instead of "replace" action.

TODO:
- Ability to attach multiple objects at once from the Add More panel (bulk attach).
- Make sure there's no memleak when you click Wear/Attach in the in-world object context menu
  and the callback isn't invoked (because e.g. avatar fails to get close enough to the object).

Issues:

0. I'm not sure whether LLAgentWearables::userAttachMultipleAttachments()
   should replace attachments or add them. Assumed the former.

1. I couldn't verify that adding objects from the object inspector menu works
   because I either could wear an object or see its inspector, not both.

2. > 1. Right-click on an object in your inventory and select "Wear".
   > VERIFY: Attaches the object and replaces whatever's there; asks for
   > confirmation before replacing an existing object.
   I think this is impossible to implement because we don't know in advance
   what point the object will be attached to, so we can't display a confirmation dialog.

Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/843/

--HG--
branch : product-engine
2010-08-06 17:14:01 +03:00
Vadim Savchuk 45adf1d612 EXT-8501 FIXED Check menu items always looked as checked.
Reason:
Check menu items (instances of LLMenuItemCheckGL) had used LLUICtrl::getValue() to know whether they should draw the checkmark.
Recently this was broken when getValue() was overriden in LLMenuItemCallGL to return a string.

Fix:
Overriden getValue() in LLMenuItemCheckGL to return a boolean value, not a string.

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

--HG--
branch : product-engine
2010-07-29 17:48:41 +03:00
Alexei Arabadji a8632670db EXT-6739 FIXED Provided updating of object inspector gear menu 'Touch' and 'Sit' entries.
Details:
1 Provided using Object.EnableSit and Object.EnableTouch callbacks for both object menu and inspector gear menu. Now default menu item label stores in
hash map and since callback receives triggered control no need to hardcode updating menu item labels from callback.
2 Removed redundant attribute 'parameter' from menu xml's since now handler callbacks receives triggered menu item as function parameter.
3 Replaced LLObjectEnableTouch class with enable_object_touch function, since there no need on triggering callback on menu commit event.
4 Added symmetric method LLMenuItemGL::getValue().
5 Removed unused "Object.EnableGearSit" callback.

reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/774/

--HG--
branch : product-engine
2010-07-23 17:06:27 +03:00
Tofu Linden 96099cff38 merge from viewer-release 2010-07-30 10:09:05 +01:00
Tofu Linden 44d0fd81ee (hairy) merge from viewer-release 2010-07-26 10:34:39 +01:00
Richard Nelson fde4edf75d merge 2010-07-20 11:31:23 -07:00
Andrew Dyukov a97485fa60 EXT-8385 FIXED Fixed simultaneous availability to click "Sit here" and "Stand Up" on object.
Made only one of them enabled in the same time, didn't make disabled one invisible because it was decided so in EXT-8094.

- This bug is the result of EXT-8094 fix. Corrected logic of enabling "Sit here" and "Stand up" both in xml and code.

- Removed class LLObjectEnableSitOrStand because it's not needed anymore, and it's handleEvent() method duplicates is_object_sittable() function.

- Renamed Object.EnableSit to Object.EnableGearSit because its name is now used for enabling object menu sit, and this "simple" version is used only from object inspector's gear menu.

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

--HG--
branch : product-engine
2010-07-15 21:07:16 +03:00
Leyla Farazha a6cf0bed74 Merge from ssh://hg.lindenlab.com/dessie/viewer-release 2010-06-21 11:24:33 -07: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
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
Tofu Linden e23643c46b merge from viewer-public 2010-06-05 10:49:17 +01: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
Tofu Linden 3d439157dd merge from viewer-public 2010-06-03 15:59:44 +01: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
Tofu Linden d5d2454828 merge from viewer-public 2010-05-28 09:59:39 +01: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
Tofu Linden 12cf211241 merge from viewer-public 2010-05-26 08:43:57 +01: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
Tofu Linden 7fe1495642 EXT-7461 move/remove deferred rendering UI from prefs 2010-05-24 13:44:33 +01: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