Commit Graph

448 Commits (ffe475e96e9cdd2bb3c66fd3ffeef2b4d64bc33b)

Author SHA1 Message Date
Merov Linden ffe475e96e STORM-418 : Suppress menu items Save to XML and Load from XML from the Develop > XUI menu 2010-10-26 16:08:11 -07:00
Merov Linden c0e9594e9d STORM-173 : use isEmpty() instead of getFirstRootNode() to check selection 2010-10-25 10:27:37 -07:00
Merov Linden 6f4a21531a STORM-173 : never enable return object if no object selected 2010-10-21 17:12:24 -07:00
Leyla Farazha a4b223248e Merge 2010-09-27 17:54:52 -07:00
Leyla Farazha 60db8577a9 Merge 2010-09-16 12:02:24 -07:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01:00
Richard Linden 325991a002 EXP-60 Hints not showing after Re-enabling Hints in same session 2010-09-17 23:12:13 -07:00
Richard Linden 1911993cc7 merge 2010-09-16 19:45:57 -07:00
Richard Nelson e2257bc78e EXP-24 FIX Menu disable all viewer hints 2010-09-10 18:54:30 -07:00
Aimee Linden b1c677a6e7 Merge 2010-08-28 16:03:53 +01:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07: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
Richard Nelson 02d8197019 changed buildPanel/buildFloater to member functions buildFromFile
streamlined LLUICtrlFactory's interface
2010-08-20 10:14:28 -07:00
Richard Nelson 124bc854dd moved buildFloater out of lluictrlfactory to llfloater.cpp 2010-08-16 17:44:23 -07: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
Leyla Farazha 854e6acb42 Merge with dessie/viewer-release 2010-07-30 18:07:35 -07: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
Leyla Farazha c897061856 Merge with q/viewer-release 2010-06-21 10:21:52 -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
Richard Linden f79ac664dd merge 2010-06-03 14:15:11 -07: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
James Cook 49c221b967 Merge with dessie/viewer-public in prep to land code there 2010-06-01 14:33:44 -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