8083feada1
Fixed major bug EXT-3520 - Can't open Group Notices or Attachments.
...
--HG--
branch : product-engine
2009-12-18 17:57:45 +02:00
e303864c17
Merge from default branch.
...
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs
remote change) by removing them.
--HG--
branch : product-engine
2009-12-15 17:14:31 +02:00
cb9b874b17
Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0.
2009-12-14 11:07:29 -08:00
f2e2f1a7a7
mplemented EXT-3392 “Teleport offers recorded in IM history should include a
...
SLURL to the TP location”,
teleport offer message supplement with teleport location URL;
--HG--
branch : product-engine
2009-12-14 12:20:41 +02:00
7863d7d412
Related to normal sub-task EXT-2478: Implemened chiclet + chiclet window should spawn only for offers from objects. Offers from persons should be shown as toasts
...
--HG--
branch : product-engine
2009-12-11 20:36:32 +02:00
4fc7b91a79
implemented EXT-2323 “Get rid from obsolete notification widgets”;
...
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
791465bab9
no ticket. fixing at least win build
...
--HG--
branch : product-engine
2009-12-11 09:20:58 +02:00
1967034ca0
implemented task EXT-2609 Implement 'block' option for inventory offers
...
--HG--
branch : product-engine
2009-12-10 21:40:46 +02:00
e9afce6786
mplemented EXT-2801 “Record "object return" notification into IM history, not
...
chat history”,
added logging to IM for ServerObjectMessage notification;
--HG--
branch : product-engine
2009-12-10 12:36:28 +02:00
7c69928ff8
Fixups for things broken after the last merge and for the linux build.
2009-12-07 18:43:47 -08:00
5245fb6972
merge fixes
2009-12-07 17:07:52 -08:00
0b4b03fe3e
Merge from product-engine
2009-12-07 15:57:31 -08:00
8e912657e8
Another merge of include dependency cleanup work with viewer-2-0.
2009-12-07 12:20:47 -08:00
4a8733fadd
No ticket. Removed inventory offer fake notification.
...
--HG--
branch : product-engine
2009-12-07 22:04:02 +02:00
da8de2b674
implemented Task EXT-2304 Offer Notifications should include a link that highlights the landmark or item in the appropriate side panel
...
Changes:
1.highlighting of landmarks was broken by LLInventoryPanel::getActiveInventoryPanel().
2. escaping of urls
--HG--
branch : product-engine
2009-12-07 19:42:11 +02:00
c9c9943098
automated merge viewer2.0->avp
...
--HG--
branch : avatar-pipeline
2009-12-04 13:50:32 -05:00
63096e40de
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-12-04 18:34:32 +02:00
28a1ee9da8
implemented EXT-700 “"Offer" notifications should be accessible via chiclet”
...
--HG--
branch : product-engine
2009-12-04 18:33:13 +02:00
1ffd7c99af
automated merge for avp->avp
...
--HG--
branch : avatar-pipeline
2009-12-03 15:41:36 -05:00
202d86b155
EXT-2410 : Accepting an offered item should open the inventorySP
...
Added a new "Quiet" query for folder types, so I don't have to special case all the folders where we don't want UI notifications from inventory offers.
Fixed a bug where a sidepanel was considered active even if the sidetray was closed.
--HG--
branch : avatar-pipeline
2009-12-03 15:39:43 -05:00
a0b4aa14d8
Merge from product-engine
2009-12-03 12:15:47 -08:00
b05ebd8977
merge of viewer2 into avp branch
...
--HG--
branch : avatar-pipeline
2009-12-03 12:09:16 -05:00
2adf9d6b04
EXT-2410 : Accepting an offered notecard should open the inventorySP
...
Preliminary checkin to improve this infrastructure.
--HG--
branch : avatar-pipeline
2009-12-03 11:18:59 -05:00
bbe2bcf8a2
EXT 3046 : INFRASTRUCTURE: Header file includes cleanup for llviewermenu, llviewermessage
...
More header file cleanup.
--HG--
branch : avatar-pipeline
2009-12-02 12:15:31 -05:00
e24617a974
EXT 3046 : INFRASTRUCTURE: Header file includes cleanup for llviewermenu, llviewermessage
...
Removed > 100 header includes from llviewermenu and llviewermessage.
--HG--
branch : avatar-pipeline
2009-12-02 12:04:31 -05:00
963c2240f4
Update for normal task EXT-2081 - Object IM chiclets art needs to be hooked up to LLDialog chiclets.
...
Disabled notification toast.
--HG--
branch : product-engine
2009-12-02 16:53:13 +02:00
8fdd2e0b28
EXT-3028 : "Find Original" does nothing if floater inventory isn't open
...
Changed logic for getActiveInventory so that it considers InventorySP.
Removed getActiveInventory and replaced with getActiveInventoryPanel since that follows its current usage.
This currently contains a bug because the InventorySP always thinks it's open.
--HG--
branch : avatar-pipeline
2009-12-01 21:12:34 -05:00
07f284408b
Implemented normal task EXT-2476 (llGiveInventory() should be handled also by Chiclet subsystem along with Notificaton subsystem)
...
--HG--
branch : product-engine
2009-12-01 21:46:19 +02:00
ab5e6c93c9
implemented EXT-2799 “Record to IM history notification about L$ payments by
...
other avatar”;
--HG--
branch : product-engine
2009-12-01 15:16:12 +02:00
957055396d
merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp
2009-11-25 12:31:24 -08:00
cbc0783cd1
Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
...
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
07a396e311
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-24 16:12:01 -05:00
88a56949d5
made task inventory offers work the old way, and disabled inv slurls for them.
2009-11-24 15:43:29 -05:00
2bdf430de1
small fixes for inv slurl functionality
2009-11-23 19:59:47 -05:00
9eb42546dc
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-23 11:55:33 -05:00
9f0dbcf4c0
Update for task EXT-2081 - Object IM chiclets art needs to be hooked up to LLDialog chiclets.
...
Cleaned code, added comments.
--HG--
branch : product-engine
2009-11-23 15:50:49 +02:00
8580f840f3
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-20 19:28:48 -05:00
a3930c7ff7
Inventory Offer changes and clickable inventory slurls
2009-11-20 19:27:33 -05:00
13a6077b78
Implemented normal task EXT-2081 - Object IM chiclets art needs to be hooked up to LLDialog chiclets.
...
Implemented LLDialog(LLScriptFloater) and Script Chiclets.
--HG--
branch : product-engine
2009-11-20 19:17:38 +02:00
88cce61b09
related to EXT-700 '"Offer" notifications should be accessible via chiclet'
...
made 'FriendshipAccepted' notification show correct avatar icon;
avoided empty avatar name on 'OfferFriendship' notifiaction;
avoided creating IM session on offer from objects;
--HG--
branch : product-engine
2009-11-19 11:21:20 +02:00
fce52249ab
Particial fix for normal bug EXT-2410- Accepting an Offered Notecard Should Open the Side Bar Inventory Tab. Added select command while opening inventory sidetray panel
...
--HG--
branch : product-engine
2009-11-18 16:04:41 +02:00
1baf1d2186
fix chat format for /me
2009-11-16 20:46:40 +08:00
1ea60591a9
Refactoring of llviewerprecompiledheaders.h to hopefully increase stability
...
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in
the long run this will reduce build time. Also cleaned up a lot of header
file usage to conform better to the coding standard.
reviewed by james and steve.
2009-11-13 20:33:59 -05:00
3194c89177
Merging viewer2 changes into avp branch
...
--HG--
branch : avatar-pipeline
2009-11-13 19:26:20 -05:00
acdce23299
Header file cleanup
...
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.
--HG--
branch : avatar-pipeline
2009-11-13 17:47:00 -05:00
f0cd44a6a2
EXT-2482 : Newly created folders have wrong default type
...
Removed AT_ROOT_CATEGORY and FT_ROOT_CATEGORY since those types are unused. Changed FT_CATEGORY to FT_ROOT_INVENTORY to make its purpose more clear.
This change assumes that no agent inventories have category type 9 for either inventory type or folder preferred type.
--HG--
branch : avatar-pipeline
2009-11-13 16:18:53 -05:00
b3b608b2a8
Merge from product-engine
2009-11-13 10:17:56 -08:00
e310e18481
implemented EXT-1286 "Need support for [ITEM_ICON], [AN_OBJECTTYPE], [ITEM_SLURL], in notifications.xml"
...
--HG--
branch : product-engine
2009-11-13 18:11:11 +02:00
f9646bd759
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-12 21:36:49 +08:00
ff09b049a7
merge
2009-11-12 21:36:34 +08:00
Dmitry Zaporozhan