summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
AgeCommit message (Expand)Author
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-10-25Fix release merge issues (included upstream changes not yet in release from b...Graham Linden
2013-10-25Merge 3.6.9 ShareStormGraham Linden
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-09-16MAINT-3018 (Remove long distracting messages appearing in nearby chat)MaximB ProductEngine
2013-09-09Merge downstream code with viewer-releasesimon_linden
2013-09-09MAINT-3048 FIXED Show actual message instead of "Only friends and groups can ...maxim@mnikolenko
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-26merge changes for 3.6.4-releaseOz Linden
2013-08-23MAINT-2575 FIXED Resident can accept unlimited number of friendship requests ...maksymsproductengine
2013-08-20merge changes for 3.6.3-releaseOz Linden
2013-08-19merge changes for DRTVWR-285Oz Linden
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-10-23Merge latest viewer-release with FBCsimon
2013-06-27Merged lindenlab/viewer-release into defaultCinder Roxley
2013-07-19CHUI-985 POSTPONED [CHUIBUG]User receives three friendship offer notification...maksymsproductengine
2013-06-13merge changes for 3.5.3-releaseOz Linden
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-21MAINT-2676 - Set home to here - screen_home.bmp not saved. Reviewed by Kelly.simon
2013-05-15CHUI-945 FIXED Add Object IMs to Chat Notification PreferencesPavelK ProductEngine
2013-05-13STORM-1948 - Fix for Set home to here - screen_home.bmp not savedCinders
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-05-03MAINT-2655: "Block button in permissions dialog prompt does not block object"Kelly Washington
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ...Kelly Washington
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ...Kelly Washington
2013-05-02Pull from viewer-releaseMerov Linden
2013-04-30MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ...Kelly Washington
2013-04-25CHUI-759 FIXED Group invites never received in do not disturb mode when leavi...PavelK ProductEngine
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-03-25Pull in downstream CHUI code from viewer-developmentsimon
2013-03-22Pull and merge latest viewer-betasimon
2013-03-22merge changes for 3.5.0-beta5Oz Linden
2013-03-20Merge with viewer-chuiprep@lindenlab.com
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-19MAINT-2506 added viewer support for PERMISSION_SILENT_ESTATE_MANAGEMENT and P...Maestro Linden
2013-03-18MAINT-2497 FIX (Viewer) - viewer side change that goes with server side fix -...callum_linden
2013-03-18merge up to 3.5.0-beta3 (chui)Oz Linden
2013-03-13CHUI-796 FIXED User doesn't get all messages in 'do not disturb' modemaksymsproductengine
2013-03-11Viewer-chui mergeprep
2013-02-12CHUI-758: Group notice received in DND mode causes crash on startup when auto...Gilbert Gonzales
2013-02-01CHUI-691: Now when an estate message is received while in DND mode, a toast n...Gilbert Gonzales
2013-02-01STORM-1838 Remove IM buttonJonathan Yap
2013-02-01make teleport requests appear correctly with respect to open im sessionsOz Linden
2013-02-01CHUI-689: When DND mode is enabled, making a direct delivery purchase results...Gilbert Gonzales
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-26STORM-1838 Added SUPPRESS_TOAST to notification payloadJonathan Yap
2013-01-25STORM-1838 Minor UI improvements and code changesJonathan Yap