summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
AgeCommit message (Collapse)Author
2015-11-02Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2015-10-27Merged lindenlab/viewer-release into defaultRider Linden
2015-10-19Merge from viewer release.Rider Linden
2015-10-13merge changes for MAINT-4734pavelkproductengine
2015-09-11Bit of cleanup around Translation and remove httpassetstorageRider Linden
2015-09-10MAINT-5575: Finished converting experience cache to singletonRider Linden
MAINT-4952: Coverted VMM to coroutines
2015-09-03Changes from code review with NatRider Linden
2015-09-01MAINT-5575: Convert the Experience cache into a coro based singleton.Rider Linden
--HG-- branch : MAINT-5575
2015-08-18merge changes for MAINT-4734pavelkproductengine
2015-08-04merge changes for MAINT-4734pavelkproductengine
2015-08-04Merge downstream code and become version 3.8.3andreykproductengine
2015-08-04Merge viewer-release and become version 3.8.3AndreyL ProductEngine
2015-07-14merge 3.8.0-release and correct xml errors caused by reformattingOz Linden
2015-07-14MAINT-5390 FIXED physical objects that roll off region go to trash without ↵Mnikolenko ProductEngine
notification
2015-07-03Merge from viewer-relese and become version 3.8.1andreykproductengine
2015-07-01Merge from viewer-relese and become version 3.8.1andreykproductengine
2015-06-30Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2015-06-08merge changes for 3.7.29-releaseOz Linden
2015-06-08MAINT-14 FIXED Treat region message like a system message, but also show ↵Mnikolenko ProductEngine
sender name.
2015-07-02Merge from viewer-relese and become version 3.8.1andreykproductengine
2015-05-28MAINT-5232: Normalize LLGlobalEconomy's use of LLSingleton.Nat Goodspeed
LLSingleton currently presents two different usage styles: deriving MyClass from LLSingleton<MyClass>, or just using a typedef. Turns out LLGlobalEconomy is the ONLY class using the typedef style -- and the apologetic comment talks about a potential maintenance that hasn't actually happened. Derive LLGlobalEconomy from LLSingleton<LLGlobalEconomy>, like everyone else.
2015-05-28MAINT-3597 FIXED Bumps, Pushes & Hits ImprovementsMnikolenko ProductEngine
2015-05-18merge changes for MAINT-4734pavelkproductengine
2015-05-07MAINT-4812 Restore sending snapshot as email from the viewer.Mnikolenko ProductEngine
2015-05-07MAINT-4812 Restore sending snapshot as email from the viewer.Mnikolenko ProductEngine
2015-04-28increment viewer version to 3.7.29Mnikolenko ProductEngine
2015-04-28Merge viewer-release, become version 3.7.29Mnikolenko ProductEngine
2015-04-21MAINT-2567 FIXED Don't show any notification if message is actually empty.Mnikolenko ProductEngine
2015-04-15Merge viewer-releasesimon
2015-04-14Pull merge from lindenlab/viewer-tools-update (includes viewer-release)Merov Linden
2015-04-13merge changes for 3.7.27-releaseOz Linden
2015-04-08MAINT-4734 (Separate transaction notices from group notice/invites)pavelk_productengine
1) added GroupNotice notification type and tab "Group" for it; 2) added Attachment field to group notice notifications which may contain inventory offers, notecards, etc; 3) added Fee field to Group Invite notifications; 4) added notification resize depending on attachment field.
2015-04-07MAINT-5036 FIXED Blocked user can send invites to groupandreykproductengine
2015-03-25MAINT-5016 FIXED Skip messages from muted objects.Mnikolenko ProductEngine
2015-03-17MAINT-4734 (Separate transaction notices from group notice/invites)pavelk_productengine
1) stripped off attachment field; 2) made logos (group's, sender's, etc) in expanded view the same size as in condensed view; 3) turned on notification showing upon click; 4) fixed cropped right border of Invite and Transactions notifications; 5) enabled "Collapse All" button; 6) stripped off unnecessary icons.
2015-03-16Merge lindenlab/viewer-tools-updateMerov Linden
2015-02-08OPEN-292 - Remove lscript from project,Cinder
Remove legacy udp script upload methods, Refactor script runtime perms from three arrays to one struct array so we don't have to juggle array order anymore.
2015-02-03MAINT-4812 FIXED Remove sending snapshot as email from the viewer.Mnikolenko ProductEngine
2014-12-26MAINT-4699 FIXED notifications list is out of orderMnikolenko ProductEngine
2014-11-08DD-260 : Silence the SLM delete message so to prevent server notification to ↵Merov Linden
show up when deleting or unassociating things from the viewer
2014-10-28ACME-1601: Updated message to match behaviordolphin
ACME-1616: Change references of "Grid-Wide" to "Grid-Scope" and "non Grid-Wide" to "Land-Scope"
2014-10-23DD-224, DD-246 : Clean up code when receiving delete notification. Display ↵Merov Linden
DAMA alert when associating listing
2014-10-21DD-224 : WIP : Add a deleteListing method, call SLM_UPDATE_FOLDER ↵Merov Linden
notification if state is deleted
2014-10-20Update to build on Xcode 6.0: Large (and final) collection of fixes for ↵callum_linden
unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
2014-10-20Update to build on Xcode 6.0: clang demands logical comparison bracketscallum_linden
2014-10-09Mergedolphin
2014-09-28Pull merge from lindenlab/viewer-releaseMerov Linden
2014-09-16DD-23 : Final cleanup after testing using staging marketplaceMerov Linden
2014-09-16DD-23 : WIP : Catch the SLM_UPDATE_FOLDER notification and trigger the GET ↵Merov Linden
/listing route so to get the updated SLM status for the listing
2014-09-08Merge with 3.7.15-releasedolphin