Commit Graph

771 Commits (0b3756aeab22656fd13fa9ccdda0397561ba4ca3)

Author SHA1 Message Date
Ansariel cce2e278d0 Fixed crashes after merge when trying to access the people panel 2012-01-21 14:07:03 +01:00
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
Ansariel f0faf7831a Added option to disable "landmark has been created in folder..." notification (FIRE-4532) 2012-01-04 10:10:30 +01:00
Liny 1d6ca454c9 Adding option to not reset camera after TPing, defaults to original reseting on TP. 2012-01-03 12:20:42 -08:00
Ansariel 7dc6d46402 Added customizable throttle for incoming object offers and option to turn throttle notifications off (FIRE-4306) 2012-01-03 21:00:44 +01:00
Oz Linden b022ebf13c merge changes for storm-1734 2011-12-20 10:39:06 -05:00
Oz Linden 94673473ed merge changes for storm-1653 2011-12-15 16:06:08 -05:00
Jonathan Yap 7f85f6be6a VWR-27832 L$ Transfer failures show alert as if successful 2011-12-12 20:07:34 -05:00
Jonathan Yap 28f86906a6 STORM-1653 Added affected name to warning message 2011-12-06 11:45:07 -05:00
Simon Linden bf24ffd27a ER-1473: fix teleporting in sit mode. Viewer fix - reviewed by Callum 2011-12-01 16:37:51 -08:00
Oz Linden b69be18d7b merge changes for vmrg-193 2011-11-24 06:56:57 -05:00
Jonathan Yap 0ab252b817 STORM-1653 Handle last name of "Resident" case 2011-11-23 09:51:38 -05:00
Dave Parks cfb666e9d9 merge 2011-11-15 17:04:37 -06:00
Richard Linden b2fffa74f7 Automated merge with http://hg.secondlife.com/viewer-development 2011-11-10 10:58:11 -08:00
Leslie Linden 5dcdb2dd02 EXP-1548 FIX -- Clicking show on inventory offer does not open inventory (or received items panel) on test grid Ravi set to use Received Items folder for transfers
EXP-1555 FIX -- Double-click is inconsistent between inventory and Received Items
EXP-1547 FIX -- drag/drop inventory to agent - delivers to Objects, not Received items.

* "Show" button from p2p transfer now opens inventory window and inbox panel, setting focus to the item
* Double-click on inbox inventory items now falls through to default item behavior
2011-11-07 14:43:59 -08:00
Vadim ProductEngine 65e144d9fe STORM-1580 WIP Initial commit for PO review. 2011-11-02 19:05:13 +02:00
Oz Linden f18cfe9775 merge changes for storm-1577 2011-10-28 16:56:55 -04:00
Jonathan Yap f73fddd5d0 STORM-1653 Group notices sent by muted residents are still displayed
Added warning message if a null is returned from the name to id call.
2011-10-26 14:06:08 -04:00
Jonathan Yap db643d1881 STORM-1653 Group notices sent by muted residents are still displayed 2011-10-26 11:21:01 -04:00
Vadim ProductEngine a43b470867 Merge STORM-1577.
Resolved conflicts manually.
2011-10-26 13:41:45 +02:00
niel@nirvana-win7hp.planescape.home 4fd9a53115 Merge STORM-959 2011-10-26 01:42:26 +01:00
Oz Linden b7a349f231 merge changes for storm-1664 2011-10-24 16:14:07 -04:00
Brad Payne (Vir Linden) cc719670d9 SH-2557 WIP - more warning message details 2011-10-21 17:54:34 -04:00
Brad Payne (Vir Linden) e32227e90b SH-2557 WIP - some cleanup, added error message to try to isolate causes of translation failure 2011-10-21 13:49:35 -04:00
Oz Linden 140ce422b8 merge changes for storm-976 2011-10-20 16:45:00 -04:00
Richard Linden 62d9db2f21 Automated merge with http://hg.secondlife.com/viewer-development 2011-10-15 18:14:23 -07:00
Jonathan Yap 5cfd34df90 STORM-976 Object muted by name still displays notification message when clicked 2011-10-11 18:18:02 -04:00
Paul ProductEngine 9d3fc5d930 EXP-1209 FIXED Sidetray removed.
- Removed all sidetray dependencies and the sidetray itself.

- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
Merov Linden 1bdfe7ec47 EXP-1202 : pull from richard/viewer-experience-fui 2011-09-27 19:45:38 -07:00
Merov Linden 3a473bd8ca EXP-1203, EXP-1221, EXP-1222, EXP-1223, EXP-1225, EXP-1226 : pull from sergeylproductengine/viewer-experience-fui/ 2011-09-27 18:56:25 -07:00
Leyla Farazha 0207d7e9e4 EXP-1247 Nearby chat as part of chat floater 2011-09-27 15:41:06 -07:00
Nat Goodspeed ad9c28a269 Automated merge with http://hg.secondlife.com/viewer-development 2011-09-26 15:44:21 -04:00
Paul ProductEngine 0cd1988ef7 EXP-1223 FIXED (Create and register a floater for Places side tab)
- Added xml for a new floater and registred it in the floaterreg

- Removed side tray dependencies

- Added static helper method: LLFloaterSidePanelContainer::showPanel
2011-09-22 14:41:44 +03:00
Nat Goodspeed 2722245464 Quiet "may be using uninitialized variable" warnings. 2011-09-13 16:25:36 -04:00
Vadim ProductEngine d6c8d3dca8 STORM-1577 WIP Show translation errors in chat. 2011-09-13 03:20:58 +03:00
Oz Linden 84a53eb547 merge changes for storm-1297 2011-09-12 11:31:40 -04:00
Vadim ProductEngine e2552ec673 STORM-1577 WIP Implemented translation via Microsoft Translator and Google Translate v2 APIs. 2011-09-06 17:45:47 +03:00
Oz Linden e62a4d4ec1 merge changes for storm-1567 2011-08-31 09:07:32 -04:00
Vadim ProductEngine 4e220af01d STORM-1297 WIP Block object inventory offer by the object's owner ID.
Submitting a fix by Jonathan Yap that I have cleaned up.
2011-08-30 20:09:39 +03:00
Vadim ProductEngine 1ac369afe5 STORM-1297 WIP Minor changes for better code readability. 2011-08-30 19:47:13 +03:00
Jonathan Yap 716e2bbce8 STORM-1567 Mute button for llDialog popup
Added comment where sidebar block list is opened.
2011-08-26 12:35:57 -04:00
Vadim ProductEngine a4f132f1b8 STORM-1543 WIP Removed invalid IOR_BUSY response option.
Addressing review feedback.
2011-08-26 00:19:33 +03:00
Jonathan Yap 541e26d947 STORM-1567 Mute button for llDialog popup
Updating patch to current version of viewer-development
2011-08-23 07:55:34 -04:00
Vadim ProductEngine 5578c285d8 STORM-1543 WIP More cleanup and comments. 2011-08-22 14:01:18 +03:00
Vadim ProductEngine e0b5ff5c52 STORM-1543 WIP Minor cleanup. 2011-08-19 19:59:13 +03:00
Vadim ProductEngine 1ed945b5a0 STORM-1543 WIP Fixed auto-moving offered inventory items to trash.
It turned out impossible to properly remove an inventory item
from within LLDiscardAgentOffer::done(), because that would lead to
nested LLInventoryModel::notifyObservers() calls.

Fixed that by deferring removal until the next LLAppViewer::idle() iteration.

Also elimiteed duplicated code.
2011-08-19 19:58:00 +03:00
Vadim ProductEngine 51c837dda7 STORM-1543 WIP Fixed dropping nventory offers in busy mode.
When auto-discarding inventory offers we looked up missing Busy button
(i.e. a button having index=3) in the inventory offer notification dialog
template. Failure to find the button resulted in ignoring inventory offers.

Fixed that by "auto-clicking" the existing Discard button.
2011-08-19 19:53:44 +03:00
Vadim ProductEngine 55483e651f STORM-565 FIXED Allow inventory offers from objects in Busy mode. 2011-07-25 16:26:03 +03:00
Oz Linden b5f00fd120 merge changes for storm-1481 2011-07-11 06:13:07 -04:00
Richard Linden 88a90aabcb Automated merge with http://hg.secondlife.com/viewer-development 2011-07-07 13:34:13 -07:00