summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
AgeCommit message (Expand)Author
2013-12-05mergeBrad Payne (Vir Linden)
2013-12-02Merge with 3.6.11dolphin
2013-12-02merge with releaseRichard Linden
2013-11-25Merge - doh!simon
2013-11-22fix for SH-4632: Water over land doesn't render when teleporting to the same ...Xiaohong Bao
2013-11-19STORM-1980 Merge changes Oz made (new way of detecting an agent has changed r...Jonathan Yap
2013-11-16STORM-1980 Code cleanup and an attempt to fix a mac/linux compile errorJonathan Yap
2013-11-15STORM-1980 Added a floater displaying a countdown timer.Jonathan Yap
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-11-08STORM-1980/1983 Small XML cleanup.Jonathan Yap
2013-11-06fixed some warningsRichard Linden
2013-11-06merge with releaseRichard Linden
2013-11-06STORM-1980/1983 Add debug setting UISndRestart and value. This UUID will nee...Jonathan Yap
2013-11-05STORM-1980/1983 Revert previous changeJonathan Yap
2013-11-05STORM-1980/1983 Attempt to test alert message with a new uploaded soundJonathan Yap
2013-11-05STORM-1980/1983 Add time to region restarting messageJonathan Yap
2013-11-05STORM-1980 Play sound for region restarting messageJonathan Yap
2013-11-01SH-4595 WIP - reworked descendents of LLInventoryAddedObserver to use gInvent...Brad Payne (Vir Linden)
2013-10-29Merge viewer-release => sunshine-internalDon Kjer
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-25Merge with 3.6.9dolphin
2013-10-25MAINT-3275 FIXED Send DND auto response even if session already exists.Mnikolenko ProductEngine
2013-10-22Merge with viewer-beardolphin
2013-10-22Post events on experience permission changes to refresh uisdolphin
2013-10-16mergeBrad Payne (Vir Linden)
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-08merge from viewer-releaseRichard Linden
2013-10-04Merge with 3.6.7dolphin
2013-09-24Created an experience specific permissions dialog.dolphin
2013-09-19SH-3455 WIP - removing bake upload codeBrad Payne (Vir Linden)
2013-09-16MAINT-3018 (Remove long distracting messages appearing in nearby chat)MaximB ProductEngine
2013-09-13fix for SH-4494: interesting: deleted objects reappearXiaohong Bao
2013-09-09merge with viewer-releaseRichard Linden
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-09-05changed fast timer over to using macroRichard Linden
2013-09-04mergeBrad Payne (Vir Linden)
2013-08-26removed some unecessary template parameters from LLUnit member functionsRichard Linden
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-22mergeBrad Payne (Vir Linden)
2013-08-20merge changes for 3.6.3-releaseOz Linden
2013-08-19Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-08-19MergeXiaohong Bao
2013-08-19merge changes for DRTVWR-285Oz Linden
2013-08-19merge changes for 3.6.3-releaseOz Linden