summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
AgeCommit message (Collapse)Author
2010-05-06mergeTofu Linden
2010-05-06EXT-7097 FIXEDAlexei Arabadji
Replaced usage usage of "ObjectGiveItemUnknownUser" notification with functionality provided by LLPostponedNotification class; reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/345/ --HG-- branch : product-engine
2010-05-01merge from viewer-trunkTofu Linden
2010-04-28merge from viewer-trunkTofu Linden
2010-04-27fixed critical EXT-7092 Fatal ↵Alexei Arabadji
error:LLOfferInfo::handleRespond:ASSERT:(!"Unexpected notification name") appears after attempt to resolve offer from object Added missing handler for "ObjectGiveItemUnknownUser" notification. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/323/ --HG-- branch : product-engine
2010-04-28automated mergeLoren Shih
2010-04-27EXT-7108 Creating link to openable item should not open the item (e.g. notecard)Loren Shih
When you create a link to a notecard, you'll no longer open the notecard.
2010-04-23Related to normal bug EXT-6302 (TP requests need to display destination ↵Eugene Mutavchi
region maturity) - added displaying maturity rating with an icon. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/229/. --HG-- branch : product-engine
2010-04-23Manual merge from default branch.Vadim Savchuk
Semi-automatically resolved conflicts in: * BuildParams * indra/newview/CMakeLists.txt * indra/newview/llviewermessage.cpp --HG-- branch : product-engine
2010-04-23Fixed normal bug EXT-6651 ([HARDCODE] System message in Nearby Chat window ↵Paul Guslisty
appears in EN) - Added instead of hardcoded string two strings to the strings.xml Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/294/ --HG-- branch : product-engine
2010-04-22fixed EXT-6972 Object return notification is displayed as notification and ↵Alexei Arabadji
nearby chat toasts simultaneously Made condition of logging to nearby chat more stronger to avoid logging "object return" messages. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/300/ --HG-- branch : product-engine
2010-04-22merge from PE's viewer-trunk 'notifications'Tofu Linden
2010-04-21fixed EXT-6968 Nothing happens if press 'Show' button on inventory offer toastAlexei Arabadji
Corrected passing parameters of inventory offer notification. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/293/ --HG-- branch : product-engine
2010-04-21Implemented EXT-6783(normal sub task) - Implement saving of unread ↵Dmitry Zaporozhan
notifications. Utilized old save and load notification code. Main concern was with notifications that have complex responder - UserGiveItem, ObjectGiveItem. Those responders are object with own fields that need to persist through sessions. Notifications that should be saved are marked with persist="true" in notifications.xml Notifications using functor responders are saved automatically. Notifications using object responders need additional tuning. Responder object should be a) serializable(implement LLNotificationResponderInterface), b) registered with LLResponderRegistry. At this point following notifications persist through sessions: UserGiveItem, ObjectGiveItem, TeleportOffered, FrienshipOffered. Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/211/ --HG-- branch : notifications
2010-04-21merge from PE's viewer-trunkTofu Linden
2010-04-21merge from viewer-trunkTofu Linden
2010-04-20Checker: NULL_RETURNSTofu Linden
Function: LLViewerInventoryMoveFromWorldObserver::onAssetAdded(const LLUUID &) File: /indra/newview/llviewermessage.cpp
2010-04-20Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-04-20fixed major EXT-6905 Inventory offer from another resident appears like ↵Alexei Arabadji
notification from object; Fixed regression introduced by rev. 050ab9232a5a, provided passing payload parameter "give_inventory_notification" to notification. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/273/ --HG-- branch : product-engine
2010-04-19merge from viewer-hotfixTofu Linden
2010-04-19Updated the reverted fix for critical bug EXT-1655 ([BSI] Always flying ↵Eugene Mutavchi
after pressing "Stand" to stand up from an object), also integrated the fix for EXT-6786 ('Stand' button is corrupted if movement control floater is opened). Added some clarifying comments. Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/253/. --HG-- branch : product-engine
2010-04-19merge from viewer-trunkTofu Linden
2010-04-16fixed major EXT-6700 crash in ↵Alexei Arabadji
LLNotificationsUI::LLHandlerUtil::addNotifPanelToIM Utilized functionality of class LLPostponedNotification for adding offer notifications. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/249/ --HG-- branch : product-engine
2010-04-15fix for build error on WindowsRichard Linden
2010-04-14Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-04-14Fixed normal bug EXT-6302 (TP requests need to display destination region ↵Eugene Mutavchi
maturity) Added: - parsing of region information from "lure" binary bucket - displaying destination region maturity by teleport offer Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/229/ --HG-- branch : product-engine
2010-04-13automated mergeLoren Shih
2010-04-15merge from viewer-trunkTofu Linden
2010-04-12Fixed major bug EXT-6590 (Preference> Maturity rating changes without direct ↵Vadim Savchuk
user input). Now we're notifying user that his/her maturity preference has been changed. Reviewed by Mike: https://codereview.productengine.com/secondlife/r/216/ --HG-- branch : product-engine
2010-04-09Fixed normal bug EXT-4766 - System notifications in nearby chat has default ↵Dmitry Zaporozhan
avatar icon and behave like sent from object Updated nearby toast to display system icon for system message. Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/208/ --HG-- branch : product-engine
2010-04-08Fixed normal bug EXT-6751 (Wrong "You paid" text in notification when ↵Andrew Dyukov
creating a classified). - Bug was caused by absence of localizable string for "You paid..." notifications without name and reason simultaneously. Added such string("you_paid_ldollars_no_info") to strings.xml and used it in code. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/206/ --HG-- branch : product-engine
2010-04-08Fixed normal bug EXT-4347 (Moving object contents to inventory opens files, ↵Mike Antipov
changes menu) Implementation details: * Added new LLViewerInventoryMoveFromWorldObserver to watch moved items via their Asses UUIDs. It is instantiated only once due to drop events are sent separately for each item while multi-dragging. * Existent LLOpenTaskOffer observer uses it to exclude watched by LLViewerInventoryMoveFromWorldObserver items from own processing. * Removed dependancy on LLPanelPlaces in open_inventory_offer(). Openning of offered LM via group notice moved into an appropriate section (processed by LLOpenTaskGroupOffer) Known Issues: * If Script item is among the dragged items from object to inventory it will be the only selected item in the inventory panel. Reason: it does not have its own Asset UUID and processed via LLOpenTaskOffer when should not. Reviewed by Leyla and Richard at https://codereview.productengine.com/secondlife/r/116/ --HG-- branch : product-engine
2010-04-07automated mergeLoren Shih
2010-04-07EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a ↵Loren Shih
base abstract LLInventoryFetchObserver class Minor cleanup of LLInventoryFetchComboObserver
2010-04-07mergeTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-06EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a ↵Loren Shih
base abstract LLInventoryFetchObserver class Added a new abstract class LLInventoryFetchObserver from which LLInventoryFetchItems and LLInventoryFetchDescendents inherit. Also changed isEverythingComplete to isFinished and made some other minor superficial changes.
2010-04-06EXT-6727 : Allow LLInventoryObservers to target a single item (instead of a ↵Loren Shih
vector of items) Added new constructors to LLInventoryFetch types to allow passing in a single item.
2010-04-06EXT-4151 : Immediately check if a fetchObserver filter is done, else add to ↵Loren Shih
observer list automatically FetchObservers now take in a list of IDs to check against. Made some naming changes.
2010-04-06EXT-4151 : Immediately check if a fetchObserver filter is done, else add to ↵Loren Shih
observer list automatically Preliminary work to clean up naming conventions.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Took out enums and flags from LLInventory into LLInventoryDefines Did a bunch of header file reformatting for LLInventory.h Change made to simulator files as well.
2010-04-02EXT-5940 : INFRASTRUCTURE: Typedef all vector<LLUUID>'sLoren Shih
Fixed some more typedefs that I missed in first checkin.
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
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-04-01Automated MergeRoxie Linden
2010-04-01fixed EXT-2801 Record "object return" notification into IM history, not chat ↵Alexei Arabadji
history, * added class for LLPostponedNotification to rpovide possibility postpone adding notification to notifications system till sender avatar name will be received from cache name; * rolled back changes related to fix of EXT-4779; * avoided passing avatar id when logging 'Object Return' notification to nearby chat; eviewed by Vadim Savchuk at https://jira.secondlife.com/browse/EXT-6373 --HG-- branch : product-engine
2010-04-01fixed EXT-6373 Consecutive offer messages are unreadable in the IM logAlexei Arabadji
replaced [NAME] with [NAME_SLURL] in friendship offer notification; --HG-- branch : product-engine
2010-04-01Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-03-31Fix for crash in process_avatar_movement.Loren Shih
gAgentAvatarp pointer was being checked for null instead of the local avatarp.
2010-03-31Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-03-30EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate classLoren Shih
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions