summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
AgeCommit message (Collapse)Author
2009-12-15Merge from default branch.Vadim Savchuk
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs remote change) by removing them. --HG-- branch : product-engine
2009-12-14Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0.brad kittenbrink
2009-12-14mplemented EXT-3392 “Teleport offers recorded in IM history should include aAlexei Arabadji
SLURL to the TP location”, teleport offer message supplement with teleport location URL; --HG-- branch : product-engine
2009-12-11Related to normal sub-task EXT-2478: Implemened chiclet + chiclet window ↵Eugene Mutavchi
should spawn only for offers from objects. Offers from persons should be shown as toasts --HG-- branch : product-engine
2009-12-11implemented EXT-2323 “Get rid from obsolete notification widgets”;Alexei Arabadji
--HG-- branch : product-engine
2009-12-11no ticket. fixing at least win buildYuri Chebotarev
--HG-- branch : product-engine
2009-12-10implemented task EXT-2609 Implement 'block' option for inventory offersDenis Serdjuk
--HG-- branch : product-engine
2009-12-10mplemented EXT-2801 “Record "object return" notification into IM history, notAlexei Arabadji
chat history”, added logging to IM for ServerObjectMessage notification; --HG-- branch : product-engine
2009-12-07Fixups for things broken after the last merge and for the linux build.brad kittenbrink
2009-12-07merge fixesSteve Bennetts
2009-12-07Merge from product-engineSteve Bennetts
2009-12-07Another merge of include dependency cleanup work with viewer-2-0.brad kittenbrink
2009-12-07No ticket. Removed inventory offer fake notification.Eugene Mutavchi
--HG-- branch : product-engine
2009-12-07 implemented Task EXT-2304 Offer Notifications should include a link ↵Denis Serdjuk
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-04automated merge viewer2.0->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-04Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/Alexei Arabadji
--HG-- branch : product-engine
2009-12-04implemented EXT-700 “"Offer" notifications should be accessible via chiclet”Alexei Arabadji
--HG-- branch : product-engine
2009-12-03automated merge for avp->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-03EXT-2410 : Accepting an offered item should open the inventorySPLoren Shih
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-03Merge from product-engineSteve Bennetts
2009-12-03merge of viewer2 into avp branchEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-12-03EXT-2410 : Accepting an offered notecard should open the inventorySPLoren Shih
Preliminary checkin to improve this infrastructure. --HG-- branch : avatar-pipeline
2009-12-02EXT 3046 : INFRASTRUCTURE: Header file includes cleanup for llviewermenu, ↵Loren Shih
llviewermessage More header file cleanup. --HG-- branch : avatar-pipeline
2009-12-02EXT 3046 : INFRASTRUCTURE: Header file includes cleanup for llviewermenu, ↵Loren Shih
llviewermessage Removed > 100 header includes from llviewermenu and llviewermessage. --HG-- branch : avatar-pipeline
2009-12-02Update for normal task EXT-2081 - Object IM chiclets art needs to be hooked ↵Dmitry Zaporozhan
up to LLDialog chiclets. Disabled notification toast. --HG-- branch : product-engine
2009-12-01EXT-3028 : "Find Original" does nothing if floater inventory isn't openLoren Shih
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-01Implemented normal task EXT-2476 (llGiveInventory() should be handled also ↵Eugene Mutavchi
by Chiclet subsystem along with Notificaton subsystem) --HG-- branch : product-engine
2009-12-01implemented EXT-2799 “Record to IM history notification about L$ payments byAlexei Arabadji
other avatar”; --HG-- branch : product-engine
2009-11-25merge in changes from viewer-2-0, manually fixed conflict in ↵James Cook
llviewermessages.cpp
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-24Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-11-24made task inventory offers work the old way, and disabled inv slurls for them.Eric M. Tulla (BigPapi)
2009-11-23small fixes for inv slurl functionalityEric M. Tulla (BigPapi)
2009-11-23Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-11-23Update for task EXT-2081 - Object IM chiclets art needs to be hooked up to ↵Dmitry Zaporozhan
LLDialog chiclets. Cleaned code, added comments. --HG-- branch : product-engine
2009-11-20Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-11-20Inventory Offer changes and clickable inventory slurlsEric M. Tulla (BigPapi)
2009-11-20Implemented normal task EXT-2081 - Object IM chiclets art needs to be hooked ↵Dmitry Zaporozhan
up to LLDialog chiclets. Implemented LLDialog(LLScriptFloater) and Script Chiclets. --HG-- branch : product-engine
2009-11-19related to EXT-700 '"Offer" notifications should be accessible via chiclet'Alexei Arabadji
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-18Particial fix for normal bug EXT-2410- Accepting an Offered Notecard Should ↵Eugene Kondrashev
Open the Side Bar Inventory Tab. Added select command while opening inventory sidetray panel --HG-- branch : product-engine
2009-11-16fix chat format for /meangela
2009-11-13Refactoring of llviewerprecompiledheaders.h to hopefully increase stabilitybrad kittenbrink
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-13Merging viewer2 changes into avp branchEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-11-13Header file cleanupLoren Shih
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel. --HG-- branch : avatar-pipeline
2009-11-13EXT-2482 : Newly created folders have wrong default typeLoren Shih
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-13Merge from product-engineSteve Bennetts
2009-11-13implemented EXT-1286 "Need support for [ITEM_ICON], [AN_OBJECTTYPE], ↵Alexei Arabadji
[ITEM_SLURL], in notifications.xml" --HG-- branch : product-engine
2009-11-12Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2009-11-12mergeangela
2009-11-12make color and font affecting both nearby chat and toastsangela